From 148e21208d78f33e1d04a5a6f4476cef1ebfbf0f Mon Sep 17 00:00:00 2001 From: Yen Date: Fri, 14 Feb 2025 14:29:17 +0800 Subject: [PATCH] =?UTF-8?q?opt:=20=E9=94=80=E5=94=AE=E5=8D=95=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../oms/controller/OmsOrderController.java | 15 ++++++++--- .../oms/controller/api/OmsOrderApi.java | 6 +++++ .../impl/OmsSaleOrderPart1ServiceImpl.java | 27 ++++++++----------- .../service/impl/OmsSaleOrderServiceImpl.java | 3 ++- 4 files changed, 30 insertions(+), 21 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 5573364b..d62bd4af 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 @@ -5,12 +5,10 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.qs.serve.common.model.annotation.SysLog; import com.qs.serve.common.model.dto.PageVo; import com.qs.serve.common.model.dto.R; +import com.qs.serve.common.model.dto.SimpleKeyValue; 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.JsonUtil; -import com.qs.serve.common.util.PageUtil; -import com.qs.serve.common.util.SpringUtils; +import com.qs.serve.common.util.*; import com.qs.serve.modules.bms.entity.BmsSupplier; import com.qs.serve.modules.bms.entity.BmsSupplierAddress; import com.qs.serve.modules.bms.mapper.BmsSupplierMapper; @@ -22,6 +20,7 @@ import com.qs.serve.modules.oms.entity.bo.OmsSpuAssesInfoBo; import com.qs.serve.modules.oms.entity.bo.OmsUrgentParam; import com.qs.serve.modules.oms.entity.bo.OrderRelateQuery; import com.qs.serve.modules.oms.entity.vo.OmsSpuAssesInfo; +import com.qs.serve.modules.oms.mapper.OmsOrderMapper; import com.qs.serve.modules.oms.service.OmsOrderItemService; import com.qs.serve.modules.oms.service.OmsOrderOptionsService; import com.qs.serve.modules.seeyon.service.impl.SeeYonRequestBaseService; @@ -58,6 +57,7 @@ import static com.qs.serve.modules.tbs.common.TbsSeeYonConst.ERP_ORDER_SOURCE; public class OmsOrderController { private OmsOrderService omsOrderService; + private OmsOrderMapper omsOrderMapper; private BmsSupplierAddressService bmsSupplierAddressService; private OmsOrderOptionsService omsOrderOptionsService; private SysUserService sysUserService; @@ -146,6 +146,13 @@ public class OmsOrderController { List orderItems = omsOrderItemService.list(new LambdaQueryWrapper().in(OmsOrderItem::getOrderId,orderIds)); Map> orderItemsMap = orderItems.stream().collect(Collectors.groupingBy(OmsOrderItem::getOrderId)); for (OmsOrder order : list) { + + // 关联折扣信息 + if(StringUtils.hasText(order.getOaRateId())){ + SimpleKeyValue obj = omsOrderMapper.getExpiredRateInfo(order.getOaRateId()); + order.setDiscountRateInfo(obj); + } + BmsSupplierAddress supplierAddress = null; if(order.getSupplierAddrId()!=null){ for (BmsSupplierAddress address : supplierAddressList) { 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 a219267e..4b983380 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 @@ -313,6 +313,12 @@ public class OmsOrderApi { List items = omsOrderItemService.list(lqw); Map> orderItemMap = items.stream().collect(Collectors.groupingBy(OmsOrderItem::getOrderId)); for (OmsOrder order : list) { + // 关联折扣信息 + if(StringUtils.hasText(order.getOaRateId())){ + SimpleKeyValue obj = omsOrderMapper.getExpiredRateInfo(order.getOaRateId()); + order.setDiscountRateInfo(obj); + } + if(order.getSupplierAddrId()!=null){ for (BmsSupplierAddress address : supplierAddressList) { if(order.getSupplierAddrId().equals(address.getId())){ diff --git a/src/main/java/com/qs/serve/modules/oms/service/impl/OmsSaleOrderPart1ServiceImpl.java b/src/main/java/com/qs/serve/modules/oms/service/impl/OmsSaleOrderPart1ServiceImpl.java index df771090..f26ec14f 100644 --- a/src/main/java/com/qs/serve/modules/oms/service/impl/OmsSaleOrderPart1ServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/oms/service/impl/OmsSaleOrderPart1ServiceImpl.java @@ -35,6 +35,7 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import java.time.LocalDate; +import java.time.LocalDateTime; import java.util.ArrayList; import java.util.List; import java.util.stream.Collectors; @@ -74,11 +75,10 @@ public class OmsSaleOrderPart1ServiceImpl implements OmsSaleOrderPart1Service { @Override public OmsSaleOrder copyOrder(Long orderId) { - OmsSaleOrder orgOrder = omsSaleOrderService.getById(orderId); + OmsSaleOrder order = omsSaleOrderService.getById(orderId); List orderItems = omsSaleOrderItemService.list(new LambdaQueryWrapper() .eq(OmsSaleOrderItem::getOrderId, orderId)); - OmsSaleOrder order = new OmsSaleOrder(); - order.setOrderType(orgOrder.getOrderType()); + order.setId(null); String orderPrefix = null; if (order.getOrderType().equals(0)) { orderPrefix = "SN"; @@ -103,20 +103,15 @@ public class OmsSaleOrderPart1ServiceImpl implements OmsSaleOrderPart1Service { order.setUserPhone(user.getMobile()); order.setCheckState(0); order.setStatus(0); + order.setOrderStatusCombo(0); + order.setPreDeliveryDate(null); + order.setPreDeliveryState(0); + order.setPreProductionDate(null); order.setOrderCheckState(OmsOrderCheckState.UnPublish.getCode()); - 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()); - - + order.setConfirmUserCode(null); + order.setConfirmUserName(null); + order.setCreateBy(null); + order.setCreateTime(LocalDateTime.now()); omsSaleOrderService.save(order); for (OmsSaleOrderItem item : orderItems) { item.setId(null); diff --git a/src/main/java/com/qs/serve/modules/oms/service/impl/OmsSaleOrderServiceImpl.java b/src/main/java/com/qs/serve/modules/oms/service/impl/OmsSaleOrderServiceImpl.java index e0ba47de..76f26a79 100644 --- a/src/main/java/com/qs/serve/modules/oms/service/impl/OmsSaleOrderServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/oms/service/impl/OmsSaleOrderServiceImpl.java @@ -1387,7 +1387,8 @@ public class OmsSaleOrderServiceImpl extends ServiceImpl