2024-07-04-5提交

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 += ",收货客户为空。";
-                    customerId = 0L;
+                    saleManid=0L;
                     TargetLogDO targetLogDO = targetLogMapper.selectById(targetId);
                     //客户ID
                     targetLogDO.setCustomerId(customerId);
@@ -687,7 +687,7 @@ public class TargetLogServiceImpl extends
                             consigneeDO.getCustomerService());
                     if (d0 != null && d1 != null) {
                         if (d1.compareTo(d0) > 0) {
-                            s_gsf += ",入参后归属客户经理，不算奖金。";
+                            s_gsf += ",入仓后归属客户经理，不算奖金。";
                             saleManid = 0L;
                             orderService.updateOrderSalesmanId(info.getOrderId(),
                                     0L);
@@ -701,6 +701,7 @@ public class TargetLogServiceImpl extends
                     //客户ID
                     targetLogDO.setCustomerId(customerId);
                     //客户经理ID
+                    saleManid=consigneeDO.getCustomerService();
                     targetLogDO.setUserId(saleManid);
                     targetLogDO.setLoglev(loglev);
                     targetLogDO.setGsf(s_gsf);