修复续费订单未支付发送续单提醒短信

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

@@ -361,18 +361,18 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme
                     deviceOpService.actionExecute(sOrder.getRoomId(), sOrder.getConsumerPhone(), VoiceEnum.RENEWAL_SUCCESS.getCode(),
                             cn.hutool.core.date.DateUtil.format(new Date(), DatePattern.NORM_DATETIME_PATTERN),
                             cn.hutool.core.date.DateUtil.format(cn.hutool.core.date.DateUtil.offsetMinute(new Date(), 1), DatePattern.NORM_DATETIME_PATTERN), "1");
-                }
-            }
-            Map<String, String> map = new HashMap<>();
-            map.put("orderNo", sOrder.getOrderNo());
-            map.put("expirationTime", sOrder.getEndDate().toString());
-            JSONObject jsonObject = new JSONObject(map);
                     SRoom sRoom = roomService.getById(sOrder.getRoomId());
                     //通知保洁人员
                     sConsumerService.selectListByStoreId(sOrder.getStoreId()).stream().forEach(item -> {
                         // 循环发送短信提示门店保洁打扫卫生
                         smsService.sendSmsCleanRecordsStopRemind(item.getPhone(), sStore, sRoom);
                     });
+                }
+            }
+            Map<String, String> map = new HashMap<>();
+            map.put("orderNo", sOrder.getOrderNo());
+            map.put("expirationTime", sOrder.getEndDate().toString());
+            JSONObject jsonObject = new JSONObject(map);
             redisUtils.set(ReceiptRdeisEnum.ORDER_NO_KEY.getValue() + sOrder.getOrderNo(), jsonObject.toString());
             redisUtils.delete(ReceiptRdeisEnum.ORDER_NO.getValue() + sOrder.getOrderNo());
         }
@@ -722,10 +722,11 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme
         }
         baseMapper.updateById(sOrder);
         Long couponId = sOrder.getCouponId();
+        SStore sStore = storeService.getById(sOrder.getStoreId());
         if (couponId != null && couponId > 0) {
             SConsumerCoupon consumerCoupon = consumerCouponService.getById(couponId);
             if (consumerCoupon != null) {
-                SStore sStore = storeService.getById(sOrder.getStoreId());
+
                 qpService.consume(consumerCoupon.getCouponCode(), 1, sStore.getOpenShopUuid());
                 consumerCoupon.setUseStatus(UserStatusEnum.USED.getCode());
                 consumerCouponService.updateById(consumerCoupon);
@@ -737,6 +738,12 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme
                     cn.hutool.core.date.DateUtil.format(new Date(), DatePattern.NORM_DATETIME_PATTERN),
                     cn.hutool.core.date.DateUtil.format(cn.hutool.core.date.DateUtil.offsetMinute(new Date(), 1), DatePattern.NORM_DATETIME_PATTERN), "1");
         }
+        SRoom sRoom = roomService.getById(sOrder.getRoomId());
+        //通知保洁人员
+        sConsumerService.selectListByStoreId(sOrder.getStoreId()).stream().forEach(item -> {
+            // 循环发送短信提示门店保洁打扫卫生
+            smsService.sendSmsCleanRecordsStopRemind(item.getPhone(), sStore, sRoom);
+        });
         SConsumptionRecords sConsumptionRecords = new SConsumptionRecords();
         sConsumptionRecords.setConsumerId(sOrder.getConsumerId());
         sConsumptionRecords.setOrderId(sOrder.getId());