更改套餐为空的问题

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

@@ -317,6 +317,7 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme
             // 加入自动未支付自动取消队列
             redisUtil.lPush(Constants.ORDER_AUTO_CANCEL_KEY, sOrder.getOrderNo());
         }
+        save(sOrder);
         if (response.getStatus().equals(YesNoEnum.yes.getFlag())) {
             if (Objects.nonNull(request.getCouponId()) && request.getCouponId() != 0) {
                 SConsumerCoupon byId = consumerCouponService.getById(request.getCouponId());
@@ -351,7 +352,7 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme
             JSONObject jsonObject = new JSONObject(map);
             redisUtils.set(ReceiptRdeisEnum.ORDER_NO_KEY.getValue() + sOrder.getOrderNo(), jsonObject.toString());
         }
-        save(sOrder);
+
         return response;
     }
 

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

@@ -265,7 +265,11 @@ public class SStoreServiceImpl extends ServiceImpl<SStoreMapper, SStore> impleme
                 List<SPack> sPacks = new ArrayList<>();
                 roomPacks.stream().forEach(sRoomPack -> {
                     if (sRoomVo.getId().compareTo(sRoomPack.getRoomId()) == 0) {
-                        sPacks.add(packMap.get(sRoomPack.getPackId()));
+                        SPack sPack = packMap.get(sRoomPack.getPackId());
+                        if (ObjectUtil.isNotEmpty(sPack)) {
+                            sPacks.add(sPack);
+                        }
+
                     }
                 });
                 sRoomVo.setPackList(sPacks);