wangming пре 16 часа
родитељ
комит
9842c86d0d

+ 4 - 1
yami-shop-platform/src/main/java/com/yami/shop/platform/controller/SMOrderController.java

@@ -4,6 +4,7 @@ import com.yami.shop.bean.po.SMOrderPo;
 import com.yami.shop.common.exception.GlobalException;
 import com.yami.shop.common.util.R;
 import com.yami.shop.service.OrderService;
+import com.yami.shop.service.hb.IHBOrderService;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
 import lombok.extern.log4j.Log4j2;
@@ -19,6 +20,7 @@ import org.springframework.web.bind.annotation.RestController;
 public class SMOrderController {
 
     private final OrderService orderService;
+    private final IHBOrderService hbOrderService;
 
     @PostMapping("/addSMOrder")
     @ApiOperation(value = "addSMOrder")
@@ -26,7 +28,8 @@ public class SMOrderController {
         if (orderPo.getOrderItems() == null){
             throw new GlobalException("订单项不能为空");
         }
-        orderService.addSMOrder(orderPo);
+        String orderNumber = orderService.addSMOrder(orderPo);
+        hbOrderService.createOrderAsync(orderNumber);
         return R.SUCCESS();
     }
 }

+ 1 - 1
yami-shop-service/src/main/java/com/yami/shop/service/OrderService.java

@@ -216,5 +216,5 @@ public interface OrderService extends IService<Order> {
      */
     void deleteTempSubOrder(String subOrderNumber);
 
-    void addSMOrder(SMOrderPo orderPo);
+    String addSMOrder(SMOrderPo orderPo);
 }

+ 2 - 4
yami-shop-service/src/main/java/com/yami/shop/service/impl/OrderServiceImpl.java

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