修改支付回调，redis在sql修改后面

share-quartz/src/main/java/share/quartz/task/RedisTask.java

@@ -268,6 +268,7 @@ public class RedisTask {
                 smsService.sendSmsOrderEndRemind(sOrder.getConsumerPhone(), sStore, sRoom);
                 //推送订单结束消息
                 wechatNewService.sendMiniSubscribeMessage(sOrder, MessageReminderEnum.END);
+                logger.info("保洁工单派单通知发送开始");
                 //通知保洁人员
                 sConsumerService.selectListByStoreId(sOrder.getStoreId()).stream().forEach(item -> {
                     // 循环发送短信提示门店保洁打扫卫生
@@ -275,6 +276,7 @@ public class RedisTask {
                     //公众号发送保洁工单派单通知
                     wechatNewService.sendPublicTemplateMessage(finalSOrder, MessageReminderEnum.CLEANING, item.getId());
                 });
+                logger.info("保洁工单派单通知发送结束");
                 return;
             }
             //判断时间是否在5分钟到4分钟
@@ -505,6 +507,9 @@ public class RedisTask {
             return;
         }
         List<String> list = new ArrayList<>();
+        if (sConsumerTokenList.size() > 100) {
+            sConsumerTokenList = sConsumerTokenList.subList(0, 100);
+        }
         List<String> wechatUSERList = wechatNewService.getWechatUSERList(list, "");
         Map<String, String> stringStringMap = wechatNewService.WechatUsetListInfo(wechatUSERList);
         List<SConsumerToken> updateList = new ArrayList<>();

share-system/src/main/java/share/system/service/impl/SOrderServiceImpl.java

@@ -949,12 +949,14 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme
                 sConsumer.setPosition(3);
                 List<SConsumer> consumers = sConsumerService.selectAllocatedList(sConsumer);
                 if (consumers.size() > 0) {
+                    logger.info("订单预订成功通知发送开始");
                     consumers.forEach(o -> {
                         phones.add(o.getPhone());
                         //公众号发送订单预订成功通知
                         wechatNewService.sendPublicTemplateMessage(sOrder, MessageReminderEnum.ORDER_RESERVE, o.getId());
                     });
                     smsService.sendSmsOrderPredetermine(phones, sOrder, sStore, room);
+                    logger.info("订单预订成功通知发送结束");
                 }
             }
             return response;
@@ -1407,23 +1409,26 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme
             sOrder.setEndDate(sOrder.getPreEndDate());
             sOrder.setArrivalTime(new Date());
             sOrder.setStatus(OrderStatusEnum.INUSE.getCode());
+        } else if (sOrder.getOrderType().equals(OrderTypeEnum.RESERVER.getCode())) {
+            wechatNewService.sendMiniSubscribeMessage(sOrder, MessageReminderEnum.RESERVER);
+        }
+        if (sOrder.getIsDelete().equals(YesNoEnum.yes.getIndex()) && sOrder.getPayStatus().equals(YesNoEnum.yes.getIndex())) {
+            sOrder.setIsDelete(YesNoEnum.no.getIndex());
+        }
+        baseMapper.updateSOrder(sOrder);
+        if (sOrder.getOrderType().equals(OrderTypeEnum.RENEW.getCode())) {
             Map<String, String> map = new HashMap<>();
             map.put("orderNo", sOrder.getOrderNo());
             map.put("expirationTime", sOrder.getEndDate().toString());
             JSONObject jsonObject = new JSONObject(map);
             redisUtil.set(ReceiptRdeisEnum.ORDER_NO_KEY.getValue() + sOrder.getOrderNo(), jsonObject.toString());
         } else if (sOrder.getOrderType().equals(OrderTypeEnum.RESERVER.getCode())) {
-            wechatNewService.sendMiniSubscribeMessage(sOrder, MessageReminderEnum.RESERVER);
             Map<String, String> map = new HashMap<>();
             map.put("orderNo", sOrder.getOrderNo());
             map.put("expirationTime", sOrder.getPreStartDate().toString());
             JSONObject jsonObject = new JSONObject(map);
             redisUtil.set(ReceiptRdeisEnum.ORDER_NO.getValue() + sOrder.getOrderNo(), jsonObject.toString());
         }
-        if (sOrder.getIsDelete().equals(YesNoEnum.yes.getIndex()) && sOrder.getPayStatus().equals(YesNoEnum.yes.getIndex())) {
-            sOrder.setIsDelete(YesNoEnum.no.getIndex());
-        }
-        baseMapper.updateSOrder(sOrder);
         Long couponId = sOrder.getCouponId();
         SStore sStore = storeService.getById(sOrder.getStoreId());
         SRoom sRoom = roomService.getById(sOrder.getRoomId());
@@ -1459,12 +1464,14 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme
         sConsumer.setPosition(3);
         List<SConsumer> consumers = sConsumerService.selectAllocatedList(sConsumer);
         if (consumers.size() > 0) {
+            logger.info("订单预订成功通知发送开始");
             consumers.forEach(o->{
                 phones.add(o.getPhone());
                 //公众号发送订单预订成功通知
-//                wechatNewService.sendPublicTemplateMessage(sOrder,MessageReminderEnum.ORDER_RESERVE,o.getId());
+                wechatNewService.sendPublicTemplateMessage(sOrder, MessageReminderEnum.ORDER_RESERVE, o.getId());
             });
             smsService.sendSmsOrderPredetermine(phones, sOrder, sStore, sRoom);
+            logger.info("订单预订成功通知发送结束");
         }
     }