Merge branch 'dev-xym-update-user' of Server/growth-manager into master

common-module/src/main/java/com/tzld/piaoquan/growth/common/model/bo/WeComUserBo.java

@@ -36,4 +36,6 @@ public class WeComUserBo {
 
     private Integer sendGender;
 
+    private String tagName;
+
 }

common-module/src/main/java/com/tzld/piaoquan/growth/common/model/vo/WeComUserVo.java

@@ -36,4 +36,6 @@ public class WeComUserVo {
     // 100002 单向 昵称  200002 多日 昵称
     private Integer strategy;
 
+    private String tagName;
+
 }

common-module/src/main/resources/mapper/ext/WeComUserMapperExt.xml

@@ -25,12 +25,13 @@
         wcu.external_user_id_3rd_party as externalUserId3rdParty, wcu.type as type, wcu.name as name,
         wcu.avatar as avatar, wcu.gender as gender, wcs.carrier_id as carrierId, wcsmr.status as status,
         UNIX_TIMESTAMP(wcsmr.send_time) * 1000 as sendTime, wcsmr.id as sendMsgResultId, wcspsm.status as strategyStatus,
-        wcspsm.content as content, wcspsm.gender as sendGender
+        wcspsm.content as content, wcspsm.gender as sendGender, wct.tag_name
         from we_com_user wcu
         join we_com_send_msg_result wcsmr on wcsmr.user_id = wcu.id
         join we_com_special_send_message wcssm on wcssm.user_id = wcsmr.user_id and wcssm.staff_id = wcsmr.staff_id
         join we_com_staff wcs on wcs.id = wcssm.staff_id
         join we_com_special_pre_send_message wcspsm on wcssm.group = wcspsm.id
+        join we_com_tag wct on wcspsm.tag_id = wct.id
         where wcssm.is_send = 1
         and wcsmr.create_time between #{start} and #{end}
         and wcssm.pre_send_date = #{preSendDate}

offline-module/src/main/java/com/tzld/piaoquan/offline/job/WeComHistoryDataJob.java

@@ -156,7 +156,11 @@ public class WeComHistoryDataJob {
         StringBuilder stringBuilder = new StringBuilder();
         stringBuilder.append(corpName).append("\n");
         long allCount = 0;
-        long notSend = 0;
+        long notSendCount = 0;
+        long successSendCount = 0;
+        long notFriendCount = 0;
+        long failSendCount = 0;
+
         for (SendDetail sendDetail : sendDetailList) {
             List<Long> sendCountList = sendDetail.getSendCountList();
             if (CollectionUtils.isEmpty(sendCountList)) {
@@ -165,7 +169,10 @@ public class WeComHistoryDataJob {
             stringBuilder.append(sendDetail.getRemark());
             long count = sendCountList.get(0) + sendCountList.get(1) + sendCountList.get(2) + sendCountList.get(3);
             allCount += count;
-            notSend += sendCountList.get(0);
+            notSendCount += sendCountList.get(0);
+            successSendCount += sendCountList.get(1);
+            notFriendCount += sendCountList.get(2);
+            failSendCount += sendCountList.get(3);
             if (count != 0 && sendCountList.get(0) > 0 && !specialStaffIdList.contains(sendDetail.getStaffId())) {
                 LarkRobotUtil.sendMessage(sendDetail.getRemark() + "存在未发送记录，请检查");
                 if (sendDetail.getStaffId() == 3) {
@@ -184,11 +191,18 @@ public class WeComHistoryDataJob {
             stringBuilder.append("已经收到其他群发消息失败发送数量：").append(sendCountList.get(3)).append("   ");
             stringBuilder.append("\n");
         }
+        stringBuilder.append(corpName).append("汇总发送数量：").append("   ");
+        stringBuilder.append("总发送数量：").append(allCount).append("   ");
+        stringBuilder.append("未发送数量：").append(notSendCount).append("   ");
+        stringBuilder.append("已发送数量：").append(successSendCount).append("   ");
+        stringBuilder.append("不是好友发送失败数量：").append(notFriendCount).append("   ");
+        stringBuilder.append("已经收到其他群发消息失败发送数量：").append(failSendCount).append("   ");
+        stringBuilder.append("\n");
         if (allCount > 0) {
             LarkRobotUtil.sendMessage(stringBuilder.toString());
             LarkRobotUtil.sendTipMessage(stringBuilder.toString());
         }
-        return notSend;
+        return notSendCount;
     }
 
 

offline-module/src/main/java/com/tzld/piaoquan/offline/job/WeComUserDataJob.java

@@ -524,6 +524,7 @@ public class WeComUserDataJob {
             weComUser.setUnionId(unionId);
             weComUser.setGender(gender);
             weComUser.setAvatar(avatar);
+            weComUser.setIsDelete(0);
             weComUserMapper.updateByPrimaryKeySelective(weComUser);
             StaffWithUserExample example = new StaffWithUserExample();
             example.createCriteria().andStaffIdEqualTo(staffId).andUserIdEqualTo(userId);