From 568b44138ebbd2fd6bf7ca22730258364da0b77f Mon Sep 17 00:00:00 2001 From: Yen Date: Tue, 14 May 2024 14:16:36 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=AE=A2=E6=88=B7=E6=B7=BB=E5=8A=A0CD?= =?UTF-8?q?=E8=AE=A2=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../qs/serve/modules/oms/controller/OmsOrderController.java | 5 +++++ .../com/qs/serve/modules/oms/controller/api/OmsOrderApi.java | 5 ++++- src/main/java/com/qs/serve/modules/oms/entity/OmsOrder.java | 4 ++++ .../modules/sys/service/impl/SysDeleteLogServiceImpl.java | 2 +- 4 files changed, 14 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/qs/serve/modules/oms/controller/OmsOrderController.java b/src/main/java/com/qs/serve/modules/oms/controller/OmsOrderController.java index 28786374..2fe2ae7f 100644 --- a/src/main/java/com/qs/serve/modules/oms/controller/OmsOrderController.java +++ b/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 getById(@PathVariable("id") String id){ OmsOrder omsOrder = omsOrderService.getById(id); + BmsSupplier supplier = bmsSupplierMapper.selectById(omsOrder.getSupplierId()); + omsOrder.setSupplierInfo(supplier); return R.ok(omsOrder); } diff --git a/src/main/java/com/qs/serve/modules/oms/controller/api/OmsOrderApi.java b/src/main/java/com/qs/serve/modules/oms/controller/api/OmsOrderApi.java index 30f69cae..0a99d811 100644 --- a/src/main/java/com/qs/serve/modules/oms/controller/api/OmsOrderApi.java +++ b/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 lqw = new LambdaQueryWrapper<>(); lqw.eq(OmsOrderItem::getOrderId,id); diff --git a/src/main/java/com/qs/serve/modules/oms/entity/OmsOrder.java b/src/main/java/com/qs/serve/modules/oms/entity/OmsOrder.java index e4d8e9b0..61200c96 100644 --- a/src/main/java/com/qs/serve/modules/oms/entity/OmsOrder.java +++ b/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; diff --git a/src/main/java/com/qs/serve/modules/sys/service/impl/SysDeleteLogServiceImpl.java b/src/main/java/com/qs/serve/modules/sys/service/impl/SysDeleteLogServiceImpl.java index 68b1274b..ab03971c 100644 --- a/src/main/java/com/qs/serve/modules/sys/service/impl/SysDeleteLogServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/sys/service/impl/SysDeleteLogServiceImpl.java @@ -75,7 +75,7 @@ public class SysDeleteLogServiceImpl extends ServiceImpl