From 679449fa17ac1bed188aaa4e1ed7387d8ccabc35 Mon Sep 17 00:00:00 2001 From: Yen Date: Fri, 21 Jun 2024 15:54:43 +0800 Subject: [PATCH] =?UTF-8?q?opt:=20=E8=AE=A2=E5=8D=95=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E5=B1=82=E6=8B=86=E5=88=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bms/controller/BmsSupplierController.java | 3 + .../oms/controller/api/OmsOrderApi.java | 15 ++- .../oms/entity/bo/OmsVerifySkuParam.java | 16 ++++ .../oms/service/OmsOrderPart1Service.java | 30 ++++++ .../modules/oms/service/OmsOrderService.java | 6 -- .../impl/OmsOrderPart1ServiceImpl.java | 94 +++++++++++++++++++ .../oms/service/impl/OmsOrderServiceImpl.java | 85 ----------------- 7 files changed, 157 insertions(+), 92 deletions(-) create mode 100644 src/main/java/com/qs/serve/modules/oms/entity/bo/OmsVerifySkuParam.java create mode 100644 src/main/java/com/qs/serve/modules/oms/service/OmsOrderPart1Service.java create mode 100644 src/main/java/com/qs/serve/modules/oms/service/impl/OmsOrderPart1ServiceImpl.java diff --git a/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierController.java b/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierController.java index d286b49d..6a3314be 100644 --- a/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierController.java +++ b/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierController.java @@ -582,6 +582,9 @@ public class BmsSupplierController { bmsSupplier.setSupplierAttachInfoList(attachService.listByIds(Arrays.asList(bmsSupplier.getSupplierAttachIds()))); } bmsSupplier.setUserVos(userVos); + + initSupplierList(Arrays.asList(bmsSupplier)); + return R.ok(bmsSupplier); } 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 71e07a62..017ecad2 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 @@ -27,6 +27,7 @@ import com.qs.serve.modules.oms.entity.OmsOrderItem; import com.qs.serve.modules.oms.entity.bo.*; import com.qs.serve.modules.oms.entity.vo.OmsConfirmOrderResult; import com.qs.serve.modules.oms.service.OmsOrderItemService; +import com.qs.serve.modules.oms.service.OmsOrderPart1Service; import com.qs.serve.modules.oms.service.OmsOrderService; import com.qs.serve.modules.seeyon.service.impl.SeeYonRequestBaseService; import com.qs.serve.modules.sys.entity.SysUser; @@ -65,6 +66,7 @@ public class OmsOrderApi { private SysPostUserService postUserService; private SeeYonRequestBaseService seeYonRequestBaseService; private GoodsImminentBatchMapper goodsImminentBatchMapper; + private OmsOrderPart1Service omsOrderPart1Service; /** * 确认订单 @@ -340,6 +342,17 @@ public class OmsOrderApi { return R.ok(); } + + /** + * 校验sku合法性 + * @param verifySkuParam + * @return + */ + @PostMapping("/verifySku") + public R verifySku(OmsVerifySkuParam verifySkuParam){ + return R.ok(omsOrderPart1Service.verifySku(verifySkuParam)); + } + /** * 复制订单 * @param orderId @@ -347,7 +360,7 @@ public class OmsOrderApi { */ @PostMapping("/copyOrder/{orderId}") public R copyOrder(@PathVariable Long orderId){ - return R.ok(omsOrderService.copyOrder(orderId)); + return R.ok(omsOrderPart1Service.copyOrder(orderId)); } } diff --git a/src/main/java/com/qs/serve/modules/oms/entity/bo/OmsVerifySkuParam.java b/src/main/java/com/qs/serve/modules/oms/entity/bo/OmsVerifySkuParam.java new file mode 100644 index 00000000..c2f7f36c --- /dev/null +++ b/src/main/java/com/qs/serve/modules/oms/entity/bo/OmsVerifySkuParam.java @@ -0,0 +1,16 @@ +package com.qs.serve.modules.oms.entity.bo; + +import lombok.Data; + +import java.util.List; + +/** + * @author YenHex + * @since 2024/6/21 + */ +@Data +public class OmsVerifySkuParam { + + private List skuIds; + +} diff --git a/src/main/java/com/qs/serve/modules/oms/service/OmsOrderPart1Service.java b/src/main/java/com/qs/serve/modules/oms/service/OmsOrderPart1Service.java new file mode 100644 index 00000000..982fd178 --- /dev/null +++ b/src/main/java/com/qs/serve/modules/oms/service/OmsOrderPart1Service.java @@ -0,0 +1,30 @@ +package com.qs.serve.modules.oms.service; + +import com.qs.serve.modules.oms.entity.OmsOrder; +import com.qs.serve.modules.oms.entity.bo.OmsVerifySkuParam; + +import java.util.List; + +/** + * @author YenHex + * @since 2024/6/21 + */ +public interface OmsOrderPart1Service { + + + /** + * 复制订单 + * @param orderId + * @return + */ + OmsOrder copyOrder(Long orderId); + + + /** + * 校验sku合法性 + * @param param + * @return + */ + List verifySku(OmsVerifySkuParam param); + +} diff --git a/src/main/java/com/qs/serve/modules/oms/service/OmsOrderService.java b/src/main/java/com/qs/serve/modules/oms/service/OmsOrderService.java index f6918b00..2412f5a3 100644 --- a/src/main/java/com/qs/serve/modules/oms/service/OmsOrderService.java +++ b/src/main/java/com/qs/serve/modules/oms/service/OmsOrderService.java @@ -78,12 +78,6 @@ public interface OmsOrderService extends IService { */ OmsOrder modifyImminentOrder(OmsOrderImminentBo param); - /** - * 复制订单 - * @param orderId - * @return - */ - OmsOrder copyOrder(Long orderId); } 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 new file mode 100644 index 00000000..1f4bd52b --- /dev/null +++ b/src/main/java/com/qs/serve/modules/oms/service/impl/OmsOrderPart1ServiceImpl.java @@ -0,0 +1,94 @@ +package com.qs.serve.modules.oms.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.qs.serve.common.util.Assert; +import com.qs.serve.common.util.AuthContextUtils; +import com.qs.serve.common.util.CodeGenUtil; +import com.qs.serve.modules.bms.entity.BmsSupplier; +import com.qs.serve.modules.goods.entity.dto.GoodsAccrIdsDto; +import com.qs.serve.modules.oms.entity.OmsOrder; +import com.qs.serve.modules.oms.entity.OmsOrderItem; +import com.qs.serve.modules.oms.entity.bo.OmsVerifySkuParam; +import com.qs.serve.modules.oms.service.OmsOrderItemService; +import com.qs.serve.modules.oms.service.OmsOrderPart1Service; +import com.qs.serve.modules.oms.service.OmsOrderService; +import com.qs.serve.modules.sys.entity.SysUser; +import com.qs.serve.modules.sys.service.SysUserService; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +import java.util.List; +import java.util.stream.Collectors; + +/** + * @author YenHex + * @since 2024/6/21 + */ +@Slf4j +@Service +@AllArgsConstructor +public class OmsOrderPart1ServiceImpl implements OmsOrderPart1Service { + + private SysUserService sysUserService; + private OmsOrderService omsOrderService; + private OmsOrderItemService omsOrderItemService; + + @Override + public OmsOrder copyOrder(Long orderId) { + OmsOrder orgOrder = omsOrderService.getById(orderId); + List orderItems = omsOrderItemService.list(new LambdaQueryWrapper() + .eq(OmsOrderItem::getOrderId,orderId)); + OmsOrder order = new OmsOrder(); + order.setId(null); + order.setOrderType(orgOrder.getOrderType()); + String orderPrefix = null; + if(order.getOrderType().equals(0)){ + orderPrefix = "SN"; + }else if(order.getOrderType().equals(1)){ + orderPrefix = "ZP"; + }else if(order.getOrderType().equals(2)){ + orderPrefix = "SC"; + }else if(order.getOrderType().equals(3)){ + orderPrefix = "SP"; + }else { + Assert.throwEx("订单类型错误"); + } + order.setOrderSn(orderPrefix+ CodeGenUtil.generate(CodeGenUtil.SourceKey.OmsOrder)); + SysUser user = sysUserService.getById(AuthContextUtils.getSysUserId()); + order.setUserId(user.getId()); + order.setUserCode(user.getCode()); + order.setUserName(user.getName()); + order.setUserPhone(user.getMobile()); + order.setCheckState(0); + + order.setLatitudeFrom(orgOrder.getLatitudeFrom()); + order.setOrderSource(orgOrder.getOrderSource()); + order.setSupplierId(orgOrder.getSupplierId()); + order.setSupplierCode(orgOrder.getSupplierCode()); + order.setSupplierName(orgOrder.getSupplierName()); + order.setSupplierAddrId(orgOrder.getSupplierAddrId()); + order.setBrandRuleId(orgOrder.getBrandRuleId()); + order.setBrandRuleName(orgOrder.getBrandRuleName()); + + order.setBillType(orgOrder.getBillType()); + order.setCdOrderRemark(orgOrder.getCdOrderRemark()); + order.setRemark(orgOrder.getRemark()); + + + omsOrderService.save(order); + for (OmsOrderItem item : orderItems) { + item.setId(null); + item.setOrderId(order.getId()); + } + omsOrderItemService.saveBatch(orderItems); + return order; + } + + @Override + public List verifySku(OmsVerifySkuParam param) { + + return null; + } + +} diff --git a/src/main/java/com/qs/serve/modules/oms/service/impl/OmsOrderServiceImpl.java b/src/main/java/com/qs/serve/modules/oms/service/impl/OmsOrderServiceImpl.java index cfed9e39..c6b9eb1e 100644 --- a/src/main/java/com/qs/serve/modules/oms/service/impl/OmsOrderServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/oms/service/impl/OmsOrderServiceImpl.java @@ -784,56 +784,6 @@ public class OmsOrderServiceImpl extends ServiceImpl im return order; } - @Override - public OmsOrder copyOrder(Long orderId) { - OmsOrder orgOrder = this.getById(orderId); - List orderItems = omsOrderItemService.list(new LambdaQueryWrapper() - .eq(OmsOrderItem::getOrderId,orderId)); - OmsOrder order = new OmsOrder(); - order.setId(null); - order.setOrderType(orgOrder.getOrderType()); - String orderPrefix = null; - if(order.getOrderType().equals(0)){ - orderPrefix = "SN"; - }else if(order.getOrderType().equals(1)){ - orderPrefix = "ZP"; - }else if(order.getOrderType().equals(2)){ - orderPrefix = "SC"; - }else if(order.getOrderType().equals(3)){ - orderPrefix = "SP"; - }else { - Assert.throwEx("订单类型错误"); - } - order.setOrderSn(orderPrefix+CodeGenUtil.generate(CodeGenUtil.SourceKey.OmsOrder)); - SysUser user = sysUserService.getById(AuthContextUtils.getSysUserId()); - order.setUserId(user.getId()); - order.setUserCode(user.getCode()); - order.setUserName(user.getName()); - order.setUserPhone(user.getMobile()); - order.setCheckState(0); - - order.setLatitudeFrom(orgOrder.getLatitudeFrom()); - order.setOrderSource(orgOrder.getOrderSource()); - order.setSupplierId(orgOrder.getSupplierId()); - order.setSupplierCode(orgOrder.getSupplierCode()); - order.setSupplierName(orgOrder.getSupplierName()); - order.setSupplierAddrId(orgOrder.getSupplierAddrId()); - order.setBrandRuleId(orgOrder.getBrandRuleId()); - order.setBrandRuleName(orgOrder.getBrandRuleName()); - - order.setBillType(orgOrder.getBillType()); - order.setCdOrderRemark(orgOrder.getCdOrderRemark()); - order.setRemark(orgOrder.getRemark()); - - - this.save(order); - for (OmsOrderItem item : orderItems) { - item.setId(null); - item.setOrderId(order.getId()); - } - omsOrderItemService.saveBatch(orderItems); - return order; - } @NotNull private OmsOrderItem createImminentOrderItem(OmsOrder order, List spuList, OmsOrderImminentBo.ItemParam item, GoodsImminentBatch batch, GoodsSku sku) { @@ -1104,40 +1054,5 @@ public class OmsOrderServiceImpl extends ServiceImpl im return r.getStatus()==200; } - private void toU8Api(OmsOrder omsOrder, SysUser sysUser, SysDept dept, List list) { - List inventoryItemList = new ArrayList<>(); - for (OmsOrderItem orderItem : list) { - ErpOfferOrderParam.InventoryItem inventoryItem = new ErpOfferOrderParam.InventoryItem(); - inventoryItem.setEmpItemId(orderItem.getId()+""); - inventoryItem.setEmpQty(orderItem.getQuantity().longValue()); - inventoryItem.setInvCode(orderItem.getSpuCode()); - inventoryItem.setQuantity(orderItem.getQuantity().longValue()); - //设置客户特殊价 - - inventoryItem.setOfferPrice(orderItem.getSalesPrice()); - inventoryItem.setHasRatePrice(orderItem.getSalesPrice()); - inventoryItem.setHasRateSumPrice(orderItem.getSalesPrice().multiply(new BigDecimal(orderItem.getQuantity()))); - inventoryItem.setRemark("CRM创建的报价单"); - inventoryItemList.add(inventoryItem); - } - - ErpOfferOrderParam offerOrder = new ErpOfferOrderParam(); - offerOrder.setCode(omsOrder.getOrderSn()); - offerOrder.setEmpOrderId(omsOrder.getId()+""); - offerOrder.setDate(new Date()); - //offerOrder.setSaleTypeCode(); - offerOrder.setCusCode(omsOrder.getSupplierCode()); - offerOrder.setDepCode(dept.getCode()); - // 普通13，赠品&试吃品0 - //offerOrder.setTaxRate(); - offerOrder.setRemark(omsOrder.getRemark()); - //offerOrder.setRemark2(); - //offerOrder.setCusPrice(); - //offerOrder.setUnfinishedOrderCount(); - offerOrder.setInventoryItemList(inventoryItemList); - offerOrder.setCusName(omsOrder.getSupplierName()); - offerOrder.setMakerName(sysUser.getName()); - } - }