Merge branch 'master-fix' into dev

sql/update_2024-07.sql

@@ -65,3 +65,7 @@ alter table `ecw_target_log`
 alter table `ecw_order`
     add column `is_in_open_sea` tinyint DEFAULT '0' COMMENT '是否公海客户',
 
+
+ -- 2024-07-25 刷新订单业绩客户新老客户状态冗余参数
+update ecw_order o left join ecw_customer c on c.id = o.customer_id set o.yeji_type = IFNULL(c.is_new, 1);
+

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

@@ -384,6 +384,7 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
                         Objects.nonNull(customerDO.getIsShowTidanPrice())) {
                     order.setDisplayBillLadingPrice(customerDO.getIsShowTidanPrice());
                     order.setIsInOpenSea(customerDO.getIsInOpenSea());
+                    order.setYejiType(customerDO.getIsNew() ? 1 : 0);
                 }
             }
         }
@@ -1031,6 +1032,7 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
                 if (consignorDO != null) {
                     order.setCustomerId(orderConsignorDO.getCustomerId());
                     order.setIsInOpenSea(consignorDO.getIsInOpenSea());
+                    order.setYejiType(consignorDO.getIsNew() ? 1 : 0);
                     order.setSalesmanId(consignorDO.getCustomerService() != null ? consignorDO.getCustomerService() : 0);
                 }
 
@@ -1046,16 +1048,19 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
 
                         order.setCustomerId(orderConsignorDO.getCustomerId());
                         order.setIsInOpenSea(consignorDO.getIsInOpenSea());
+                        order.setYejiType(consignorDO.getIsNew() ? 1 : 0);
                         order.setSalesmanId(consignorDO.getCustomerService() != null ? consignorDO.getCustomerService() : 0);
                     } else if (order.getDrawee() == 1 && consignorDO.getDefaultPay()) {// 如果是发货人付款且档案设置默认付运费  --层级4 第一个
 
                         order.setCustomerId(orderConsignorDO.getCustomerId());
                         order.setIsInOpenSea(consignorDO.getIsInOpenSea());
+                        order.setYejiType(consignorDO.getIsNew() ? 1 : 0);
                         order.setSalesmanId(consignorDO.getCustomerService());
                     } else {
                         //都不符合，归属收货人
                         order.setCustomerId(orderConsigneeDO.getCustomerId() != null ? orderConsigneeDO.getCustomerId() : 0);
                         order.setIsInOpenSea(consigneeDO.getIsInOpenSea());
+                        order.setYejiType(consigneeDO.getIsNew() ? 1 : 0);
                         order.setSalesmanId(consigneeDO.getCustomerService() != null ? consigneeDO.getCustomerService() : 0);
                     }
                 } else if (order.getDrawee() == 2) {
@@ -1063,6 +1068,7 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
                     if (consigneeDO != null) {
                         order.setCustomerId(orderConsigneeDO.getCustomerId());
                         order.setIsInOpenSea(consigneeDO.getIsInOpenSea());
+                        order.setYejiType(consigneeDO.getIsNew() ? 1 : 0);
                         order.setSalesmanId(consigneeDO.getCustomerService());
                     } else {
                         order.setCustomerId(0L);
@@ -1083,25 +1089,30 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
 
                             order.setCustomerId(orderConsignorDO.getCustomerId());
                             order.setIsInOpenSea(consignorDO.getIsInOpenSea());
+                            order.setYejiType(consignorDO.getIsNew() ? 1 : 0);
                             order.setSalesmanId(consignorDO.getCustomerService());
                         } else if (CollectionUtil.isNotEmpty(offerBackVOList) && (order.getDrawee() == 3 && clearanceFee == 1)) {//层级3 第三个 订单关联报价单 && 自定义付款 且发货人付清关费
 
                             order.setCustomerId(orderConsignorDO.getCustomerId());
                             order.setIsInOpenSea(consignorDO.getIsInOpenSea());
+                            order.setYejiType(consignorDO.getIsNew() ? 1 : 0);
                             order.setSalesmanId(consignorDO.getCustomerService());
                         } else if (consignorDO.getDefaultPay() && (order.getDrawee() == 3 && freight == 1)) { //层级4 第二个 发货人档案设置默认付运费 且发货人付运费 业绩归属 发货人
 
                             order.setCustomerId(orderConsignorDO.getCustomerId());
                             order.setIsInOpenSea(consignorDO.getIsInOpenSea());
+                            order.setYejiType(consignorDO.getIsNew() ? 1 : 0);
                             order.setSalesmanId(consignorDO.getCustomerService());
                         } else if (consignorDO.getDefaultPay() && (order.getDrawee() == 3 && clearanceFee == 1)) {// 层级4 第三个 发货人档案设置默认付运费 且发货人付清关费  业绩归属发货人
                             order.setCustomerId(orderConsignorDO.getCustomerId());
                             order.setIsInOpenSea(consignorDO.getIsInOpenSea());
+                            order.setYejiType(consignorDO.getIsNew() ? 1 : 0);
                             order.setSalesmanId(consignorDO.getCustomerService());
 
                         } else {
                             order.setCustomerId(orderConsigneeDO.getCustomerId() != null ? orderConsigneeDO.getCustomerId() : 0);
                             order.setIsInOpenSea(consigneeDO.getIsInOpenSea());
+                            order.setYejiType(consigneeDO.getIsNew() ? 1 : 0);
                             order.setSalesmanId(consigneeDO.getCustomerService() != null ? consigneeDO.getCustomerService() : 0);
                         }
 
@@ -1124,6 +1135,7 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
                     //业绩归属收货人
                     order.setCustomerId(orderConsigneeDO.getCustomerId() != null ? orderConsigneeDO.getCustomerId() : 0);
                     order.setIsInOpenSea(consigneeDO.getIsInOpenSea());
+                    order.setYejiType(consigneeDO.getIsNew() ? 1 : 0);
                     order.setSalesmanId(consigneeDO.getCustomerService() != null ? consigneeDO.getCustomerService() : 0);
 
                 }
@@ -1151,6 +1163,7 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
                 if (consignorDO != null) {
                     order.setCustomerId(orderConsignorDO.getCustomerId());
                     order.setIsInOpenSea(consignorDO.getIsInOpenSea());
+                    order.setYejiType(consignorDO.getIsNew() ? 1 : 0);
                     order.setSalesmanId(consignorDO.getCustomerService() != null ? consignorDO.getCustomerService() : 0);
                 }
 
@@ -1162,15 +1175,18 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
 
                         order.setCustomerId(orderConsignorDO.getCustomerId());
                         order.setIsInOpenSea(consignorDO.getIsInOpenSea());
+                        order.setYejiType(consignorDO.getIsNew() ? 1 : 0);
                         order.setSalesmanId(consignorDO.getCustomerService() != null ? consignorDO.getCustomerService() : 0);
                     } else if (order.getDrawee() == 1 && consignorDO.getDefaultPay()) {// 如果是发货人付款且档案设置默认付运费  --层级4 第一个
 
                         order.setCustomerId(orderConsignorDO.getCustomerId());
                         order.setIsInOpenSea(consignorDO.getIsInOpenSea());
+                        order.setYejiType(consignorDO.getIsNew() ? 1 : 0);
                         order.setSalesmanId(consignorDO.getCustomerService());
                     } else {
                         order.setCustomerId(orderConsigneeDO.getCustomerId() != null ? orderConsigneeDO.getCustomerId() : 0);
                         order.setIsInOpenSea(consigneeDO.getIsInOpenSea());
+                        order.setYejiType(consigneeDO.getIsNew() ? 1 : 0);
                         order.setSalesmanId(consigneeDO.getCustomerService() != null ? consigneeDO.getCustomerService() : 0);
 //                            order.setCustomerId(0L);
 //                            order.setSalesmanId(0L);
@@ -1179,6 +1195,7 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
                     if (consigneeDO != null) {
                         order.setCustomerId(orderConsigneeDO.getCustomerId());
                         order.setIsInOpenSea(consigneeDO.getIsInOpenSea());
+                        order.setYejiType(consigneeDO.getIsNew() ? 1 : 0);
                         order.setSalesmanId(consigneeDO.getCustomerService());
                     } else {
                         //没有收货人
@@ -1202,26 +1219,31 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
 
                             order.setCustomerId(orderConsignorDO.getCustomerId());
                             order.setIsInOpenSea(consignorDO.getIsInOpenSea());
+                            order.setYejiType(consignorDO.getIsNew() ? 1 : 0);
                             order.setSalesmanId(consignorDO.getCustomerService());
                         } else if (createReqVO.getOfferId() != null && (order.getDrawee() == 3 && clearanceFee == 1)) {//层级3 第三个 订单关联报价单 && 自定义付款 且发货人付清关费
 
                             order.setCustomerId(orderConsignorDO.getCustomerId());
                             order.setIsInOpenSea(consignorDO.getIsInOpenSea());
+                            order.setYejiType(consignorDO.getIsNew() ? 1 : 0);
                             order.setSalesmanId(consignorDO.getCustomerService());
                         } else if (consignorDO.getDefaultPay() && (order.getDrawee() == 3 && freight == 1)) { //层级4 第二个 发货人档案设置默认付运费 且发货人付运费 业绩归属 发货人
 
                             order.setCustomerId(orderConsignorDO.getCustomerId());
                             order.setIsInOpenSea(consignorDO.getIsInOpenSea());
+                            order.setYejiType(consignorDO.getIsNew() ? 1 : 0);
                             order.setSalesmanId(consignorDO.getCustomerService());
                         } else if (consignorDO.getDefaultPay() && (order.getDrawee() == 3 && clearanceFee == 1)) {// 层级4 第三个 发货人档案设置默认付运费 且发货人付清关费  业绩归属发货人
                             order.setCustomerId(orderConsignorDO.getCustomerId());
                             order.setIsInOpenSea(consignorDO.getIsInOpenSea());
+                            order.setYejiType(consignorDO.getIsNew() ? 1 : 0);
                             order.setSalesmanId(consignorDO.getCustomerService());
 
                         } else {
                             //去掉层级5、6 ，以上不符合的都归收货人
                             order.setCustomerId(orderConsigneeDO.getCustomerId() != null ? orderConsigneeDO.getCustomerId() : 0);
                             order.setIsInOpenSea(consigneeDO.getIsInOpenSea());
+                            order.setYejiType(consigneeDO.getIsNew() ? 1 : 0);
                             order.setSalesmanId(consigneeDO.getCustomerService() != null ? consigneeDO.getCustomerService() : 0);
 
                         }
@@ -1232,6 +1254,7 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
                     //业绩归收货人
                     order.setCustomerId(orderConsigneeDO.getCustomerId() != null ? orderConsigneeDO.getCustomerId() : 0);
                     order.setIsInOpenSea(consigneeDO.getIsInOpenSea());
+                    order.setYejiType(consigneeDO.getIsNew() ? 1 : 0);
                     order.setSalesmanId(consigneeDO.getCustomerService() != null ? consigneeDO.getCustomerService() : 0);
 
                 }
@@ -1260,6 +1283,7 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
             // 海外仓归属发货人
             order.setCustomerId(orderConsignorDO.getCustomerId());
             order.setIsInOpenSea(consignorDO.getIsInOpenSea());
+            order.setYejiType(consignorDO.getIsNew() ? 1 : 0);
             order.setSalesmanId(consignorDO.getCustomerService() != null ? consignorDO.getCustomerService() : 0);
             customerType = 1;
         } else {
@@ -1267,6 +1291,7 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
                 if (consignorDO != null) {
                     order.setCustomerId(orderConsignorDO.getCustomerId());
                     order.setIsInOpenSea(consignorDO.getIsInOpenSea());
+                    order.setYejiType(consignorDO.getIsNew() ? 1 : 0);
                     order.setSalesmanId(consignorDO.getCustomerService() != null ? consignorDO.getCustomerService() : 0);
                     customerType = 1;
                 }
@@ -1279,17 +1304,20 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
 
                         order.setCustomerId(orderConsignorDO.getCustomerId());
                         order.setIsInOpenSea(consignorDO.getIsInOpenSea());
+                        order.setYejiType(consignorDO.getIsNew() ? 1 : 0);
                         order.setSalesmanId(consignorDO.getCustomerService() != null ? consignorDO.getCustomerService() : 0);
                         customerType = 1;
                     } else if (order.getDrawee() == 1 && consignorDO.getDefaultPay()) {// 如果是发货人付款且档案设置默认付运费  --层级4 第一个
 
                         order.setCustomerId(orderConsignorDO.getCustomerId());
                         order.setIsInOpenSea(consignorDO.getIsInOpenSea());
+                        order.setYejiType(consignorDO.getIsNew() ? 1 : 0);
                         order.setSalesmanId(consignorDO.getCustomerService());
                         customerType = 1;
                     } else {
                         order.setCustomerId(orderConsigneeDO.getCustomerId() != null ? orderConsigneeDO.getCustomerId() : 0);
                         order.setIsInOpenSea(consigneeDO.getIsInOpenSea());
+                        order.setYejiType(consigneeDO.getIsNew() ? 1 : 0);
                         order.setSalesmanId(consigneeDO.getCustomerService() != null ? consigneeDO.getCustomerService() : 0);
                         customerType = 2;
 //                            order.setCustomerId(0L);
@@ -1299,6 +1327,7 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
                     if (consigneeDO != null) {
                         order.setCustomerId(orderConsigneeDO.getCustomerId());
                         order.setIsInOpenSea(consigneeDO.getIsInOpenSea());
+                        order.setYejiType(consigneeDO.getIsNew() ? 1 : 0);
                         order.setSalesmanId(consigneeDO.getCustomerService());
                         customerType = 1;
                     } else {
@@ -1322,23 +1351,27 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
 
                             order.setCustomerId(orderConsignorDO.getCustomerId());
                             order.setIsInOpenSea(consignorDO.getIsInOpenSea());
+                            order.setYejiType(consignorDO.getIsNew() ? 1 : 0);
                             order.setSalesmanId(consignorDO.getCustomerService());
                             customerType = 1;
                         } else if (offerId != null && (order.getDrawee() == 3 && clearanceFee == 1)) {//层级3 第三个 订单关联报价单 && 自定义付款 且发货人付清关费
 
                             order.setCustomerId(orderConsignorDO.getCustomerId());
                             order.setIsInOpenSea(consignorDO.getIsInOpenSea());
+                            order.setYejiType(consignorDO.getIsNew() ? 1 : 0);
                             order.setSalesmanId(consignorDO.getCustomerService());
                             customerType = 1;
                         } else if (consignorDO.getDefaultPay() && (order.getDrawee() == 3 && freight == 1)) { //层级4 第二个 发货人档案设置默认付运费 且发货人付运费 业绩归属 发货人
 
                             order.setCustomerId(orderConsignorDO.getCustomerId());
                             order.setIsInOpenSea(consignorDO.getIsInOpenSea());
+                            order.setYejiType(consignorDO.getIsNew() ? 1 : 0);
                             order.setSalesmanId(consignorDO.getCustomerService());
                             customerType = 1;
                         } else if (consignorDO.getDefaultPay() && (order.getDrawee() == 3 && clearanceFee == 1)) {// 层级4 第三个 发货人档案设置默认付运费 且发货人付清关费  业绩归属发货人
                             order.setCustomerId(orderConsignorDO.getCustomerId());
                             order.setIsInOpenSea(consignorDO.getIsInOpenSea());
+                            order.setYejiType(consignorDO.getIsNew() ? 1 : 0);
                             order.setSalesmanId(consignorDO.getCustomerService());
                             customerType = 1;
 
@@ -1346,6 +1379,7 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
                             //去掉层级5、6 ，以上不符合的都归收货人
                             order.setCustomerId(orderConsigneeDO.getCustomerId() != null ? orderConsigneeDO.getCustomerId() : 0);
                             order.setIsInOpenSea(consigneeDO.getIsInOpenSea());
+                            order.setYejiType(consigneeDO.getIsNew() ? 1 : 0);
                             order.setSalesmanId(consigneeDO.getCustomerService() != null ? consigneeDO.getCustomerService() : 0);
                             customerType = 2;
 
@@ -1358,6 +1392,7 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
                     //业绩归收货人
                     order.setCustomerId(orderConsigneeDO.getCustomerId() != null ? orderConsigneeDO.getCustomerId() : 0);
                     order.setIsInOpenSea(consigneeDO.getIsInOpenSea());
+                    order.setYejiType(consigneeDO.getIsNew() ? 1 : 0);
                     order.setSalesmanId(consigneeDO.getCustomerService() != null ? consigneeDO.getCustomerService() : 0);
                     customerType = 2;
 
@@ -2195,6 +2230,7 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
                 if (Objects.nonNull(customerDO) && Objects.nonNull(customerDO.getIsShowTidanPrice())) {
                     updateObj.setDisplayBillLadingPrice(customerDO.getIsShowTidanPrice());
                     updateObj.setIsInOpenSea(customerDO.getIsInOpenSea());
+                    updateObj.setYejiType(customerDO.getIsNew() ? 1 : 0);
                 }
             }
         }

yudao-module-sale/yudao-module-sale-core/src/main/resources/mapper/deptTarget/DeptTargetMapper.xml

@@ -45,7 +45,7 @@
         select * from (
         SELECT
         IFNULL(t6.resource_type,1) as customer_type,
-        ( CASE WHEN t6.is_new = 1 THEN '新客户' ELSE '旧客户' END ) AS achieveType,
+        ( CASE WHEN t1.yeji_type = 1 THEN '新客户' ELSE '旧客户' END ) AS achieveType,
         t2.number,
         t1.order_no,
         (CASE WHEN t9.customer_id=t.customer_id THEN t9.name ELSE tx.name END) as name,
@@ -114,7 +114,7 @@
             and t7.departure_warehouse_id = #{query.startWarehouseId}
         </if>
         <if test="query.achieveType != null">
-            and t6.is_new = #{query.achieveType}
+            and t1.yeji_type = #{query.achieveType}
         </if>
         <if test="query.destWarehouseIdList != null">
             and t8.objective_warehouse_id in
@@ -132,7 +132,7 @@
         select * from (
         SELECT
         IFNULL(t6.resource_type,1) as customer_type,
-        ( CASE WHEN t6.is_new = 1 THEN '新客户' ELSE '旧客户' END ) AS achieveType,
+        ( CASE WHEN t1.yeji_type = 1 THEN '新客户' ELSE '旧客户' END ) AS achieveType,
         t2.number,
         t1.order_no,
         (CASE WHEN t9.customer_id=t.customer_id THEN t9.name ELSE tx.name END) as name,
@@ -206,7 +206,7 @@
             and t7.departure_warehouse_id = #{query.startWarehouseId}
         </if>
         <if test="query.achieveType != null">
-            and t6.is_new = #{query.achieveType}
+            and t1.yeji_type = #{query.achieveType}
         </if>
         <if test="query.destWarehouseIdList != null">
             and t8.objective_warehouse_id in
@@ -224,7 +224,7 @@
         select * from (
         SELECT
         IFNULL(t6.resource_type,1) as customer_type,
-        ( CASE WHEN t6.is_new = 1 THEN '新客户' ELSE '旧客户' END ) AS achieveType,
+        ( CASE WHEN t1.yeji_type = 1 THEN '新客户' ELSE '旧客户' END ) AS achieveType,
         t2.number,
         t1.order_no,
         (CASE WHEN t9.customer_id=t.customer_id THEN t9.name ELSE tx.name END) as name,
@@ -294,7 +294,7 @@
             and t7.departure_warehouse_id = #{query.startWarehouseId}
         </if>
         <if test="query.achieveType != null">
-            and t6.is_new = #{query.achieveType}
+            and t1.yeji_type = #{query.achieveType}
         </if>
         <if test="query.destWarehouseIdList != null">
             and t8.objective_warehouse_id in
@@ -312,7 +312,7 @@
         select * from (
         SELECT
         IFNULL(t6.resource_type,1) as customer_type,
-        ( CASE WHEN t6.is_new = 1 THEN '新客户' ELSE '旧客户' END ) AS achieveType,
+        ( CASE WHEN t1.yeji_type = 1 THEN '新客户' ELSE '旧客户' END ) AS achieveType,
         t2.number,
         t1.order_no,
         (CASE WHEN t9.customer_id=t.customer_id THEN t9.name ELSE tx.name END) as name,
@@ -382,7 +382,7 @@
             and t7.departure_warehouse_id = #{query.startWarehouseId}
         </if>
         <if test="query.achieveType != null">
-            and t6.is_new = #{query.achieveType}
+            and t1.yeji_type = #{query.achieveType}
         </if>
         <if test="query.destWarehouseIdList != null">
             and t8.objective_warehouse_id in
@@ -406,7 +406,7 @@
 FROM
 	(
 	SELECT
-		( CASE WHEN t6.is_new = 1 THEN '新客户' ELSE '旧客户' END ) AS cusType,
+		( CASE WHEN t1.yeji_type = 1 THEN '新客户' ELSE '旧客户' END ) AS cusType,
 		(
 		SELECT
 		CASE