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

Feature/社群

See merge request !818

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/chat/impl/GroupChatPlanServiceImpl.java

@@ -362,14 +362,14 @@ public class GroupChatPlanServiceImpl implements GroupChatPlanService {
         }
         if (CollectionUtils.isNotEmpty(addList)) {
             this.groupChatPlanLogMapper.batchInsert(addList);
+            // 更新统计数量、状态
+            this.groupChatPlanOwnerLogService.updateSendCount(ownerLog.getOwnerLogId(), sendCount,
+                    list.get(0).getSendTime(), failCount);
+            // 完成代办
+            this.pendingTaskService.updateFinish(ownerLog.getOwnerLogId() + "");
+            // 更新计划统计
+            this.groupChatPlanMapper.updateData(ownerLog.getPlanId(), 1, sendCount, failCount);
         }
-        // 更新统计数量、状态
-        this.groupChatPlanOwnerLogService.updateSendCount(ownerLog.getOwnerLogId(), sendCount,
-                list.get(0).getSendTime(), failCount);
-        // 完成代办
-        this.pendingTaskService.updateFinish(ownerLog.getOwnerLogId() + "");
-        // 更新计划统计
-        this.groupChatPlanMapper.updateData(ownerLog.getPlanId(), 1, sendCount, failCount);
     }
 
     @Override

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/MemberUnionidRelatedApiServiceImpl.java

@@ -886,7 +886,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
         if(StringUtils.isNotBlank(result)) {
             JSONObject json = JSON.parseObject(result) ;
             int errcode = json.getIntValue("errcode") ;
-            if(0 == errcode) {
+            if(0 != errcode) {
                 try {
                     errLog.setScenario("欢迎语");
                     errLog.setErrorContent(result);