入公海延期

yudao-module-customer/yudao-module-customer-core/src/main/java/cn/iocoder/yudao/module/customer/service/customer/CustomerServiceImpl.java

@@ -495,7 +495,8 @@ public class CustomerServiceImpl extends AbstractService<CustomerMapper, Custome
             if (isFcl) {
                 customerNew.setEstimateEnterOpenSeaTime(null);
             } else {
-                Date estimateEnterOpenSeaTime = DateUtil.offsetMonth(now, 1).toJdkDate();
+                //Date estimateEnterOpenSeaTime = DateUtil.offsetMonth(now, 1).toJdkDate();
+                Date estimateEnterOpenSeaTime = DateUtil.offsetMonth(now, 3).toJdkDate();//改为3个月
                 if (customerNew.getEstimateEnterOpenSeaTime() == null || customerNew.getEstimateEnterOpenSeaTime().compareTo(estimateEnterOpenSeaTime) == -1) {
                     customerNew.setEstimateEnterOpenSeaTime(estimateEnterOpenSeaTime);
                 }
@@ -2488,6 +2489,13 @@ public class CustomerServiceImpl extends AbstractService<CustomerMapper, Custome
 
         //捞取后设置预计进入公海池时间
         Date estimateEnterOpenSeaTime = isFcl ? null : DateUtil.offsetMonth(now, 1).toJdkDate();
+        if(!loginUserId.equals(customer.getCustomerService())){//如果捞取新旧客户经理不是同一个，
+             estimateEnterOpenSeaTime = isFcl ? null : DateUtil.offsetMonth(now, 3).toJdkDate();//改为3个月
+        }
+        if(loginUserId.equals(customer.getCustomerService())){//如果捞取新旧客户经理是同一个,且客户的最后一次成交订单归属当前客户经理，延期6个月
+
+        }
+
 
         customerMapper.catchCustomer(loginUserId, estimateEnterOpenSeaTime, customerId);
         log.info("catchCustomer成功， customerId={}", customer.getId());
@@ -2552,7 +2560,8 @@ public class CustomerServiceImpl extends AbstractService<CustomerMapper, Custome
                 }
 
                 //设置预计进行公海池时间
-                Date estimateEnterOpenSeaTime = DateUtil.offsetMonth(now, 1).toJdkDate();
+                //Date estimateEnterOpenSeaTime = DateUtil.offsetMonth(now, 1).toJdkDate();
+                Date estimateEnterOpenSeaTime = DateUtil.offsetMonth(now, 3).toJdkDate();
                 if (customerDO.getEstimateEnterOpenSeaTime() == null || customerDO.getEstimateEnterOpenSeaTime().compareTo(estimateEnterOpenSeaTime) == -1) {
                     customerDO.setEstimateEnterOpenSeaTime(estimateEnterOpenSeaTime);
                 }

yudao-module-customer/yudao-module-customer-core/src/main/java/cn/iocoder/yudao/module/customer/service/indirectCustomer/IndirectCustomerServiceImpl.java

@@ -248,7 +248,8 @@ public class IndirectCustomerServiceImpl extends AbstractService<IndirectCustome
             }
 
             //接收后一个月，无任何报价、下单则掉入公海
-            Date date = DateUtil.offsetMonth(now, 1).toJdkDate();
+            //Date date = DateUtil.offsetMonth(now, 1).toJdkDate();
+            Date date = DateUtil.offsetMonth(now, 3).toJdkDate();//改为3个月
             if (customerNew.getEstimateEnterOpenSeaTime() == null || customerNew.getEstimateEnterOpenSeaTime().compareTo(date) == -1) {
                 customerNew.setEstimateEnterOpenSeaTime(date);
             }

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

@@ -4050,6 +4050,7 @@ public class OrderWarehouseInServiceImpl extends AbstractService<OrderWarehouseI
                         if (rucangTime != null) {
                             // 若在公海池 且 客户经理不为空，则跳出公海
                             changeCustomerStatus(customerDO, rucangTime, 6, CustomerStatusEnum.DEAL);
+
                         }
 
                         // 若还是入仓中的，则更新为意向