2024-07-04-5提交

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/dal/mysql/orderTime/OrderTimeMapper.java

@@ -66,4 +66,6 @@ public interface OrderTimeMapper extends AbstractMapper<OrderTimeDO> {
 
     //添加根据柜号获取卸柜时间
     Date getUlboxtime(long shipmentId);
+
+    Date getCustomerOperateDate(long customerId,long newcustomerservice);
 }

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

@@ -16,6 +16,8 @@ import cn.iocoder.yudao.framework.common.pojo.PageResult;
  */
 public interface OrderTimeService extends IService<OrderTimeDO> {
 
+    Date getCustomerOperateDate(long customerId,long newcustomerservice);
+
     /**
      * 创建下单时间轴事件
      *

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

@@ -61,6 +61,12 @@ public class OrderTimeServiceImpl extends AbstractService<OrderTimeMapper, Order
         return orderTime.getId();
     }
 
+    public Date getCustomerOperateDate(long customerId,long newcustomerservice)
+    {
+        return orderTimeMapper.getCustomerOperateDate(customerId,
+                newcustomerservice);
+    }
+
     @Override
     public void updateOrderTime(OrderTimeUpdateReqVO updateReqVO) {
         // 校验存在

yudao-module-order/yudao-module-order-core/src/main/resources/mapper/order/OrderTimeMapper.xml

@@ -16,6 +16,16 @@
         ORDER BY create_time desc LIMIT 1
     </select>
 
+    <select id="getCustomerOperateDate" resultType="java.util.Date">
+        SELECT update_time from
+        ecw_customer_operate_log where
+        customer_id=#{customerId} and
+        new_customer_service=#{newcustomerservice}
+        and operate_type in (3,5,7)
+        ORDER BY update_time desc LIMIT 1
+    </select>
+
+
 
     <select id="newOrderTimeByContainerNumberAndStatus" resultType="cn.iocoder.yudao.module.order.dal.dataobject.orderTime.OrderTimeDO">
         SELECT