chore: 客户的同行或代理业务由type转移到roles

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

@@ -208,8 +208,8 @@ public class CustomerServiceImpl extends AbstractService<CustomerMapper,
             customerService = consignorCustomerDO.getCustomerService();
 
             // 待分配。 若是发货人为代理和同行时，订单的收货人不同步到待分配客户
-            boolean isProxyConsignor = StringUtils.isNotEmpty(consignorCustomerDO.getType())
-                    && (consignorCustomerDO.getType().contains("2") || consignorCustomerDO.getType().contains("3"));
+            boolean isProxyConsignor = StringUtils.isNotEmpty(consignorCustomerDO.getRoles())
+                    && (consignorCustomerDO.getRoles().contains("2") || consignorCustomerDO.getRoles().contains("3"));
             if (isProxyConsignor) {
                 log.info("若是发货人为代理和同行时，订单的收货人不同步到待分配客户");
                 return null;

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/listener/MemberRegListener.java

@@ -120,8 +120,8 @@ public class MemberRegListener {
                     OrderConsignorDO orderConsignorByOrderId = orderConsignorService.getOrderConsignorByOrderId(orderId);
                     if (orderConsignorByOrderId != null && orderConsignorByOrderId.getCustomerId() != null) {
                         CustomerDO orderConsignorCustomer = customerService.getCustomer(orderConsignorByOrderId.getCustomerId());
-                        if (orderConsignorCustomer != null &&  StringUtils.isNotEmpty(orderConsignorCustomer.getType())
-                                && !orderConsignorCustomer.getType().contains("2") && !orderConsignorCustomer.getType().contains("3")) {
+                        if (orderConsignorCustomer != null &&  StringUtils.isNotEmpty(orderConsignorCustomer.getRoles())
+                                && !orderConsignorCustomer.getRoles().contains("2") && !orderConsignorCustomer.getRoles().contains("3")) {
                             //设置为发货人的客户经理
                             orderConsigneeCustomer.setCustomerService(orderConsignorCustomer.getCustomerService());
                             orderConsigneeCustomer.setConsigneeFirstCustomerService(orderConsignorCustomer.getCustomerService());

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

@@ -418,9 +418,9 @@ public class OrderWarehouseInServiceImpl extends AbstractService<OrderWarehouseI
                         customerService.getCustomer(orderConsignorDO.getCustomerId());
                 // 发货人不是代理或同行
                 if (orderConsignorCustomer != null &&
-                        StringUtils.isNotEmpty(orderConsignorCustomer.getType())
-                        && !orderConsignorCustomer.getType().contains("2") &&
-                        !orderConsignorCustomer.getType().contains("3")) {
+                        StringUtils.isNotEmpty(orderConsignorCustomer.getRoles())
+                        && !orderConsignorCustomer.getRoles().contains("2") &&
+                        !orderConsignorCustomer.getRoles().contains("3")) {
                     // 收货人信息
                     OrderConsigneeDO orderConsigneeDO =
                             orderConsigneeService.getOrderConsigneeByOrderId(orderId);