增加月卡时长和钱包时长混和使用

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

@@ -46,6 +46,8 @@ public class ConsumerMonthlyCardServiceImpl extends ServiceImpl<ConsumerMonthlyC
     private IPackService packService;
     @Autowired
     private ISRoomService roomService;
+    @Autowired
+    private ConsumerWalletService consumerWalletService;
 
     /**
      * 查询用户月卡
@@ -128,12 +130,14 @@ public class ConsumerMonthlyCardServiceImpl extends ServiceImpl<ConsumerMonthlyC
         SConsumer user = sConsumerService.getInfo();
         ConsumerMember consumerMember = consumerMemberService.getOne(new LambdaQueryWrapper<ConsumerMember>().eq(ConsumerMember::getConsumerId, user.getId()).eq(ConsumerMember::getIsRights
                 , YesNoEnum.yes.getIndex()));
+        ConsumerWallet consumerWallet = consumerWalletService.getOne(new LambdaQueryWrapper<ConsumerWallet>().eq(ConsumerWallet::getConsumerId, user.getId()));
         ConsumerMonthlyCard consumerMonthlyCard = null;
         List<ConsumerSecondaryCard> consumerSecondaryCard = null;
         MonthlyCardResponse map = new MonthlyCardResponse();
         List<ConsumerMonthlyCard> consumerMonthlyCardList = new ArrayList<>();
         List<ConsumerSecondaryCard> consumerSecondaryCardList = new ArrayList<>();
-
+        //可用时长
+        BigDecimal freeDuration = consumerWallet.getRemainingDuration();
         if (ObjectUtil.isNotEmpty(consumerMember)) {
             SRoom room = roomService.getById(monthlyCardRequest.getRoomId());
             consumerMonthlyCard = baseMapper.selectOne(new LambdaQueryWrapper<ConsumerMonthlyCard>().eq(ConsumerMonthlyCard::getConsumerId, user.getId()).gt(ConsumerMonthlyCard::getFreeDuration, 0));
@@ -142,6 +146,7 @@ public class ConsumerMonthlyCardServiceImpl extends ServiceImpl<ConsumerMonthlyC
                     .gt(ConsumerSecondaryCard::getNumber, 0)
                     .orderByAsc(ConsumerSecondaryCard::getNumber)
             );
+            freeDuration = freeDuration.add(consumerMonthlyCard.getFreeDuration());
             if (!ObjectUtils.isEmpty(monthlyCardRequest.getRoomLabelId())) {
                 RoomLabel roomLabel = roomLabelService.selectRoomLabelById(monthlyCardRequest.getRoomLabelId());
                 Label label = labelService.getById(roomLabel.getLabelId());
@@ -179,7 +184,7 @@ public class ConsumerMonthlyCardServiceImpl extends ServiceImpl<ConsumerMonthlyC
                                 }
                             });
                         }
-                        if (ObjectUtil.isNotEmpty(consumerMonthlyCard) && consumerMonthlyCard.getFreeDuration().compareTo(new BigDecimal(byId.getDuration())) >= 0) {
+                        if (ObjectUtil.isNotEmpty(consumerMonthlyCard) && freeDuration.compareTo(new BigDecimal(byId.getDuration())) >= 0) {
                             consumerMonthlyCardList.add(consumerMonthlyCard);
                             map.setConsumerMonthlyCard(consumerMonthlyCardList);
                         }
@@ -218,7 +223,7 @@ public class ConsumerMonthlyCardServiceImpl extends ServiceImpl<ConsumerMonthlyC
                         }
                     });
                 }
-                if (ObjectUtil.isNotEmpty(consumerMonthlyCard) && consumerMonthlyCard.getFreeDuration().compareTo(new BigDecimal(pack.getDuration())) >= 0) {
+                if (ObjectUtil.isNotEmpty(consumerMonthlyCard) && freeDuration.compareTo(new BigDecimal(pack.getDuration())) >= 0) {
                     consumerMonthlyCardList.add(consumerMonthlyCard);
                     map.setConsumerMonthlyCard(consumerMonthlyCardList);
                 }