已入仓订单修改审批时检查是否需要重新匹配优惠活动

yudao-module-delivery/yudao-module-delivery-rest/src/main/java/cn/iocoder/yudao/module/delivery/controller/admin/EcwVzController.java

@@ -4,13 +4,13 @@ import cn.iocoder.yudao.framework.apollo.core.event.Customer.ReceiveCustomerCalT
 import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
 import cn.iocoder.yudao.module.delivery.entity.EcwVz;
 import cn.iocoder.yudao.module.delivery.entity.EcwVzPageReq;
-import cn.iocoder.yudao.module.delivery.entity.deptex.zTest;
+//import cn.iocoder.yudao.module.delivery.entity.deptex.zTest;
 import cn.iocoder.yudao.module.delivery.listener.TestEvent;
 import cn.iocoder.yudao.module.delivery.service.EcwVzService;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.module.delivery.service.OrderServiceExt;
-import cn.iocoder.yudao.module.delivery.service.ZTestService;
+//import cn.iocoder.yudao.module.delivery.service.ZTestService;
 import cn.iocoder.yudao.module.order.dal.dataobject.order.OrderDO;
 import cn.iocoder.yudao.module.order.service.order.OrderService;
 import com.alibaba.fastjson.JSON;
@@ -47,9 +47,9 @@ public class EcwVzController {
      */
     @Resource
     private EcwVzService ecwVzService;
-
-    @Resource
-    private ZTestService zTestService;
+//
+//    @Resource
+//    private ZTestService zTestService;
 
     @Autowired
     private OrderService orderService;
@@ -160,7 +160,7 @@ public class EcwVzController {
          */
 
 
-        zTest m = new zTest();
+//        zTest m = new zTest();
 
         orderService.UpdateOrderYeJiType((long) 1, 1);
 
@@ -168,15 +168,15 @@ public class EcwVzController {
 
         ReceiveCustomerCalTypeEvent e = new ReceiveCustomerCalTypeEvent();
         e.setCustomerId((long) 49345);
-        if (orderServiceExt.IsHavingOrder(e) == 0) {
-            m.setTestname("无业绩");
-            m.setCreatedate(new Date());
-            zTestService.save(m);
-        } else {
-            m.setTestname("有业绩");
-            m.setCreatedate(new Date());
-            zTestService.save(m);
-        }
+//        if (orderServiceExt.IsHavingOrder(e) == 0) {
+//            m.setTestname("无业绩");
+//            m.setCreatedate(new Date());
+//            zTestService.save(m);
+//        } else {
+//            m.setTestname("有业绩");
+//            m.setCreatedate(new Date());
+//            zTestService.save(m);
+//        }
 
         return success(true);
     }

yudao-module-delivery/yudao-module-delivery-rest/src/main/java/cn/iocoder/yudao/module/delivery/entity/deptex/zTest.java

-package cn.iocoder.yudao.module.delivery.entity.deptex;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.util.Date;
-
-@TableName("z_test")
-@Data
-public class zTest {
-
-    private Long id;
-    private String testname;
-
-    private Date createdate;
-}
+//package cn.iocoder.yudao.module.delivery.entity.deptex;
+//
+//import com.baomidou.mybatisplus.annotation.TableName;
+//import lombok.Data;
+//import lombok.EqualsAndHashCode;
+//
+//import java.util.Date;
+//
+//@TableName("z_test")
+//@Data
+//public class zTest {
+//
+//    private Long id;
+//    private String testname;
+//
+//    private Date createdate;
+//}

yudao-module-delivery/yudao-module-delivery-rest/src/main/java/cn/iocoder/yudao/module/delivery/listener/CalculateCustomerType.java

@@ -2,9 +2,9 @@ package cn.iocoder.yudao.module.delivery.listener;
 
 import cn.iocoder.yudao.framework.apollo.core.event.Customer.CalculateCustomerTypeEvent;
 import cn.iocoder.yudao.module.customer.service.customer.CustomerService;
-import cn.iocoder.yudao.module.delivery.entity.deptex.zTest;
+//import cn.iocoder.yudao.module.delivery.entity.deptex.zTest;
 import cn.iocoder.yudao.module.delivery.service.OrderServiceExt;
-import cn.iocoder.yudao.module.delivery.service.ZTestService;
+//import cn.iocoder.yudao.module.delivery.service.ZTestService;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.context.event.EventListener;
@@ -23,8 +23,8 @@ public class CalculateCustomerType {
     @Resource
     private CustomerService customerService;
 
-    @Resource
-    private ZTestService zTestService;
+//    @Resource
+//    private ZTestService zTestService;
 
 
     @Resource
@@ -37,7 +37,7 @@ public class CalculateCustomerType {
     @EventListener(CalculateCustomerTypeEvent.class)
     public void CalculateCustomerTypePushEvent(
             CalculateCustomerTypeEvent event) {
-        zTest m=new zTest();
+//        zTest m=new zTest();
         String sMsg="计算开始"+event.getCustomerId();
         if (event.getNewCustomerService() == event.getOldCustomerService()) {
             //新客户经理和老客户经理是同一客户经理
@@ -66,9 +66,9 @@ public class CalculateCustomerType {
             sMsg+=",新老不一致";
             customerService.updateCustomerNewOrOld(event.getCustomerId(), true);
         }
-        m.setTestname(sMsg);
-        m.setCreatedate(new Date());
-        zTestService.save(m);
+//        m.setTestname(sMsg);
+//        m.setCreatedate(new Date());
+//        zTestService.save(m);
     }
 
     /*

yudao-module-delivery/yudao-module-delivery-rest/src/main/java/cn/iocoder/yudao/module/delivery/listener/CalculateOrderVValueListener.java

@@ -3,9 +3,9 @@ package cn.iocoder.yudao.module.delivery.listener;
 import cn.iocoder.yudao.framework.apollo.core.event.Order.CalculateOrderVValueEvent;
 import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
 import cn.iocoder.yudao.module.delivery.entity.EcwVz;
-import cn.iocoder.yudao.module.delivery.entity.deptex.zTest;
+//import cn.iocoder.yudao.module.delivery.entity.deptex.zTest;
 import cn.iocoder.yudao.module.delivery.service.EcwVzService;
-import cn.iocoder.yudao.module.delivery.service.ZTestService;
+//import cn.iocoder.yudao.module.delivery.service.ZTestService;
 import cn.iocoder.yudao.module.order.dal.dataobject.order.OrderDO;
 import cn.iocoder.yudao.module.order.service.order.OrderService;
 import lombok.AllArgsConstructor;
@@ -35,26 +35,26 @@ public class CalculateOrderVValueListener {
     @Autowired
     private EcwVzService ecwVzService;
 
-    @Resource
-    private ZTestService zTestService;
+//    @Resource
+//    private ZTestService zTestService;
 
     @EventListener(CalculateOrderVValueEvent.class)
     public void CalculateOrderVValuePushEvent(
             CalculateOrderVValueEvent event) {
-        zTest m = new zTest();
+//        zTest m = new zTest();
         String sMsg = "计算V值";
         OrderDO orderDO = orderService.getById(event.getOrderId());
         if (orderDO == null) {
             throw exception(ORDER_NOT_EXISTS);
         }
 
-        if (orderDO.getRucangTime() == null) {
-            sMsg += ",订单入仓时间为空，暂不处理。";
-            m.setTestname(sMsg);
-            m.setCreatedate(new Date());
-            zTestService.save(m);
-            return;
-        }
+//        if (orderDO.getRucangTime() == null) {
+//            sMsg += ",订单入仓时间为空，暂不处理。";
+//            m.setTestname(sMsg);
+//            m.setCreatedate(new Date());
+//            zTestService.save(m);
+//            return;
+//        }
 
         //订单状态为已入仓之后的状态，其他状态是否排除，后续和客户确认，先按此逻辑处理
         int nS = orderDO.getStatus();
@@ -103,9 +103,9 @@ public class CalculateOrderVValueListener {
             sMsg += ",未入仓";
         }
 
-        m.setTestname(sMsg);
-        m.setCreatedate(new Date());
-        zTestService.save(m);
+//        m.setTestname(sMsg);
+//        m.setCreatedate(new Date());
+//        zTestService.save(m);
 
     }
 }

yudao-module-delivery/yudao-module-delivery-rest/src/main/java/cn/iocoder/yudao/module/delivery/listener/CalculateOrderYeJiTypeListener.java

@@ -4,8 +4,8 @@ import cn.iocoder.yudao.framework.apollo.core.event.Customer.CalculateCustomerTy
 import cn.iocoder.yudao.framework.apollo.core.event.Order.CalculateOrderYeJiTypeEvent;
 import cn.iocoder.yudao.module.customer.dal.dataobject.customer.CustomerDO;
 import cn.iocoder.yudao.module.customer.service.customer.CustomerService;
-import cn.iocoder.yudao.module.delivery.entity.deptex.zTest;
-import cn.iocoder.yudao.module.delivery.service.ZTestService;
+//import cn.iocoder.yudao.module.delivery.entity.deptex.zTest;
+//import cn.iocoder.yudao.module.delivery.service.ZTestService;
 import cn.iocoder.yudao.module.order.dal.dataobject.order.OrderDO;
 import cn.iocoder.yudao.module.order.service.order.OrderService;
 import lombok.AllArgsConstructor;
@@ -35,15 +35,15 @@ public class CalculateOrderYeJiTypeListener {
 
     @Autowired
     private CustomerService customerService;
-
-    @Resource
-    private ZTestService zTestService;
+//
+//    @Resource
+//    private ZTestService zTestService;
 
     @EventListener(CalculateOrderYeJiTypeEvent.class)
     public void CalculateOrderYeJiTypePushEvent(
             CalculateOrderYeJiTypeEvent event) {
 
-        zTest m=new zTest();
+//        zTest m=new zTest();
         String sMsg="计算业绩类型"+event.getCustomerId();
 
         OrderDO orderDO = orderService.getById(event.getOrderId());
@@ -55,10 +55,10 @@ public class CalculateOrderYeJiTypeListener {
         CustomerDO customerDO = customerService.getById(event.getCustomerId());
         if (customerDO == null) {
             //throw exception(CUSTOMER_NOT_EXISTS);
-            sMsg+=",客户不存在先不计算业绩类型";
-            m.setTestname(sMsg);
-            m.setCreatedate(new Date());
-            zTestService.save(m);
+//            sMsg+=",客户不存在先不计算业绩类型";
+//            m.setTestname(sMsg);
+//            m.setCreatedate(new Date());
+//            zTestService.save(m);
             return;
         }
 
@@ -74,9 +74,9 @@ public class CalculateOrderYeJiTypeListener {
 
         orderService.UpdateOrderYeJiType(event.getOrderId(), isNew);
 
-        m.setTestname(sMsg);
-        m.setCreatedate(new Date());
-        zTestService.save(m);
+//        m.setTestname(sMsg);
+//        m.setCreatedate(new Date());
+//        zTestService.save(m);
 
     }
 }

yudao-module-delivery/yudao-module-delivery-rest/src/main/java/cn/iocoder/yudao/module/delivery/listener/ReceiveCustomerCalTypeListener.java

@@ -2,10 +2,10 @@ package cn.iocoder.yudao.module.delivery.listener;
 
 import cn.iocoder.yudao.framework.apollo.core.event.Customer.ReceiveCustomerCalTypeEvent;
 import cn.iocoder.yudao.module.customer.service.customer.CustomerService;
-import cn.iocoder.yudao.module.delivery.entity.deptex.zTest;
+//import cn.iocoder.yudao.module.delivery.entity.deptex.zTest;
 import cn.iocoder.yudao.module.delivery.service.Impl.OrderServiceExtImpl;
 import cn.iocoder.yudao.module.delivery.service.OrderServiceExt;
-import cn.iocoder.yudao.module.delivery.service.ZTestService;
+//import cn.iocoder.yudao.module.delivery.service.ZTestService;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.context.event.EventListener;
@@ -28,8 +28,8 @@ public class ReceiveCustomerCalTypeListener {
     @Resource
     private OrderServiceExt orderServiceExt;
 
-    @Resource
-    private ZTestService zTestService;
+//    @Resource
+//    private ZTestService zTestService;
 
     @EventListener(ReceiveCustomerCalTypeEvent.class)
     public void CalculateCustomerTypePushEvent(
@@ -37,7 +37,7 @@ public class ReceiveCustomerCalTypeListener {
         //CustomerServiceImpl confirmCustomer 函数中触发事件 客户经理直接确认接收
         //CustomerServiceImpl receiveCustomer 函数中触发，移交，系统分配，接收时判断
         //CustomerServiceImpl updateCustomer  函数中触发，完善客户信息
-        zTest m=new zTest();
+//        zTest m=new zTest();
         String sMsg="接收客户"+event.getCustomerId();
         if (event.getIsNew() == true) {
             //移交接收前是新客户
@@ -58,9 +58,9 @@ public class ReceiveCustomerCalTypeListener {
             //维持老客户不变，可不做任何逻辑操作
             sMsg+=",老客户";
         }
-        m.setTestname(sMsg);
-        m.setCreatedate(new Date());
-        zTestService.save(m);
+//        m.setTestname(sMsg);
+//        m.setCreatedate(new Date());
+//        zTestService.save(m);
     }
 
     /*

yudao-module-delivery/yudao-module-delivery-rest/src/main/java/cn/iocoder/yudao/module/delivery/mapper/MyTest.java

-package cn.iocoder.yudao.module.delivery.mapper;
-
-import cn.iocoder.yudao.module.delivery.entity.deptex.zTest;
-import org.apache.ibatis.annotations.Insert;
-import org.apache.ibatis.annotations.Options;
-import org.apache.ibatis.annotations.Select;
-import org.apache.ibatis.annotations.Update;
-
-import java.util.List;
-
-/*
- 用注解实现简单的功能
- */
-public interface MyTest {
-    // 查询所有商品类型
-    @Select("select * from z_test")
-    public List<zTest> selectAll();
-
-    // 根据类型编号查询商品类型
-    @Select("select * from z_test where id = #{id}")
-    zTest selectById(int id);
-
-    // 添加商品类型
-    @Insert("insert into z_test(name) values(#{name})")
-    @Options(useGeneratedKeys = true, keyProperty = "id")
-    public int add(zTest type);
-
-    // 更新商品类型
-    @Update("update z_test set name = #{name} where  id = #{id}")
-    public int update(zTest type);
-}
+//package cn.iocoder.yudao.module.delivery.mapper;
+//
+//import cn.iocoder.yudao.module.delivery.entity.deptex.zTest;
+//import org.apache.ibatis.annotations.Insert;
+//import org.apache.ibatis.annotations.Options;
+//import org.apache.ibatis.annotations.Select;
+//import org.apache.ibatis.annotations.Update;
+//
+//import java.util.List;
+//
+///*
+// 用注解实现简单的功能
+// */
+//public interface MyTest {
+//    // 查询所有商品类型
+//    @Select("select * from z_test")
+//    public List<zTest> selectAll();
+//
+//    // 根据类型编号查询商品类型
+//    @Select("select * from z_test where id = #{id}")
+//    zTest selectById(int id);
+//
+//    // 添加商品类型
+//    @Insert("insert into z_test(name) values(#{name})")
+//    @Options(useGeneratedKeys = true, keyProperty = "id")
+//    public int add(zTest type);
+//
+//    // 更新商品类型
+//    @Update("update z_test set name = #{name} where  id = #{id}")
+//    public int update(zTest type);
+//}

yudao-module-delivery/yudao-module-delivery-rest/src/main/java/cn/iocoder/yudao/module/delivery/mapper/ZTestMapper.java

-package cn.iocoder.yudao.module.delivery.mapper;
-
-import cn.iocoder.yudao.module.delivery.entity.deptex.zTest;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Mapper;
-
-@Mapper
-public interface ZTestMapper extends BaseMapper<zTest> {
-}
+//package cn.iocoder.yudao.module.delivery.mapper;
+//
+//import cn.iocoder.yudao.module.delivery.entity.deptex.zTest;
+//import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+//import org.apache.ibatis.annotations.Mapper;
+//
+//@Mapper
+//public interface ZTestMapper extends BaseMapper<zTest> {
+//}

yudao-module-delivery/yudao-module-delivery-rest/src/main/java/cn/iocoder/yudao/module/delivery/service/Impl/ZTestImpl.java

-package cn.iocoder.yudao.module.delivery.service.Impl;
-
-import cn.iocoder.yudao.module.delivery.entity.deptex.zTest;
-import cn.iocoder.yudao.module.delivery.mapper.ZTestMapper;
-import cn.iocoder.yudao.module.delivery.service.ZTestService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-@Service("ZTestService")
-public class ZTestImpl extends ServiceImpl<ZTestMapper, zTest> implements ZTestService {
-
-
-}
+//package cn.iocoder.yudao.module.delivery.service.Impl;
+//
+////import cn.iocoder.yudao.module.delivery.entity.deptex.zTest;
+//import cn.iocoder.yudao.module.delivery.mapper.ZTestMapper;
+////import cn.iocoder.yudao.module.delivery.service.ZTestService;
+//import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+//import org.springframework.stereotype.Service;
+//
+//@Service("ZTestService")
+//public class ZTestImpl extends ServiceImpl<ZTestMapper, zTest> implements ZTestService {
+//
+//
+//}

yudao-module-delivery/yudao-module-delivery-rest/src/main/java/cn/iocoder/yudao/module/delivery/service/ZTestService.java

-package cn.iocoder.yudao.module.delivery.service;
-
-import cn.iocoder.yudao.module.delivery.entity.deptex.zTest;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-public interface ZTestService extends IService<zTest> {
-}
+//package cn.iocoder.yudao.module.delivery.service;
+//
+//import cn.iocoder.yudao.module.delivery.entity.deptex.zTest;
+//import com.baomidou.mybatisplus.extension.service.IService;
+//
+//public interface ZTestService extends IService<zTest> {
+//}

yudao-module-delivery/yudao-module-delivery-rest/src/main/resources/mapper/ZTestMapper.xml

-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.iocoder.yudao.module.delivery.mapper.ZTestMapper">
-
-
-</mapper>
-
-

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/listener/ProductPriceExceptionHandleListener.java

@@ -11,9 +11,9 @@ import cn.iocoder.yudao.module.order.service.order.OrderBusinessService;
 import cn.iocoder.yudao.module.order.service.order.OrderQueryService;
 import cn.iocoder.yudao.module.order.service.orderException.OrderExceptionService;
 import cn.iocoder.yudao.module.order.vo.orderException.OrderExceptionResultHandlerVo;
-import cn.iocoder.yudao.module.product.dal.dataobject.coupon.zTest3;
+//import cn.iocoder.yudao.module.product.dal.dataobject.coupon.zTest3;
 import cn.iocoder.yudao.module.product.dal.dataobject.product.ProductPriceDO;
-import cn.iocoder.yudao.module.product.dal.mysql.coupon.ZTestMapper3;
+//import cn.iocoder.yudao.module.product.dal.mysql.coupon.ZTestMapper3;
 import cn.iocoder.yudao.module.product.vo.productPrice.ClearancePriceEvent;
 import cn.iocoder.yudao.module.product.vo.productPrice.HandleData;
 import cn.iocoder.yudao.module.product.vo.productPrice.HandleExceptionEvent;
@@ -44,8 +44,8 @@ public class ProductPriceExceptionHandleListener {
     private final OrderExceptionService orderExceptionService;
     private final OrderBusinessService orderBusinessService;
 
-    @Resource
-    private ZTestMapper3 zTestMapper;
+//    @Resource
+//    private ZTestMapper3 zTestMapper;
 
     @EventListener(HandleExceptionEvent.class)
     @Async
@@ -65,10 +65,10 @@ public class ProductPriceExceptionHandleListener {
     public void orderOtherFeeEvent(HandleData event) {
         List<ProductPriceDO> priceList = event.getNeedHandleList();
 
-        zTest3 m=new zTest3();
-        m.setTestname("开始处理价格异常。");
-        m.setCreatedate(new Date());
-        zTestMapper.insert(m);
+//        zTest3 m=new zTest3();
+//        m.setTestname("开始处理价格异常。");
+//        m.setCreatedate(new Date());
+//        zTestMapper.insert(m);
 
         //ecw_product_price
         //找出符合条件的订单
@@ -125,10 +125,10 @@ public class ProductPriceExceptionHandleListener {
             }
             else
             {
-                m=new zTest3();
-                m.setTestname("exceptionDOList 为空");
-                m.setCreatedate(new Date());
-                zTestMapper.insert(m);
+//                m=new zTest3();
+//                m.setTestname("exceptionDOList 为空");
+//                m.setCreatedate(new Date());
+//                zTestMapper.insert(m);
             }
 
             //只要有价格就处理清关费未报价异常

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/service/order/impl/OrderBusinessServiceImpl.java

@@ -77,6 +77,7 @@ import cn.iocoder.yudao.module.product.enums.FeeTypeEnum;
 import cn.iocoder.yudao.module.product.param.ProdConditionParam;
 import cn.iocoder.yudao.module.product.service.product.ProductAttrService;
 import cn.iocoder.yudao.module.product.service.product.ProductService;
+import cn.iocoder.yudao.module.product.vo.coupon.CouponInfoVO;
 import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
 import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
 import cn.iocoder.yudao.module.wealth.dal.dataobject.receivable.ReceivableDO;
@@ -2307,9 +2308,9 @@ public class OrderBusinessServiceImpl extends AbstractService<OrderMapper, Order
         OrderConsigneeDO orderConsigneeDO = orderConsigneeService.getOne(new LambdaQueryWrapper<OrderConsigneeDO>().eq(OrderConsigneeDO::getOrderId, orderDO.getOrderId()).orderByDesc(OrderConsigneeDO::getId).last("limit 1"));
         this.costCalculation(userId, orderDO,
                 orderConsignorDO.getCustomerId(),
-                Objects.isNull(orderConsigneeDO)? 0L : orderConsigneeDO.getCustomerId(),
+                Objects.isNull(orderConsigneeDO) ? 0L : orderConsigneeDO.getCustomerId(),
                 orderConsignorDO.getCustomerContactsId(),
-                Objects.isNull(orderConsigneeDO)? 0L : orderConsigneeDO.getCustomerContactsId(),
+                Objects.isNull(orderConsigneeDO) ? 0L : orderConsigneeDO.getCustomerContactsId(),
                 orderItemDOList, 50);
         this.addOrderOperateLog(orderDO.getOrderId(),
                 "有活动更新订单计价", null);
@@ -3448,6 +3449,7 @@ public class OrderBusinessServiceImpl extends AbstractService<OrderMapper, Order
      *                                    20 强制重订价格  30 空运订单每日定时更新价格
      *                                    40 订单异常处理完成更新计价
      *                                    50 更新订单优惠信息
+     *                                    51 检查订单优惠信息，并在当前优惠信息不满足条件后匹配新的优惠信息
      * @return 该运输方式下的报价商品列表信息
      */
     private CalculationItemFeeDto insertOrderItemDOList(String userId,
@@ -3730,7 +3732,15 @@ public class OrderBusinessServiceImpl extends AbstractService<OrderMapper, Order
             param.setOrgClearanceFeePrice(orderItemDO.getOriginalClearanceFreight());
             param.setClearanceFeeCurrency(Objects.isNull(orderItemDO.getClearanceFreightCurrency()) ? null : Integer.valueOf(String.valueOf(orderItemDO.getClearanceFreightCurrency())));
             param.setClearanceFeeVolume(orderItemDO.getClearanceFreightVolume());
-            if (type == 50) {
+            if (type == 51) {
+                param.setCalculationType(7);
+                if (StringUtils.isNotBlank(orderItemDO.getCouponInfo())) {
+                    List<CouponInfoVO> couponInfoVOList = JSONObject.parseArray(orderItemDO.getCouponInfo(), CouponInfoVO.class);
+                    if (CollectionUtil.isNotEmpty(couponInfoVOList)) {
+                        param.setCouponInfoVOList(JSONObject.parseArray(orderItemDO.getCouponInfo(), CouponInfoVO.class));
+                    }
+                }
+            } else if (type == 50) {
                 param.setCalculationType(6);
             } else if (type == 14) {
                 // 批量加价
@@ -3749,23 +3759,30 @@ public class OrderBusinessServiceImpl extends AbstractService<OrderMapper, Order
                 !Objects.equals(orderDO.getStatus(), OrderStatusEnum.DRAFT.getValue())) {
             isWarehouseIn = true;
         }
+        List<ProdConditionParam> prodConditionParams = null;
         // 定单价费用
-        List<ProdConditionParam> prodConditionParams =
-                prodCostCalculation.obtainProdLineOnePrice(
-                        prodConditionParamList,
-                        orderDO.getOrderNo(),
-                        orderDO.getCustomsType(),
-                        orderDO.getCustomerId(),
-                        orderDO.getTransportId(),
-                        orderDO.getLineId(),
-                        orderDO.getChannelId(), isWarehouseIn);
-        //  对订单品名的收费数据进行误差补全，单价最低的品名加上误差值
-        if (type != 1 && type != 2 && !Objects.equals(orderDO.getStatus(),
-                OrderStatusEnum.ORDER_PLACED.getValue()) && !Objects.equals(orderDO.getStatus(), OrderStatusEnum.DRAFT.getValue())) {
-            // 只要不是草稿和待入仓订单，都会对此进行计算, 对误差值进行调整
-            errorValueAdjustment(orderItemDOList,
-                    orderDO,
-                    prodConditionParams);
+        if (type != 51) {
+            prodConditionParams =
+                    prodCostCalculation.obtainProdLineOnePrice(
+                            prodConditionParamList,
+                            orderDO.getOrderNo(),
+                            orderDO.getCustomsType(),
+                            orderDO.getCustomerId(),
+                            orderDO.getTransportId(),
+                            orderDO.getLineId(),
+                            orderDO.getChannelId(), isWarehouseIn);
+
+            //  对订单品名的收费数据进行误差补全，单价最低的品名加上误差值
+            if (type != 1 && type != 2 && !Objects.equals(orderDO.getStatus(),
+                    OrderStatusEnum.ORDER_PLACED.getValue()) && !Objects.equals(orderDO.getStatus(), OrderStatusEnum.DRAFT.getValue())) {
+                // 只要不是草稿和待入仓订单，都会对此进行计算, 对误差值进行调整
+                errorValueAdjustment(orderItemDOList,
+                        orderDO,
+                        prodConditionParams);
+            }
+        } else {
+            prodConditionParams = new ArrayList<>();
+            prodConditionParams.addAll(prodConditionParamList);
         }
         // 计算小计费用
         CalculationCostResultDto resultDto =

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/service/order/impl/OrderServiceImpl.java

@@ -2669,6 +2669,7 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
             infoVO.setOrgValue(vo.getIsCargoControl() ? "是/yes" : "否/no");
             infoVO.setNewValue(updateReqVO.getIsCargoControl() ? "是/yes" : "否/no");
             vo.setIsCargoControl(updateReqVO.getIsCargoControl());
+            vo.setIsCheckCoupon(Boolean.TRUE);
             applyInfoList.add(infoVO);
         }
         Map<Integer, CurrencyRespDTO> currencyMap = currencyApi.getAllCurrency();
@@ -2715,6 +2716,7 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
             infoVO.setOrgValue(vo.getCustomsType() == 1 ? "我司全代/Our full representative" : (vo.getCustomsType() == 2 ? "自单代报/Self reporting" : "混合报关/Mixed customs declaration"));
             infoVO.setNewValue(updateReqVO.getCustomsType() == 1 ? "我司全代/Our full representative" : (updateReqVO.getCustomsType() == 2 ? "自单代报/Self reporting" : "混合报关/Mixed customs declaration"));
             vo.setCustomsType(updateReqVO.getCustomsType());
+            vo.setIsCheckCoupon(Boolean.TRUE);
             applyInfoList.add(infoVO);
         }
         // 出单方式
@@ -5556,38 +5558,6 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
                     descZh, descEn);
             orderExceptionService.createOrderException(orderExceptionCreateReqVO);
         }
-        // TODO 业绩变动逻辑判断已经放入申请时进行判断，此处业务后面删除
-//        Date expireTime = DateUtil.offsetDay(warehouseInDO.getInTime(), 3);
-//        if (expireTime.compareTo(new Date()) >= 0) {
-//            int customerType = 1; // 发货人 1 收货人 2
-//            if (Objects.nonNull(orderDO.getType()) && orderDO.getType().contains("2")) {
-//                // 海外仓归属发货人
-//                orderDO.setCustomerId(consignorDO.getCustomerId());
-//            } else {
-//                // 控货订单归属发货人 / 非控货订单归属收货人
-//                if (orderDO.getIsCargoControl()) {
-//                    orderDO.setCustomerId(consignorDO.getCustomerId());
-//                } else {
-//                    customerType = 2;
-//                    orderDO.setCustomerId(consigneeDO.getCustomerId());
-//                }
-//            }
-//            // 拆单子订单不执行客户经理分配规则，以原单为主
-//            if (Objects.isNull(orderDO.getParentOrderId()) || orderDO.getParentOrderId() == 0) {
-//                // 更新所属客户经理(业务员)
-////                if (Objects.nonNull(orderDO.getCustomerId()) && orderDO.getCustomerId() > 0) {
-//                addOrderCustomerService(orderDO, customerType);
-////                }
-//            }
-//        }
-        // 判断是否需要生成单证异常
-//        if (!Objects.equals(oldOrder.getCustomsType(), orderDO.getCustomsType())) {
-//            if ((orderDO.getCustomsType().equals(2) || orderDO.getCustomsType().equals(3)) && StringUtils.isEmpty(orderDO.getDocumentsFile())) {
-//                OrderExceptionCreateReqVO orderExceptionCreateReqVO = this.genOrderException(orderDO.getOrderId(), orderDO, null, null, OrderExceptionEnum.ORDER_DOC_EXCEPTION,
-//                        OrderExceptionEnum.ORDER_DOC_EXCEPTION.getZhValueDesc(), OrderExceptionEnum.ORDER_DOC_EXCEPTION.getEnValueDesc());
-//                orderExceptionService.createOrderException(orderExceptionCreateReqVO);
-//            }
-//        }
         // 这里可能因为修改内容不触发计价业务，而提交审批内容的同时，提交了不用审批的修改货值，导致费用清单变更，所以这里需要同步当前数据库的费用清单
         orderDO.setCost(oldOrder.getCost());
         // 在这中间可能有订单的入仓子状态变更，例如调仓等操作，需要同步当前数据库订单状态,因为订单审批同时只能有一个，所以审批状态肯定是实时的，只需要同步其他状态
@@ -5624,6 +5594,12 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
             // 强制重新定价, 则需要将特价属性都重置
             orderBusinessService.costCalculation(String.valueOf(userId), orderDO, consignorDO.getCustomerId(), Objects.isNull(consigneeDO) ? 0L : consigneeDO.getCustomerId(),
                     consignorDO.getCustomerContactsId(), Objects.isNull(consigneeDO) ? 0L : consigneeDO.getCustomerContactsId(), orderItemDOList, 10);
+        }else if (orderBackVO.getIsCheckCoupon()){
+            // 如果没有重新计价，这里就需要对订单优惠活动进行检查，是否需要重新匹配新的优惠
+            List<OrderItemDO> orderItemDOList = orderItemMapper.selectList(new LambdaQueryWrapper<OrderItemDO>().eq(OrderItemDO::getOrderId, orderDO.getOrderId()));
+            // 是否需要检查优惠卷(如果满足当前优惠卷，则继续使用(即使过期也可以)，如果不满足则匹配最新的优惠(排除过期))
+            orderBusinessService.costCalculation(String.valueOf(userId), orderDO, consignorDO.getCustomerId(), Objects.isNull(consigneeDO) ? 0L : consigneeDO.getCustomerId(),
+                    consignorDO.getCustomerContactsId(), Objects.isNull(consigneeDO) ? 0L : consigneeDO.getCustomerContactsId(), orderItemDOList, 51);
         }
         orderBusinessService.addOrderTimeLog(orderDO.getStatus(), orderDO, 7, now, now);
         // 空运相关订单处理业务

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/vo/order/OrderBackVO.java

@@ -544,6 +544,9 @@ public class OrderBackVO {
     @ApiModelProperty(value = "是否需要重新计价")
     private Boolean isResetPrice = Boolean.FALSE;
 
+    @ApiModelProperty(value = "是否需要检查优惠卷(如果满足当前优惠卷，则继续使用(即使过期也可以)，如果不满足则匹配最新的优惠(排除过期))")
+    private Boolean isCheckCoupon = Boolean.FALSE;
+
 
     // 物流信息
     @ApiModelProperty(value = "物流信息相关")

yudao-module-product/yudao-module-product-core/src/main/java/cn/iocoder/yudao/module/product/component/ProdCostCalculation.java

@@ -22,10 +22,11 @@ import cn.iocoder.yudao.module.ecw.dal.dataobject.currency.CurrencyDO;
 import cn.iocoder.yudao.module.customer.dto.CustomerCommissionDto;
 import cn.iocoder.yudao.module.customer.dto.CustomerCommissionQueryDto;
 import cn.iocoder.yudao.module.customer.service.customer.commission.CustomerCommissionInfoService;
-import cn.iocoder.yudao.module.product.dal.dataobject.coupon.zTest3;
+//import cn.iocoder.yudao.module.product.dal.dataobject.coupon.zTest3;
+import cn.iocoder.yudao.module.product.dal.dataobject.coupon.CouponDO;
 import cn.iocoder.yudao.module.product.dal.dataobject.product.*;
 import cn.iocoder.yudao.module.ecw.dal.dataobject.unit.UnitDO;
-import cn.iocoder.yudao.module.product.dal.mysql.coupon.ZTestMapper3;
+//import cn.iocoder.yudao.module.product.dal.mysql.coupon.ZTestMapper3;
 import cn.iocoder.yudao.module.product.dal.mysql.product.ProductAttrMapper;
 import cn.iocoder.yudao.module.ecw.service.currency.CurrencyService;
 import cn.iocoder.yudao.module.product.dal.mysql.product.ProductPricePackagingMapper;
@@ -88,8 +89,8 @@ public class ProdCostCalculation {
             lineChannelPriceStepClearanceMapper;
 
     //
-    @Resource
-    private ZTestMapper3 zTestMapper;
+//    @Resource
+//    private ZTestMapper3 zTestMapper;
 
 
     public List<ProdConditionParam> obtainProdLineOnePrice(
@@ -297,10 +298,47 @@ public class ProdCostCalculation {
                 rmbCurrency, unitDOMap);
         // 计算订单费用
         for (ProdConditionParam prodParam : prodConditionParamList) {
+            // 默认去匹配优惠活动
+            Boolean isRestCoupon = Boolean.TRUE;
+            if (prodParam.getCalculationType() == 7 && CollectionUtil.isNotEmpty(prodParam.getCouponInfoVOList())) {
+                // 根据优惠id检查优惠活动是否匹配，忽略优惠活动是否过期，如果匹配则继续沿用，不匹配则不再使用，需要重新检查优惠
+                // 初始化优惠活动数量
+                int couponCount = prodParam.getCouponInfoVOList().size();
+                for (CouponInfoVO couponInfoVO : prodParam.getCouponInfoVOList()) {
+                    CouponDO couponDO = couponService.getCoupon(couponInfoVO.getCouponId());
+                    if (couponDO == null) {
+                        // TODO 如果优惠被删除了如何处理
+                        couponCount = couponCount - 1;
+                    } else {
+                        // 检查是否匹配报关方式
+                        if (StringUtils.isNotBlank(couponDO.getDocumentDeclaration())) {
+                            List<Integer> customsTypes = Arrays.stream(couponDO.getDocumentDeclaration().split(",")).map(Integer::valueOf).collect(Collectors.toList());
+                            if (!customsTypes.contains(prodParam.getCustomsType())) {
+                                couponCount = couponCount - 1;
+                                continue;
+                            }
+                        }
+                        // 检查是否匹配控货模式
+                        if (StringUtils.isNotBlank(couponDO.getIsCargoControl())) {
+                            List<Boolean> cargoControls = Arrays.stream(couponDO.getIsCargoControl().split(",")).map(Integer::valueOf).map(b -> b == 1).collect(Collectors.toList());
+                            if (!cargoControls.contains(prodParam.getIsControl())) {
+                                couponCount = couponCount - 1;
+                                continue;
+                            }
+                        }
+                    }
+                }
+                if (prodParam.getCouponInfoVOList().size() == couponCount) {
+                    // 如果优惠活动数量未减少，说明不需要重新匹配优惠
+                    isRestCoupon = Boolean.FALSE;
+                }
+            }
             // 优惠金额：优惠活动减免
             // 优惠计算
             CouponAvailableGroupDto groupDto = prodParam.getGroupDto();
-            this.discountCalculation(prodParam, groupDto);
+            if (isRestCoupon) {
+                this.discountCalculation(prodParam, groupDto);
+            }
             if (StringUtils.isNotBlank(prodParam.getBoxGauge())) {
                 String[] prodBox = prodParam.getBoxGauge().split("\\*");
                 if (prodBox.length == 3) {
@@ -790,23 +828,23 @@ public class ProdCostCalculation {
                         this.stepSelect(unitDOMap, prodParam, productPriceDO);
                     } else {
                         //专线空运
-                        zTest3 z = new zTest3();
-                        z.setCreatedate(new Date());
-                        String s = "1开始计算空运清关价 airStepSelect,lineId=" + lineId +
-                                " 渠道channelId=" + channelId;
-                        z.setTestname(s);
-                        zTestMapper.insert(z);
+//                        zTest3 z = new zTest3();
+//                        z.setCreatedate(new Date());
+//                        String s = "1开始计算空运清关价 airStepSelect,lineId=" + lineId +
+//                                " 渠道channelId=" + channelId;
+//                        z.setTestname(s);
+//                        zTestMapper.insert(z);
                         //空运阶梯价计算
                         this.airStepSelect(unitDOMap, prodParam,
                                 productPriceDO, lineId, channelId);
                     }
                 } else {
-                    zTest3 z = new zTest3();
-                    z.setCreatedate(new Date());
-                    String s = "不是阶梯价 airStepSelect,lineId=" + lineId +
-                            " 渠道channelId=" + channelId;
-                    z.setTestname(s);
-                    zTestMapper.insert(z);
+//                    zTest3 z = new zTest3();
+//                    z.setCreatedate(new Date());
+//                    String s = "不是阶梯价 airStepSelect,lineId=" + lineId +
+//                            " 渠道channelId=" + channelId;
+//                    z.setTestname(s);
+//                    zTestMapper.insert(z);
                 }
 
                 prodParam.setIsPayAdvance(productPriceDO.getNeedPay());
@@ -1005,11 +1043,11 @@ public class ProdCostCalculation {
                 }
 
             } else {
-                zTest3 z = new zTest3();
-                z.setCreatedate(new Date());
-                String s = "产品线路价格为空";
-                z.setTestname(s);
-                zTestMapper.insert(z);
+//                zTest3 z = new zTest3();
+//                z.setCreatedate(new Date());
+//                String s = "产品线路价格为空";
+//                z.setTestname(s);
+//                zTestMapper.insert(z);
 
                 if (!prodParam.getSpecialPriceType()) {
                     prodParam.setOneFreight(transportPrice);
@@ -1040,11 +1078,11 @@ public class ProdCostCalculation {
                 prodParam.setHiddenCommission(BigDecimal.ZERO);
             }
         } else {
-            zTest3 z = new zTest3();
-            z.setCreatedate(new Date());
-            String s = "不符合定价条件";
-            z.setTestname(s);
-            zTestMapper.insert(z);
+//            zTest3 z = new zTest3();
+//            z.setCreatedate(new Date());
+//            String s = "不符合定价条件";
+//            z.setTestname(s);
+//            zTestMapper.insert(z);
         }
     }
 
@@ -1115,20 +1153,20 @@ public class ProdCostCalculation {
 
             stepPackagingDOList = priceStepPackagingMapper.selectList(
                     new LambdaQueryWrapper<ProductPriceStepPackagingDO>()
-                    .eq(ProductPriceStepPackagingDO::getProductPriceStepId,
-                            productPriceDO.getAllStepPriceId()));
+                            .eq(ProductPriceStepPackagingDO::getProductPriceStepId,
+                                    productPriceDO.getAllStepPriceId()));
         } else {
             stepPackagingDOList = priceStepPackagingMapper.selectList(
                     new LambdaQueryWrapper<ProductPriceStepPackagingDO>()
-                    .eq(ProductPriceStepPackagingDO::getProductPriceStepId,
-                            productPriceDO.getTransportStepPriceId()));
+                            .eq(ProductPriceStepPackagingDO::getProductPriceStepId,
+                                    productPriceDO.getTransportStepPriceId()));
 
             if (Objects.nonNull(productPriceDO.getClearanceStepPriceId())) {
                 clearanceStepPackagingDOList =
                         priceStepPackagingMapper.selectList(
                                 new LambdaQueryWrapper<ProductPriceStepPackagingDO>()
-                        .eq(ProductPriceStepPackagingDO::getProductPriceStepId,
-                                productPriceDO.getClearanceStepPriceId()));
+                                        .eq(ProductPriceStepPackagingDO::getProductPriceStepId,
+                                                productPriceDO.getClearanceStepPriceId()));
             }
         }
 
@@ -1140,8 +1178,8 @@ public class ProdCostCalculation {
                 // 比较最大值
                 ProductPriceStepPackagingDO stepPackagingDO =
                         stepPackagingDOList.stream().filter(
-                                step -> StringUtils.isNotBlank(step.getPackagingTypes()) &&
-                                packagingTypeVerify(step.getPackagingTypes().split(StrUtil.COMMA),prodParam.getPackages())).
+                                        step -> StringUtils.isNotBlank(step.getPackagingTypes()) &&
+                                                packagingTypeVerify(step.getPackagingTypes().split(StrUtil.COMMA), prodParam.getPackages())).
                                 max(Comparator.comparing(ProductPriceStepPackagingDO::getPackagingPrice)).orElse(null);
                 if (Objects.nonNull(stepPackagingDO)) {
                     prodParam.setPackagingFreightPrice(
@@ -1329,11 +1367,11 @@ public class ProdCostCalculation {
             } else {
                 productPriceDO.setAllPrice(BigDecimal.ZERO);
             }
-
-            zTest3 z = new zTest3();
-            z.setCreatedate(new Date());
-            z.setTestname("2运费计量单位 为空");
-            zTestMapper.insert(z);
+//
+//            zTest3 z = new zTest3();
+//            z.setCreatedate(new Date());
+//            z.setTestname("2运费计量单位 为空");
+//            zTestMapper.insert(z);
             return;
         }
 
@@ -1345,10 +1383,10 @@ public class ProdCostCalculation {
 
         // 添加的逻辑
         if (productPriceDO.getPriceType() == null) {
-            zTest3 z = new zTest3();
-            z.setCreatedate(new Date());
-            z.setTestname("3价格类型 为空");
-            zTestMapper.insert(z);
+//            zTest3 z = new zTest3();
+//            z.setCreatedate(new Date());
+//            z.setTestname("3价格类型 为空");
+//            zTestMapper.insert(z);
             return;
         }
 
@@ -1368,10 +1406,10 @@ public class ProdCostCalculation {
                 productPriceDO.setNeedPay(null);
                 productPriceDO.setAllPrice(BigDecimal.ZERO);
             }
-            zTest3 z = new zTest3();
-            z.setCreatedate(new Date());
-            z.setTestname("4价格类型 为全包价，无需计算清关费");
-            zTestMapper.insert(z);
+//            zTest3 z = new zTest3();
+//            z.setCreatedate(new Date());
+//            z.setTestname("4价格类型 为全包价，无需计算清关费");
+//            zTestMapper.insert(z);
             return;
         }
 
@@ -1391,21 +1429,21 @@ public class ProdCostCalculation {
             productPriceDO.setNeedPay(null);
             productPriceDO.setTransportPrice(BigDecimal.ZERO);
 
-            String s = "5线路无牌无液无电运费阶梯价不存在【" + num +
-                    prodParam.getUnitDO().getFuhao() + "】该档次";
-            zTest3 z = new zTest3();
-            z.setCreatedate(new Date());
-            z.setTestname(s);
-            zTestMapper.insert(z);
+//            String s = "5线路无牌无液无电运费阶梯价不存在【" + num +
+//                    prodParam.getUnitDO().getFuhao() + "】该档次";
+//            zTest3 z = new zTest3();
+//            z.setCreatedate(new Date());
+//            z.setTestname(s);
+//            zTestMapper.insert(z);
         }
 
         if (prodParam.getClearanceUnitDO() == null) {
             //清关费单位为空，设置清关费为0
             productPriceDO.setClearancePrice(BigDecimal.ZERO);
-            zTest3 z = new zTest3();
-            z.setCreatedate(new Date());
-            z.setTestname("6清关费单位为空");
-            zTestMapper.insert(z);
+//            zTest3 z = new zTest3();
+//            z.setCreatedate(new Date());
+//            z.setTestname("6清关费单位为空");
+//            zTestMapper.insert(z);
             return;
         }
 
@@ -1437,25 +1475,25 @@ public class ProdCostCalculation {
                 && productPriceDO.getClearancePrice().compareTo(BigDecimal.ZERO) > 0) {
 
 
-            if (CollectionUtil.isNotEmpty(prodParam.getPackages())) {
-                zTest3 z = new zTest3();
-                z.setCreatedate(new Date());
-                z.setTestname("7产品包装类型list为：" +
-                        prodParam.getPackages().toString());
-                zTestMapper.insert(z);
-            } else {
-                zTest3 z = new zTest3();
-                z.setCreatedate(new Date());
-                String s = "8产品包装类型List为空";
-                if (prodParam.getPackaging() == null) {
-                    s += ",包装类型也为空";
-                } else {
-                    s += ",包装类型" + prodParam.getPackaging();
-                }
-
-                z.setTestname(s);
-                zTestMapper.insert(z);
-            }
+//            if (CollectionUtil.isNotEmpty(prodParam.getPackages())) {
+//                zTest3 z = new zTest3();
+//                z.setCreatedate(new Date());
+//                z.setTestname("7产品包装类型list为：" +
+//                        prodParam.getPackages().toString());
+//                zTestMapper.insert(z);
+//            } else {
+//                zTest3 z = new zTest3();
+//                z.setCreatedate(new Date());
+//                String s = "8产品包装类型List为空";
+//                if (prodParam.getPackaging() == null) {
+//                    s += ",包装类型也为空";
+//                } else {
+//                    s += ",包装类型" + prodParam.getPackaging();
+//                }
+//
+//                z.setTestname(s);
+//                zTestMapper.insert(z);
+//            }
             //TODO 获取线路设置的空运清关费
             //PACKAGING_TYPE 包装要求 数据字典中的数据
             // 1箱，2编织袋，3木架，4木箱，5托，6航空箱，7桶，8压缩包，9铁架
@@ -1497,12 +1535,12 @@ public class ProdCostCalculation {
                             this.calculationUnitAsValue(prodParam,
                                     productPriceDO, lineClearanceUnitDO, 1);
 
-                    if (lineClearanceNum != null) {
-                        zTest3 z = new zTest3();
-                        z.setCreatedate(new Date());
-                        z.setTestname("99lineClearanceNum=" + lineClearanceNum);
-                        zTestMapper.insert(z);
-                    }
+//                    if (lineClearanceNum != null) {
+//                        zTest3 z = new zTest3();
+//                        z.setCreatedate(new Date());
+//                        z.setTestname("99lineClearanceNum=" + lineClearanceNum);
+//                        zTestMapper.insert(z);
+//                    }
                     //ecw_line_channel_price_step_clearance
                     //线路渠道清关费阶梯价格
                     List<LineChannelPriceStepClearanceDO>
@@ -1560,12 +1598,12 @@ public class ProdCostCalculation {
                         }
                     } else {
                         //线路渠道清关费阶梯价格 为空
-                        zTest3 z = new zTest3();
-                        z.setCreatedate(new Date());
-                        z.setTestname("9线路渠道清关费阶梯价格 为空lineId="
-                                + lineId + "channelId=" + channelId + "lineClearanceNum=" +
-                                lineClearanceNum);
-                        zTestMapper.insert(z);
+//                        zTest3 z = new zTest3();
+//                        z.setCreatedate(new Date());
+//                        z.setTestname("9线路渠道清关费阶梯价格 为空lineId="
+//                                + lineId + "channelId=" + channelId + "lineClearanceNum=" +
+//                                lineClearanceNum);
+//                        zTestMapper.insert(z);
                     }
                 }
 
@@ -1603,20 +1641,20 @@ public class ProdCostCalculation {
                     clearancePrice = clearanceBasePrice;
                 }
             } else {
-                zTest3 z = new zTest3();
-                z.setCreatedate(new Date());
-                z.setTestname("10线路渠道包装类型为空lineId="
-                        + lineId + "channelId=" + channelId);
-                zTestMapper.insert(z);
+//                zTest3 z = new zTest3();
+//                z.setCreatedate(new Date());
+//                z.setTestname("10线路渠道包装类型为空lineId="
+//                        + lineId + "channelId=" + channelId);
+//                zTestMapper.insert(z);
                 //产品阶梯价的清关价
                 clearancePrice = clearanceBasePrice;
             }
             //设置清关价
-            zTest3 z = new zTest3();
-            z.setCreatedate(new Date());
-            z.setTestname("计算出的清关价为：" +
-                    clearancePrice.getClearancePrice());
-            zTestMapper.insert(z);
+//            zTest3 z = new zTest3();
+//            z.setCreatedate(new Date());
+//            z.setTestname("计算出的清关价为：" +
+//                    clearancePrice.getClearancePrice());
+//            zTestMapper.insert(z);
 
             productPriceDO.setClearancePrice(
                     clearancePrice.getClearancePrice());
@@ -1633,14 +1671,14 @@ public class ProdCostCalculation {
 
         } else {
 
-            zTest3 z = new zTest3();
-            z.setCreatedate(new Date());
-            z.setTestname("线路无牌无液无电清关费阶梯价不存在，不符合逻辑条件【"
-                    + num +
-                    prodParam.getClearanceUnitDO().getFuhao() + "】该档次"
-            );
-
-            zTestMapper.insert(z);
+//            zTest3 z = new zTest3();
+//            z.setCreatedate(new Date());
+//            z.setTestname("线路无牌无液无电清关费阶梯价不存在，不符合逻辑条件【"
+//                    + num +
+//                    prodParam.getClearanceUnitDO().getFuhao() + "】该档次"
+//            );
+//
+//            zTestMapper.insert(z);
             productPriceDO.setClearancePrice(BigDecimal.ZERO);
         }
     }

yudao-module-product/yudao-module-product-core/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/coupon/zTest3.java

-package cn.iocoder.yudao.module.product.dal.dataobject.coupon;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-import java.util.Date;
-
-@TableName("z_test")
-@Data
-public class zTest3 {
-
-    private Long id;
-    private String testname;
-    private Date createdate;
-}
+//package cn.iocoder.yudao.module.product.dal.dataobject.coupon;
+//
+//import com.baomidou.mybatisplus.annotation.TableName;
+//import lombok.Data;
+//
+//import java.util.Date;
+//
+//@TableName("z_test")
+//@Data
+//public class zTest3 {
+//
+//    private Long id;
+//    private String testname;
+//    private Date createdate;
+//}

yudao-module-product/yudao-module-product-core/src/main/java/cn/iocoder/yudao/module/product/dal/mysql/coupon/ZTestMapper3.java

-package cn.iocoder.yudao.module.product.dal.mysql.coupon;
-
-import cn.iocoder.yudao.framework.mybatis.core.mapper.AbstractMapper;
-import cn.iocoder.yudao.module.product.dal.dataobject.coupon.zTest3;
-import org.apache.ibatis.annotations.Mapper;
-
-@Mapper
-public interface ZTestMapper3 extends AbstractMapper<zTest3> {
-}
-
+//package cn.iocoder.yudao.module.product.dal.mysql.coupon;
+//
+//import cn.iocoder.yudao.framework.mybatis.core.mapper.AbstractMapper;
+////import cn.iocoder.yudao.module.product.dal.dataobject.coupon.zTest3;
+//import org.apache.ibatis.annotations.Mapper;
+//
+//@Mapper
+//public interface ZTestMapper3 extends AbstractMapper<zTest3> {
+//}
+//

yudao-module-product/yudao-module-product-core/src/main/java/cn/iocoder/yudao/module/product/param/ProdConditionParam.java

@@ -322,7 +322,7 @@ public class ProdConditionParam {
     @ApiModelProperty(value = "货值货币id")
     private Integer worthCurrency;
 
-    @ApiModelProperty(value = "类型：1 正常计算 2 特价申请已传入的商品单价计算 3 指定重泡货标准计算 4 佣金设置 5 批量加价 6 订单优惠更新")
+    @ApiModelProperty(value = "类型：1 正常计算 2 特价申请已传入的商品单价计算 3 指定重泡货标准计算 4 佣金设置 5 批量加价 6 订单优惠更新 7 检查优惠(如果满足当前优惠卷，则继续使用(即使过期也可以)，如果不满足则匹配最新的优惠(排除过期))")
     private Integer calculationType = 1;
 
     @ApiModelProperty(value = "上次计价使用的优惠信息")

yudao-module-product/yudao-module-product-core/src/main/java/cn/iocoder/yudao/module/product/service/product/impl/ProductPriceServiceImpl.java

@@ -24,10 +24,10 @@ import cn.iocoder.yudao.module.ecw.api.currency.dto.ExchangeRateRespDTO;
 import cn.iocoder.yudao.module.ecw.api.internalMessage.InternalMessageApi;
 import cn.iocoder.yudao.module.ecw.api.internalMessage.dto.InternalMessageCreateDto;
 import cn.iocoder.yudao.module.product.convert.product.ProductPriceConvert;
-import cn.iocoder.yudao.module.product.dal.dataobject.coupon.zTest3;
+//import cn.iocoder.yudao.module.product.dal.dataobject.coupon.zTest3;
 import cn.iocoder.yudao.module.product.dal.dataobject.product.*;
 import cn.iocoder.yudao.module.product.dal.dataobject.productPriceSnapshot.ProductPriceSnapshotDO;
-import cn.iocoder.yudao.module.product.dal.mysql.coupon.ZTestMapper3;
+//import cn.iocoder.yudao.module.product.dal.mysql.coupon.ZTestMapper3;
 import cn.iocoder.yudao.module.product.dal.mysql.product.*;
 import cn.iocoder.yudao.module.product.dal.mysql.productPriceSnapshot.ProductPriceSnapshotMapper;
 import cn.iocoder.yudao.module.product.dto.AirClearancePriceResultDto;
@@ -129,8 +129,8 @@ public class ProductPriceServiceImpl extends AbstractService<ProductPriceMapper,
     @Resource
     private ProductPriceStepClearanceService productPriceStepClearanceService;
 
-    @Resource
-    private ZTestMapper3 zTestMapper;
+//    @Resource
+//    private ZTestMapper3 zTestMapper;
 
 
     private static final String PREFIX = "price_batch_update_";
@@ -1259,10 +1259,10 @@ public class ProductPriceServiceImpl extends AbstractService<ProductPriceMapper,
 
             //没有价格信息不继续后面的处理
             if (!hasPrice) {
-                zTest3 m = new zTest3();
-                m.setTestname("没有价格信息，不后续处理");
-                m.setCreatedate(new Date());
-                zTestMapper.insert(m);
+//                zTest3 m = new zTest3();
+//                m.setTestname("没有价格信息，不后续处理");
+//                m.setCreatedate(new Date());
+//                zTestMapper.insert(m);
                 continue;
             }
 
@@ -1298,10 +1298,10 @@ public class ProductPriceServiceImpl extends AbstractService<ProductPriceMapper,
             handleData.setNeedHandleList(needHandleList);
             applicationContext.publishEvent(handleData);
         } else {
-            zTest3 m = new zTest3();
-            m.setTestname("needHandleList 为空");
-            m.setCreatedate(new Date());
-            zTestMapper.insert(m);
+//            zTest3 m = new zTest3();
+//            m.setTestname("needHandleList 为空");
+//            m.setCreatedate(new Date());
+//            zTestMapper.insert(m);
         }
     }