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

common-module/src/main/java/com/tzld/piaoquan/growth/common/dao/mapper/SpecialSendMessageMapper.java

@@ -36,5 +36,5 @@ public interface SpecialSendMessageMapper {
 
     List<SpecialSendMessage> getGroupList(@Param("preSendDate") String preSendDate);
 
-    List<String> selectExternalUserId(@Param("staffId") Long staffId, @Param("group") Integer group);
+    List<String> selectExternalUserId(@Param("staffId") Long staffId, @Param("group") Integer group, @Param("preSendDate") String preSendDate);
 }

common-module/src/main/resources/mapper/SpecialSendMessageMapper.xml

@@ -312,6 +312,7 @@
                  left join we_com_user t2 on t1.user_id = t2.id
         where t1.staff_id = #{staffId,jdbcType=BIGINT}
           and t1.group = #{group,jdbcType=INTEGER}
+          and t1.pre_send_date = #{preSendDate,jdbcType=VARCHAR}
           and t1.is_send = 0
     </select>
 </mapper>

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

@@ -70,17 +70,21 @@ public class WeComSpecialDataJob {
         String thatDayDateString = DateUtil.getThatDayDateString();
         List<SpecialSendMessage> groupList = specialSendMessageMapper.getGroupList(thatDayDateString);
         for (SpecialSendMessage specialSendMessage : groupList) {
-            List<String> externalUserIds = specialSendMessageMapper.selectExternalUserId(specialSendMessage.getStaffId(), specialSendMessage.getGroup());
+            List<String> externalUserIds = specialSendMessageMapper.selectExternalUserId(specialSendMessage.getStaffId(),
+                    specialSendMessage.getGroup(), thatDayDateString);
             boolean flag = specialPushMessage(externalUserIds, specialSendMessage);
             if (flag) {
                 SpecialSendMessage updateSpecialSendMessage = new SpecialSendMessage();
                 updateSpecialSendMessage.setIsSend(1);
                 SpecialSendMessageExample example = new SpecialSendMessageExample();
-                example.createCriteria()
+                SpecialSendMessageExample.Criteria criteria = example.createCriteria()
                         .andStaffIdEqualTo(specialSendMessage.getStaffId())
                         .andGroupEqualTo(specialSendMessage.getGroup())
                         .andContentEqualTo(specialSendMessage.getContent())
-                        .andAttachmentIdsEqualTo(specialSendMessage.getAttachmentIds());
+                        .andPreSendDateEqualTo(thatDayDateString);
+                if (StringUtils.isNotEmpty(specialSendMessage.getAttachmentIds())) {
+                    criteria.andAttachmentIdsEqualTo(specialSendMessage.getAttachmentIds());
+                }
                 specialSendMessageMapper.updateByExampleSelective(updateSpecialSendMessage, example);
             }
         }