Commit 2adee799 by 徐高华

Merge branch 'feature/社群' into 'developer'

Feature/社群

See merge request !818
parents 372cacca 0b2d5ed6
...@@ -362,7 +362,6 @@ public class GroupChatPlanServiceImpl implements GroupChatPlanService { ...@@ -362,7 +362,6 @@ public class GroupChatPlanServiceImpl implements GroupChatPlanService {
} }
if (CollectionUtils.isNotEmpty(addList)) { if (CollectionUtils.isNotEmpty(addList)) {
this.groupChatPlanLogMapper.batchInsert(addList); this.groupChatPlanLogMapper.batchInsert(addList);
}
// 更新统计数量、状态 // 更新统计数量、状态
this.groupChatPlanOwnerLogService.updateSendCount(ownerLog.getOwnerLogId(), sendCount, this.groupChatPlanOwnerLogService.updateSendCount(ownerLog.getOwnerLogId(), sendCount,
list.get(0).getSendTime(), failCount); list.get(0).getSendTime(), failCount);
...@@ -371,6 +370,7 @@ public class GroupChatPlanServiceImpl implements GroupChatPlanService { ...@@ -371,6 +370,7 @@ public class GroupChatPlanServiceImpl implements GroupChatPlanService {
// 更新计划统计 // 更新计划统计
this.groupChatPlanMapper.updateData(ownerLog.getPlanId(), 1, sendCount, failCount); this.groupChatPlanMapper.updateData(ownerLog.getPlanId(), 1, sendCount, failCount);
} }
}
@Override @Override
public void del(String clerkId, String clerkName, Long planId) { public void del(String clerkId, String clerkName, Long planId) {
......
...@@ -886,7 +886,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA ...@@ -886,7 +886,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
if(StringUtils.isNotBlank(result)) { if(StringUtils.isNotBlank(result)) {
JSONObject json = JSON.parseObject(result) ; JSONObject json = JSON.parseObject(result) ;
int errcode = json.getIntValue("errcode") ; int errcode = json.getIntValue("errcode") ;
if(0 == errcode) { if(0 != errcode) {
try { try {
errLog.setScenario("欢迎语"); errLog.setScenario("欢迎语");
errLog.setErrorContent(result); errLog.setErrorContent(result);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment