贸易订单下单代码优化

sckw-modules/sckw-order/src/main/java/com/sckw/order/controller/KwoTradeOrderController.java

@@ -31,7 +31,8 @@ public class KwoTradeOrderController {
     @GlobalTransactional(name = "default_tx_group")
     @PostMapping(value = "/addPurchaseOrderDraft", produces = MediaType.APPLICATION_JSON_VALUE)
     public HttpResult addPurchaseOrderDraft(@RequestBody @Validated PurchaseOrderDraftParam param) {
-        return kwoTradeOrderService.addPurchaseOrderDraft(param);
+        kwoTradeOrderService.addPurchaseOrderDraft(param);
+        return HttpResult.ok("采购下单草稿保存成功");
     }
 
     /**
@@ -44,7 +45,8 @@ public class KwoTradeOrderController {
     @GlobalTransactional(name = "default_tx_group")
     @PostMapping(value = "/addPurchaseOrderSubmit", produces = MediaType.APPLICATION_JSON_VALUE)
     public HttpResult addPurchaseOrderSubmit(@RequestBody @Validated PurchaseOrderParam purchaseOrderParam) {
-        return kwoTradeOrderService.addPurchaseOrderSubmit(purchaseOrderParam);
+        kwoTradeOrderService.addPurchaseOrderSubmit(purchaseOrderParam);
+        return HttpResult.ok("采购下单提交成功");
     }
 
     /**
@@ -57,7 +59,8 @@ public class KwoTradeOrderController {
     @GlobalTransactional(name = "default_tx_group")
     @PostMapping(value = "/addValetOrderDraft", produces = MediaType.APPLICATION_JSON_VALUE)
     public HttpResult addValetOrderDraft(@RequestBody @Validated ValetOrderDraftParam param) {
-        return kwoTradeOrderService.addValetOrderDraft(param);
+        kwoTradeOrderService.addValetOrderDraft(param);
+        return HttpResult.ok("代客下单草稿保存成功");
     }
 
 
@@ -71,7 +74,8 @@ public class KwoTradeOrderController {
     @GlobalTransactional(name = "default_tx_group")
     @PostMapping(value = "/addValetOrderSubmit", produces = MediaType.APPLICATION_JSON_VALUE)
     public HttpResult addValetOrderSubmit(@RequestBody @Validated ValetOrderParam valetOrderParam) {
-        return kwoTradeOrderService.addValetOrderSubmit(valetOrderParam);
+        kwoTradeOrderService.addValetOrderSubmit(valetOrderParam);
+        return HttpResult.ok("代客下单提交成功");
     }
 
     /**

sckw-modules/sckw-order/src/main/java/com/sckw/order/serivce/KwoTradeOrderService.java

@@ -95,14 +95,13 @@ public class KwoTradeOrderService {
      * @Param param:
      * @return: void
      */
-    public HttpResult addPurchaseOrderDraft(PurchaseOrderDraftParam param) {
+    public void addPurchaseOrderDraft(PurchaseOrderDraftParam param) {
         KwoTradeOrder order = BeanUtils.copyProperties(param, KwoTradeOrder.class);
         order.setEntId(LoginUserHolder.getEntId()).setTOrderNo(getOrderNo())
                 .setUnit(Objects.nonNull(param.getGoodsInfo()) ? param.getGoodsInfo().getUnit() : null)
                 .setSource(DictEnum.TORDER_SOURCE_1.getValue()).setStatus(Integer.valueOf(DictEnum.TORDER_STATUS_0.getValue()));
         kwoTradeOrderMapper.insert(order);
         addOtherOrderInfo(order, BeanUtils.copyProperties(param, ValetOrderParam.class), false);
-        return HttpResult.ok("采购下单草稿保存成功！");
     }
 
     /**
@@ -230,14 +229,13 @@ public class KwoTradeOrderService {
      * @Param param:
      * @return: void
      */
-    public HttpResult addValetOrderDraft(ValetOrderDraftParam param) {
+    public void addValetOrderDraft(ValetOrderDraftParam param) {
         KwoTradeOrder order = BeanUtils.copyProperties(param, KwoTradeOrder.class);
         order.setEntId(LoginUserHolder.getEntId()).setTOrderNo(getOrderNo())
                 .setUnit(Objects.nonNull(param.getGoodsInfo()) ? param.getGoodsInfo().getUnit() : null)
                 .setSource(DictEnum.TORDER_SOURCE_2.getValue()).setStatus(Integer.valueOf(DictEnum.TORDER_STATUS_0.getValue()));
         kwoTradeOrderMapper.insert(order);
         addOtherOrderInfo(order, BeanUtils.copyProperties(param, ValetOrderParam.class), false);
-        return HttpResult.ok("代客下单草稿保存成功！");
     }
 
     /**
@@ -247,7 +245,7 @@ public class KwoTradeOrderService {
      * @Param param:
      * @return: void
      */
-    public HttpResult addPurchaseOrderSubmit(PurchaseOrderParam param) {
+    public void addPurchaseOrderSubmit(PurchaseOrderParam param) {
         GoodsInfo goodsInfo = param.getGoodsInfo();
         if (Objects.isNull(goodsInfo.getPriceRangeId())) {
             throw new BusinessException("采购下单价格梯度信息不能为空！");
@@ -268,7 +266,6 @@ public class KwoTradeOrderService {
             throw new BusinessException(updateResult.getMsg());
         }
         addOtherOrderInfo(order, BeanUtils.copyProperties(param, ValetOrderParam.class), false);
-        return HttpResult.ok("采购下单提交成功！");
     }
 
     /**
@@ -363,7 +360,7 @@ public class KwoTradeOrderService {
      * @Param param:
      * @return: void
      */
-    public HttpResult addValetOrderSubmit(ValetOrderParam param) {
+    public void addValetOrderSubmit(ValetOrderParam param) {
         OrderCheckDTO orderCheck = BeanUtils.copyProperties(param, OrderCheckDTO.class);
         getTopEnt(orderCheck, param.getUnitInfo());
         orderCheck.setGoodsId(param.getGoodsInfo().getGoodsId()).setUnitPrice(param.getGoodsInfo().getUnitPrice())
@@ -390,7 +387,6 @@ public class KwoTradeOrderService {
             throw new BusinessException(updateResult.getMsg());
         }
         addOtherOrderInfo(order, BeanUtils.copyProperties(param, ValetOrderParam.class), false);
-        return HttpResult.ok("代客下单提交成功！");
     }