2024-07-04-6提交

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

@@ -647,7 +647,7 @@ public class TargetLogServiceImpl extends
                 s_gsf = "收货人付运费,归收货客户";
                 if (consigneeDO == null) {
                     s_gsf += ",收货客户为空。";
-                    saleManid=0L;
+                    saleManid = 0L;
                     TargetLogDO targetLogDO = targetLogMapper.selectById(targetId);
                     //客户ID
                     targetLogDO.setCustomerId(customerId);
@@ -662,12 +662,13 @@ public class TargetLogServiceImpl extends
                 }
 
                 if (consigneeDO.getCustomerService() == null ||
-                        consigneeDO.getCustomerService() == 0) {
+                        consigneeDO.getCustomerService() == 0 &&
+                                consigneeDO.getSource() == 12) {
                     //收货人客户经理为空时不算业绩
                     //客户来源是发货人推荐，不保留业绩记录 customer_source
                     //2024-06-03 添加的逻辑
-                    s_gsf += ",收货人客户经理为空，不算奖金。";
-                    saleManid=0L;
+                    s_gsf += ",收货人客户经理为空,发货人推荐，不算奖金。";
+                    saleManid = 0L;
                     //删除业绩记录
                     orderService.updateOrderSalesmanId(info.getOrderId(),
                             0L);
@@ -695,21 +696,19 @@ public class TargetLogServiceImpl extends
                     }
                 }
 
-                if (consigneeDO.getSource() == 12) {
-                    s_gsf += ",发货人带来的收货人,有客户经理，归收货人客户经理。";
-                    TargetLogDO targetLogDO = targetLogMapper.selectById(targetId);
-                    //客户ID
-                    targetLogDO.setCustomerId(customerId);
-                    //客户经理ID
-                    saleManid=consigneeDO.getCustomerService();
-                    targetLogDO.setUserId(saleManid);
-                    targetLogDO.setLoglev(loglev);
-                    targetLogDO.setGsf(s_gsf);
-                    targetLogDO.setGstype(n_gstype);
-                    targetLogDO.setUpdateTime(new Date());
-                    targetLogMapper.updateById(targetLogDO);
-                    return;
-                }
+                s_gsf += ",发货人带来的收货人,有客户经理，归收货人客户经理。";
+                TargetLogDO targetLogDO = targetLogMapper.selectById(targetId);
+                //客户ID
+                targetLogDO.setCustomerId(customerId);
+                //客户经理ID
+                saleManid = consigneeDO.getCustomerService();
+                targetLogDO.setUserId(saleManid);
+                targetLogDO.setLoglev(loglev);
+                targetLogDO.setGsf(s_gsf);
+                targetLogDO.setGstype(n_gstype);
+                targetLogDO.setUpdateTime(new Date());
+                targetLogMapper.updateById(targetLogDO);
+                return;
 
             } else if (info.getDrawee() == 3) {
                 //自定义付款