|
@@ -52,7 +52,6 @@ import com.yami.shop.common.util.PageParam;
|
|
|
import com.yami.shop.common.util.R;
|
|
import com.yami.shop.common.util.R;
|
|
|
import com.yami.shop.dao.*;
|
|
import com.yami.shop.dao.*;
|
|
|
import com.yami.shop.service.*;
|
|
import com.yami.shop.service.*;
|
|
|
-import com.yami.shop.service.hb.IHBOrderService;
|
|
|
|
|
import com.yami.shop.utils.BinPackingUtil;
|
|
import com.yami.shop.utils.BinPackingUtil;
|
|
|
import com.yami.shop.utils.CullenUtils;
|
|
import com.yami.shop.utils.CullenUtils;
|
|
|
import com.yami.shop.utils.ExportUtils;
|
|
import com.yami.shop.utils.ExportUtils;
|
|
@@ -125,7 +124,6 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
|
|
|
private final TzSysUserMapper userMapper;
|
|
private final TzSysUserMapper userMapper;
|
|
|
@Autowired
|
|
@Autowired
|
|
|
private ExportTaskService exportTaskService;
|
|
private ExportTaskService exportTaskService;
|
|
|
- private final IHBOrderService hbOrderService;
|
|
|
|
|
//导出
|
|
//导出
|
|
|
// 线程池配置
|
|
// 线程池配置
|
|
|
private final ExecutorService exportExecutor = Executors.newFixedThreadPool(
|
|
private final ExecutorService exportExecutor = Executors.newFixedThreadPool(
|
|
@@ -2502,7 +2500,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
|
|
|
|
|
|
|
|
@Override
|
|
@Override
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
@Transactional(rollbackFor = Exception.class)
|
|
|
- public void addSMOrder(SMOrderPo orderPo) {
|
|
|
|
|
|
|
+ public String addSMOrder(SMOrderPo orderPo) {
|
|
|
Order order = new Order();
|
|
Order order = new Order();
|
|
|
order.setShopId(0L);
|
|
order.setShopId(0L);
|
|
|
order.setChannelId(0L);
|
|
order.setChannelId(0L);
|
|
@@ -2553,7 +2551,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
|
|
|
orderItemService.save(item);
|
|
orderItemService.save(item);
|
|
|
});
|
|
});
|
|
|
|
|
|
|
|
- hbOrderService.createOrderAsync(order.getOrderNumber());
|
|
|
|
|
|
|
+ return order.getOrderNumber();
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
/**
|