feat: 客户添加CD订单

src/main/java/com/qs/serve/modules/oms/controller/OmsOrderController.java

@@ -8,7 +8,9 @@ import com.qs.serve.common.model.enums.BizType;
 import com.qs.serve.common.model.enums.SystemModule;
 import com.qs.serve.common.util.AuthContextUtils;
 import com.qs.serve.common.util.PageUtil;
+import com.qs.serve.modules.bms.entity.BmsSupplier;
 import com.qs.serve.modules.bms.entity.BmsSupplierAddress;
+import com.qs.serve.modules.bms.mapper.BmsSupplierMapper;
 import com.qs.serve.modules.bms.service.BmsSupplierAddressService;
 import com.qs.serve.modules.oms.entity.OmsOrderItem;
 import com.qs.serve.modules.oms.entity.bo.OmsCheckParam;
@@ -47,6 +49,7 @@ public class OmsOrderController {
     private BmsSupplierAddressService bmsSupplierAddressService;
     private SysUserService sysUserService;
     private OmsOrderItemService omsOrderItemService;
+    private BmsSupplierMapper bmsSupplierMapper;
 
     /**
      * 翻页
@@ -91,6 +94,8 @@ public class OmsOrderController {
     @SysLog(module = SystemModule.BASE, title = "订单", biz = BizType.QUERY)
     public R<OmsOrder> getById(@PathVariable("id") String id){
         OmsOrder omsOrder = omsOrderService.getById(id);
+        BmsSupplier supplier = bmsSupplierMapper.selectById(omsOrder.getSupplierId());
+        omsOrder.setSupplierInfo(supplier);
         return R.ok(omsOrder);
     }
 

src/main/java/com/qs/serve/modules/oms/controller/api/OmsOrderApi.java

@@ -11,6 +11,7 @@ import com.qs.serve.common.util.CollectionUtil;
 import com.qs.serve.common.util.PageUtil;
 import com.qs.serve.modules.bms.entity.BmsSupplier;
 import com.qs.serve.modules.bms.entity.BmsSupplierAddress;
+import com.qs.serve.modules.bms.mapper.BmsSupplierMapper;
 import com.qs.serve.modules.bms.service.BmsSupplierAddressService;
 import com.qs.serve.modules.goods.entity.GoodsCategory;
 import com.qs.serve.modules.goods.entity.GoodsSku;
@@ -54,6 +55,7 @@ import static com.qs.serve.modules.tbs.common.TbsSeeYonConst.ERP_ORDER_STATUS;
 @RequestMapping("/api/order")
 public class OmsOrderApi {
 
+    private BmsSupplierMapper bmsSupplierMapper;
     private OmsOrderService omsOrderService;
     private OmsOrderItemService omsOrderItemService;
     private BmsSupplierAddressService bmsSupplierAddressService;
@@ -116,7 +118,7 @@ public class OmsOrderApi {
     public R<?> cancelOrder(@RequestBody @Valid OmsCancelOrder omsOrderBo){
         OmsOrder omsOrder = omsOrderService.getById(omsOrderBo.getOrderId());
         omsOrderService.checkMsOrderStatus(omsOrder);
-        if(omsOrder.getStatus().equals(1)){
+        if(omsOrder.getStatus().equals(0)||omsOrder.getStatus().equals(1)){
             //去执行取消
             omsOrderService.cancelOrder(omsOrder.getOrderSn());
             omsOrder.setStatus(6);
@@ -239,6 +241,7 @@ public class OmsOrderApi {
         OmsOrder omsOrder = omsOrderService.getById(id);
         omsOrder.setBrandRuleInfo(goodsCategoryRuleService.getById(omsOrder.getBrandRuleId()));
         omsOrder.setAddressInfo(bmsSupplierAddressService.getById(omsOrder.getSupplierAddrId()));
+        omsOrder.setSupplierInfo(bmsSupplierMapper.selectById(omsOrder.getSupplierId()));
         if(omsOrder.getSupplierId().toString().equals(supplier.getId())){
             LambdaQueryWrapper<OmsOrderItem> lqw = new LambdaQueryWrapper<>();
             lqw.eq(OmsOrderItem::getOrderId,id);

src/main/java/com/qs/serve/modules/oms/entity/OmsOrder.java

@@ -162,6 +162,10 @@ public class OmsOrder implements Serializable {
     @TableField(exist = false)
     private Object addressInfo;
 
+    /** 订单明细项 */
+    @TableField(exist = false)
+    private Object supplierInfo;
+
     /** 确认订单人员 */
     @TableField(exist = false)
     private Object checkUserInfo;

src/main/java/com/qs/serve/modules/sys/service/impl/SysDeleteLogServiceImpl.java

@@ -75,7 +75,7 @@ public class SysDeleteLogServiceImpl extends ServiceImpl<SysDeleteLogMapper,SysD
         String rs = HttpUtil.doPost(url, JsonUtil.objectToJson(costDeletion),null);
 
         if(!rs.contains("200")){
-            Assert.throwEx("远程删除失败");
+            Assert.throwEx("远程删除失败:"+rs);
         }
 
         tbsCostApplyRemoveMapper.tbs_cost_apply(costApplyId);