From 625859aca3fe83d15ce2cbda984763a7139c0139 Mon Sep 17 00:00:00 2001 From: Yen Date: Fri, 18 Oct 2024 14:47:25 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E4=B8=B4=E6=9C=9F=E5=93=81=E5=BA=93?= =?UTF-8?q?=E5=AD=98=E9=87=8A=E6=94=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/baz/entity/BazVisitInstance.java | 12 +++++++++++- .../impl/BazVisitInstanceServiceImpl.java | 2 +- .../biz/controller/BizVisitController.java | 4 ---- .../modules/biz/controller/api/BizVisitApi.java | 9 --------- .../modules/oms/controller/api/OmsOrderApi.java | 4 ++++ .../oms/service/OmsOrderPart1Service.java | 5 +++++ .../impl/OmsOrderOptionsServiceImpl.java | 5 +++++ .../service/impl/OmsOrderPart1ServiceImpl.java | 17 +++++++++++++++-- .../controller/my/WxFormPushMyController.java | 1 - 9 files changed, 41 insertions(+), 18 deletions(-) diff --git a/src/main/java/com/qs/serve/modules/baz/entity/BazVisitInstance.java b/src/main/java/com/qs/serve/modules/baz/entity/BazVisitInstance.java index f97c013d..6a872a00 100644 --- a/src/main/java/com/qs/serve/modules/baz/entity/BazVisitInstance.java +++ b/src/main/java/com/qs/serve/modules/baz/entity/BazVisitInstance.java @@ -10,6 +10,7 @@ import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import com.qs.serve.common.model.dto.TargetDTO; +import com.qs.serve.modules.baz.entity.bo.BazVisitInstanceFlowBo; import com.qs.serve.modules.sys.entity.SysUser; import lombok.Data; import org.hibernate.validator.constraints.Length; @@ -191,7 +192,7 @@ public class BazVisitInstance implements Serializable { @TableField(exist = false) private String ignoreUserId; - public static BazVisitInstance toNewObject(BazVisit source, TargetDTO targetDTO, SysUser sysUser){ + public static BazVisitInstance toNewObject(BazVisit source, TargetDTO targetDTO, SysUser sysUser, BazVisitInstanceFlowBo flowBo){ BazVisitInstance visitInstance = new BazVisitInstance(); //visitInstance.setTitle(source.getTitle()); visitInstance.setVisitId(source.getId()); @@ -204,6 +205,15 @@ public class BazVisitInstance implements Serializable { visitInstance.setTargetCode(targetDTO.getTargetCode()); visitInstance.setTargetName(targetDTO.getTargetName()); visitInstance.setRemark(source.getRemark()); + + + visitInstance.setExtProvince(flowBo.getExtProvince()); + visitInstance.setExtCity(flowBo.getExtCity()); + visitInstance.setExtRegionArea(flowBo.getExtRegionArea()); + visitInstance.setExtTownship(flowBo.getExtTownship()); + visitInstance.setExtStreet(flowBo.getExtStreet()); + visitInstance.setExtStreetNumber(flowBo.getExtStreetNumber()); + return visitInstance; } diff --git a/src/main/java/com/qs/serve/modules/baz/service/impl/BazVisitInstanceServiceImpl.java b/src/main/java/com/qs/serve/modules/baz/service/impl/BazVisitInstanceServiceImpl.java index acb8b3d3..e4953b1a 100644 --- a/src/main/java/com/qs/serve/modules/baz/service/impl/BazVisitInstanceServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/baz/service/impl/BazVisitInstanceServiceImpl.java @@ -99,7 +99,7 @@ public class BazVisitInstanceServiceImpl extends ServiceImpl spur) { Assert.throwEx(orderItem.getSkuCode() + " 单品库存不足"); } + // 扣减库存 imminentBatch.setOrderQuantity(imminentBatch.getOrderQuantity() + orderItem.getQuantity()); imminentBatches.add(imminentBatch); } @@ -363,6 +366,7 @@ public class OmsOrderOptionsServiceImpl implements OmsOrderOptionsService { OmsOrder omsOrder = omsOrderService.getById(param.getTargetId()); omsOrder.setOrderCheckState(OmsOrderCheckState.Rollback.getCode()); omsOrderService.updateById(omsOrder); + omsOrderPart1Service.releaseInventory(omsOrder.getId()); return null; } @@ -380,6 +384,7 @@ public class OmsOrderOptionsServiceImpl implements OmsOrderOptionsService { OmsOrder omsOrder = omsOrderService.getById(param.getTargetId()); omsOrder.setOrderCheckState(OmsOrderCheckState.Stop.getCode()); omsOrderService.updateById(omsOrder); + omsOrderPart1Service.releaseInventory(omsOrder.getId()); return null; } diff --git a/src/main/java/com/qs/serve/modules/oms/service/impl/OmsOrderPart1ServiceImpl.java b/src/main/java/com/qs/serve/modules/oms/service/impl/OmsOrderPart1ServiceImpl.java index b5f2d94b..e0f6c890 100644 --- a/src/main/java/com/qs/serve/modules/oms/service/impl/OmsOrderPart1ServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/oms/service/impl/OmsOrderPart1ServiceImpl.java @@ -128,8 +128,21 @@ public class OmsOrderPart1ServiceImpl implements OmsOrderPart1Service { @Override public boolean releaseInventory(Long orderId) { // 释放库存 - - return false; + OmsOrder omsOrder = omsOrderService.getById(orderId); + // 目前只有临期品需要释放库存 + if (omsOrder.getOrderType().equals(3)) { + List imminentBatches = new ArrayList<>(); + List orderItemList = omsOrderItemService.listByOrderId(orderId); + for (OmsOrderItem orderItem : orderItemList) { + GoodsImminentBatch imminentBatch = goodsImminentBatchService.getById(orderItem.getSkuBatchId()); + imminentBatch.setOrderQuantity(imminentBatch.getOrderQuantity() - orderItem.getQuantity()); + imminentBatches.add(imminentBatch); + } + if (imminentBatches.size() > 0) { + goodsImminentBatchService.updateBatchById(imminentBatches); + } + } + return true; } @Override diff --git a/src/main/java/com/qs/serve/modules/wx/controller/my/WxFormPushMyController.java b/src/main/java/com/qs/serve/modules/wx/controller/my/WxFormPushMyController.java index 23eb76b9..d9eb9f96 100644 --- a/src/main/java/com/qs/serve/modules/wx/controller/my/WxFormPushMyController.java +++ b/src/main/java/com/qs/serve/modules/wx/controller/my/WxFormPushMyController.java @@ -7,7 +7,6 @@ import com.qs.serve.common.model.dto.R; import com.qs.serve.common.model.enums.BizType; import com.qs.serve.common.model.enums.SystemModule; import com.qs.serve.common.util.*; -import com.qs.serve.modules.baz.entity.BazVisitInstance; import com.qs.serve.modules.sys.entity.SysAttach; import com.qs.serve.modules.sys.service.SysAttachService; import com.qs.serve.modules.wx.entity.WxFormPush;