Merge branch 'feature-canvas' into 'master'

统计判断有问题

See merge request !2479

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

@@ -518,7 +518,7 @@ public class GroupChatPlanServiceImpl implements GroupChatPlanService {
     public void doPlanSendInfo(Long ownerLogId) {
         logger.info("开始群群发统计{}", ownerLogId);
         TabGroupChatPlanOwnerLog ownerLog = this.groupChatPlanOwnerLogService.getById(ownerLogId);
-        if (ownerLog.getSendStatus() == 2 && null != ownerLog.getSendTime() && ownerLog.getSendTime().getTime() < System.currentTimeMillis()+1000*60*60) {
+        if (ownerLog.getSendStatus() == 2 && null != ownerLog.getSendTime() && ownerLog.getSendTime().getTime() > System.currentTimeMillis()-1000*60*60*12) {
             logger.info("已统计过");
             return;
         }
@@ -533,6 +533,10 @@ public class GroupChatPlanServiceImpl implements GroupChatPlanService {
             logger.info("计划不存在{}", planId);
             return;
         }
+        if(null != plan.getSendCount() && plan.getSendCount() > 0) {
+            logger.info("已统计过");
+            return;
+        }
         String wxEnterpriseId = ownerLog.getWxEnterpriseId();
         String enterpriseId = ownerLog.getEnterpriseId();
         String msgid = ownerLog.getMsgid();