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

群发统计

See merge request !648

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/chat/GroupChatPlanOwnerLogMapper.java

@@ -21,8 +21,6 @@ import com.gic.haoban.manage.service.entity.chat.TabGroupChatPlanOwnerLog;
  */
 public interface GroupChatPlanOwnerLogMapper {
 
-    public int insert(TabGroupChatPlanOwnerLog entity);
-
     public int batchInsert(List<TabGroupChatPlanOwnerLog> entity);
 
     public int update(TabGroupChatPlanOwnerLog entity);

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

@@ -174,7 +174,7 @@ public class GroupChatPlanServiceImpl implements GroupChatPlanService {
 
     @Override
     public void doPlan(Long planId) {
-        logger.info("开始执行群群发计划,planId={}", planId);
+        logger.info("开始群群发发送{}", planId);
         TabGroupChatPlan plan = this.groupChatPlanMapper.selectById(planId);
         if (null == plan) {
             logger.info("计划不存在,planid={}", planId);
@@ -255,8 +255,9 @@ public class GroupChatPlanServiceImpl implements GroupChatPlanService {
 
     @Override
     public void doPlanSendInfo(Long ownerLogId) {
-        logger.info("开始处理群发结果,ownerlogId={}", ownerLogId);
+        logger.info("开始群群发统计{}", ownerLogId);
         TabGroupChatPlanOwnerLog ownerLog = this.groupChatPlanOwnerLogService.getById(ownerLogId);
+        logger.info("开始群群发统计{}", ownerLog.getMsgid());
         String wxEnterpriseId = ownerLog.getWxEnterpriseId();
         String enterpriseId = ownerLog.getEnterpriseId();
         String msgid = ownerLog.getMsgid();

haoban-manage3-service/src/main/resources/mapper/chat/GroupChatPlanOwnerLogMapper.xml

@@ -34,35 +34,6 @@
 	  update_time , remark , msgid , delete_flag , done_flag , send_time ,  fail_count
   </sql>
   <!-- ===================== 新增 ======================== -->
-  <insert id="insert" parameterType="com.gic.haoban.manage.service.entity.chat.TabGroupChatPlanOwnerLog">
-  <![CDATA[
-  INSERT INTO tab_haoban_group_chat_plan_owner_log(
-	  owner_log_id,
-	  plan_id,
-	  wx_enterprise_id,
-	  enterprise_id,
-	  staff_id,
-	  store_id,
-	  clerk_id,
-	  send_status,
-	  send_count,
-	  create_time,
-	  update_time , remark , msgid , delete_flag , done_flag 
-  )VALUES(
-	  #{ownerLogId,jdbcType=BIGINT},
-	  #{planId,jdbcType=BIGINT},
-	  #{wxEnterpriseId},
-	  #{enterpriseId},
-	  #{staffId},
-	  #{storeId},
-	  #{clerkId},
-	  #{sendStatus},
-	  #{sendCount},
-	  #{createTime},
-	  #{updateTime} , #{remark} , #{msgid} , 0 , 0 
-  )
-  ]]>
-  </insert>
   
   <insert id="batchInsert">
 		 INSERT INTO tab_haoban_group_chat_plan_owner_log(
@@ -88,7 +59,7 @@
 				  #{item.storeId},
 				  #{item.clerkId},
 				  #{item.sendStatus},
-				  #{item.sendCount},
+				  0,
 				  0,
 				  #{item.createTime},
 				  #{item.updateTime} , #{item.remark} , #{item.msgid} , 0 , 0
@@ -102,13 +73,9 @@
 				  store_id=#{storeId},
 				  clerk_id=#{clerkId},
 				  send_status=#{sendStatus},
-				  fail_count=#{failCount},
-				  send_count=#{sendCount},
 				  update_time=now(),
 				  remark=#{remark},
-				  msgid=#{msgid},
-				  done_flag=#{doneFlag},
-				  send_time=#{sendTime}
+				  msgid=#{msgid}
 			  where owner_log_id = #{ownerLogId}
 			  ]]>
 	</update>
@@ -137,7 +104,7 @@
   
   <select id="listForTimer" resultType="long">
   	  SELECT a.owner_log_id  FROM tab_haoban_group_chat_plan_owner_log a left join tab_haoban_group_chat_plan b on a.plan_id = b.plan_id 
-  	  WHERE b.end_time >= DATE_ADD(NOW(),INTERVAL -12 hour) and a.done_flag = 0  and a.delete_flag = 0  and b.delete_flag = 0 
+  	  WHERE b.end_time >= DATE_ADD(NOW(),INTERVAL -12 hour) and a.done_flag = 0  and a.delete_flag = 0  and b.delete_flag = 0 and a.msgid is not null  
   	  <if test="null != planId and -1 != planId">
 	  	  and a.plan_id = #{planId}
   	  </if>