Merge branch 'master' into dev-xym-addTag

api-module/src/main/java/com/tzld/piaoquan/api/mq/MessageCallbackCustomer.java

@@ -18,6 +18,7 @@ import org.springframework.stereotype.Component;
 import org.springframework.util.CollectionUtils;
 
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
 @Slf4j
@@ -39,16 +40,21 @@ public class MessageCallbackCustomer implements MessageListener {
         pushMessageCallback.setGhId(param.getGhId());
         pushMessageCallback.setTimestamp(param.getTimestamp());
         pushMessageCallback.setOpenId(param.getOpenId());
+        pushMessageCallback.setCreateTime(new Date());
         List<PushMessageCallback> insertList = new ArrayList<>();
-        for (ReplyInfo replyInfo : param.getReplyInfo()) {
-            PushMessageCallback insertPushMessageCallback = new PushMessageCallback();
-            BeanUtils.copyProperties(pushMessageCallback, insertPushMessageCallback);
-            insertPushMessageCallback.setMsgType(replyInfo.getMsgType());
-            insertPushMessageCallback.setVideoId(replyInfo.getMiniVideoId());
-            insertList.add(insertPushMessageCallback);
+        if (!CollectionUtils.isEmpty(param.getReplyInfo())) {
+            for (ReplyInfo replyInfo : param.getReplyInfo()) {
+                PushMessageCallback insertPushMessageCallback = new PushMessageCallback();
+                BeanUtils.copyProperties(pushMessageCallback, insertPushMessageCallback);
+                insertPushMessageCallback.setMsgType(replyInfo.getMsgType());
+                insertPushMessageCallback.setVideoId(replyInfo.getMiniVideoId());
+                insertList.add(insertPushMessageCallback);
+            }
         }
         try {
-            pushMessageCallbackMapper.insertList(insertList);
+            if(!CollectionUtils.isEmpty(insertList)){
+                pushMessageCallbackMapper.insertList(insertList);
+            }
         } catch (Exception e) {
             log.error("PushMessageCallback newPushMessageCallbackMapper insert pushMessageCallback={}, error={}", pushMessageCallback, e.getMessage());
             return Action.ReconsumeLater;

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

@@ -13,6 +13,7 @@ import com.tzld.piaoquan.growth.common.model.po.*;
 import com.tzld.piaoquan.growth.common.service.MessageAttachmentService;
 import com.tzld.piaoquan.growth.common.service.MessageService;
 import com.tzld.piaoquan.growth.common.utils.ToolUtils;
+import com.xxl.job.core.biz.model.ReturnT;
 import com.xxl.job.core.handler.annotation.XxlJob;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -63,7 +64,7 @@ public class WeComSpecialDataJob {
     }
 
     @XxlJob("sendSpecialPushMessageJob")
-    public void sendSpecialPushMessage() {
+    public ReturnT<String> sendSpecialPushMessage(String param) {
         List<SpecialSendMessage> groupList = specialSendMessageMapper.getGroupList();
         for (SpecialSendMessage specialSendMessage : groupList) {
             List<String> externalUserIds = specialSendMessageMapper.selectExternalUserId(specialSendMessage.getStaffId(), specialSendMessage.getGroup());
@@ -80,6 +81,7 @@ public class WeComSpecialDataJob {
                 specialSendMessageMapper.updateByExampleSelective(updateSpecialSendMessage, example);
             }
         }
+        return ReturnT.SUCCESS;
     }
 
     private boolean specialPushMessage(List<String> sendUserList, SpecialSendMessage specialSendMessage) {