|
@@ -740,7 +740,7 @@ public class QwGroupMsgServiceImpl implements IQwGroupMsgService
|
|
|
qwGroupMsg.setCorpId(qwGroupMsgParam.getCorpId());
|
|
qwGroupMsg.setCorpId(qwGroupMsgParam.getCorpId());
|
|
|
|
|
|
|
|
//主表存/任务类型
|
|
//主表存/任务类型
|
|
|
- qwGroupMsg.setChatType(qwGroupMsgParam.getChatType());
|
|
|
|
|
|
|
+ qwGroupMsg.setChatType("single");
|
|
|
|
|
|
|
|
|
|
|
|
|
QwUser qwUser = qwExternalContactService.getQwUserByRedis(qwGroupMsgParam.getCorpId().trim(), qwGroupMsgParam.getSender().trim());
|
|
QwUser qwUser = qwExternalContactService.getQwUserByRedis(qwGroupMsgParam.getCorpId().trim(), qwGroupMsgParam.getSender().trim());
|
|
@@ -776,11 +776,10 @@ public class QwGroupMsgServiceImpl implements IQwGroupMsgService
|
|
|
|
|
|
|
|
//发送这条消息文本的成员集合
|
|
//发送这条消息文本的成员集合
|
|
|
qwGroupMsg.setSender(qwGroupMsgParam.getSender().trim());
|
|
qwGroupMsg.setSender(qwGroupMsgParam.getSender().trim());
|
|
|
- qwGroupMsg.setAllowSelect(qwGroupMsgParam.getAllowSelect());
|
|
|
|
|
|
|
+ qwGroupMsg.setAllowSelect(1);
|
|
|
qwGroupMsg.setTextContent(qwGroupMsgParam.getTextContent());
|
|
qwGroupMsg.setTextContent(qwGroupMsgParam.getTextContent());
|
|
|
qwGroupMsg.setCreateName(qwGroupMsgParam.getCreateName());
|
|
qwGroupMsg.setCreateName(qwGroupMsgParam.getCreateName());
|
|
|
- qwGroupMsg.setGroupChatNames(qwGroupMsgParam.getGroupChatNames());
|
|
|
|
|
- qwGroupMsg.setSelectType(qwGroupMsgParam.getSelectType());
|
|
|
|
|
|
|
+ qwGroupMsg.setSelectType(2);
|
|
|
//筛选出客户
|
|
//筛选出客户
|
|
|
QwCountCustomerParam qwCountCustomerParam = new QwCountCustomerParam();
|
|
QwCountCustomerParam qwCountCustomerParam = new QwCountCustomerParam();
|
|
|
|
|
|
|
@@ -788,7 +787,7 @@ public class QwGroupMsgServiceImpl implements IQwGroupMsgService
|
|
|
userIdsList.add(qwGroupMsgParam.getSender().trim());
|
|
userIdsList.add(qwGroupMsgParam.getSender().trim());
|
|
|
qwCountCustomerParam.setUserIdsSelectList(userIdsList);
|
|
qwCountCustomerParam.setUserIdsSelectList(userIdsList);
|
|
|
|
|
|
|
|
- qwCountCustomerParam.setSelectType(qwGroupMsgParam.getSelectType());
|
|
|
|
|
|
|
+ qwCountCustomerParam.setSelectType(2);
|
|
|
qwCountCustomerParam.setGender(qwGroupMsgParam.getGender());
|
|
qwCountCustomerParam.setGender(qwGroupMsgParam.getGender());
|
|
|
qwCountCustomerParam.setGroupChatSelectList(qwGroupMsgParam.getGroupChatSelectList());
|
|
qwCountCustomerParam.setGroupChatSelectList(qwGroupMsgParam.getGroupChatSelectList());
|
|
|
qwCountCustomerParam.setTimeScreenCharge(qwGroupMsgParam.getTimeScreenCharge());
|
|
qwCountCustomerParam.setTimeScreenCharge(qwGroupMsgParam.getTimeScreenCharge());
|
|
@@ -806,11 +805,11 @@ public class QwGroupMsgServiceImpl implements IQwGroupMsgService
|
|
|
|
|
|
|
|
//发送消息文本组装
|
|
//发送消息文本组装
|
|
|
//群发任务类型()
|
|
//群发任务类型()
|
|
|
- msgTemplate.setChatType(qwGroupMsgParam.getChatType());
|
|
|
|
|
|
|
+ msgTemplate.setChatType("single");
|
|
|
|
|
|
|
|
- msgTemplate.setAllowSelect(qwGroupMsgParam.getAllowSelect() == 1 ? true : false);
|
|
|
|
|
|
|
+ msgTemplate.setAllowSelect(true);
|
|
|
msgTemplate.setTextContent(qwGroupMsgParam.getTextContent());
|
|
msgTemplate.setTextContent(qwGroupMsgParam.getTextContent());
|
|
|
- msgTemplate.setType(qwGroupMsgParam.getMsgType());
|
|
|
|
|
|
|
+ msgTemplate.setType(3);
|
|
|
|
|
|
|
|
QwAddMsgTemplateResult qwAddMsgTemplateResult = qwApiService.addMsgTemplate(msgTemplate, qwGroupMsgParam.getCorpId());
|
|
QwAddMsgTemplateResult qwAddMsgTemplateResult = qwApiService.addMsgTemplate(msgTemplate, qwGroupMsgParam.getCorpId());
|
|
|
|
|
|
|
@@ -854,7 +853,7 @@ public class QwGroupMsgServiceImpl implements IQwGroupMsgService
|
|
|
ext.setUserId(qwGroupMsgParam.getSender().trim());
|
|
ext.setUserId(qwGroupMsgParam.getSender().trim());
|
|
|
ext.setStatus(0);
|
|
ext.setStatus(0);
|
|
|
ext.setMsgId(qwAddMsgTemplateResult.getMsgId());
|
|
ext.setMsgId(qwAddMsgTemplateResult.getMsgId());
|
|
|
- ext.setChatType(qwGroupMsgParam.getChatType());
|
|
|
|
|
|
|
+ ext.setChatType("single");
|
|
|
ext.setCorpId(qwGroupMsgParam.getCorpId());
|
|
ext.setCorpId(qwGroupMsgParam.getCorpId());
|
|
|
ext.setCompanyId(qwCompany.getId());
|
|
ext.setCompanyId(qwCompany.getId());
|
|
|
ext.setGroupMsgId(qwGroupMsg.getId());
|
|
ext.setGroupMsgId(qwGroupMsg.getId());
|