Merge branch 'dev_v1.3.8_20221209'

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/io/request/im/CustomerServiceBatchSendingVo.java

@@ -85,6 +85,9 @@ public class CustomerServiceBatchSendingVo {
 		@ApiModelProperty("创建时间")
         private Date createTime;
 
+        @ApiModelProperty("客服人员")
+        private String sender;
+
         @ApiModelProperty("目标人群")
         private List<CustomerServiceReceiveVo.CustomerServiceReceive> receives;
                 

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/CustomerServiceBatchSendingServiceImpl.java

@@ -190,7 +190,10 @@ public class CustomerServiceBatchSendingServiceImpl extends ServiceImpl<Customer
     public Boolean add(CustomerServiceBatchSendingWrapper.CustomerServiceBatchSending info) {
 
         // 发送客服ID
-        String customerService = customerServiceConfig.getCustomerService();
+        String customerService = info.getSender();
+        if (StringUtils.isBlank(customerService)) {
+            customerService = customerServiceConfig.getCustomerService();
+        }
         if (StringUtils.isNotEmpty(customerService)) {
 
             List<String> collect = Arrays.stream(customerService.split(",")).collect(Collectors.toList());

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/wrapper/im/CustomerServiceBatchSendingWrapper.java

@@ -162,6 +162,9 @@ public class CustomerServiceBatchSendingWrapper {
 
         @ApiModelProperty("目标群体名称")
         private String targetGroupName;
+
+        @ApiModelProperty("客服人员")
+        private String sender;
         
         public String jsonString() {
             return JSON.toJSONString(this);