Merge branch 'dev' into test

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

@@ -2664,15 +2664,13 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme
         ConsumerMember consumerMember = null;
         ConsumerWallet consumerWallet = null;
         ConsumerMonthlyCard consumerMonthlyCard = null;
-        List<ConsumerSecondaryCard> consumerSecondaryCardList = null;
+        ConsumerSecondaryCard consumerSecondaryCard = null;
         LambdaQueryWrapper<Activity> queryWrapper = new LambdaQueryWrapper<>();
         if (ObjectUtil.isNotEmpty(user)) {
             consumerWallet = consumerWalletService.getOne(new LambdaQueryWrapper<ConsumerWallet>().eq(ConsumerWallet::getConsumerId, user.getId()));
             consumerMember = consumerMemberService.getOne(new LambdaQueryWrapper<ConsumerMember>().eq(ConsumerMember::getConsumerId, user.getId()));
-            consumerMonthlyCard = consumerMonthlyCardService.getOne(new LambdaQueryWrapper<ConsumerMonthlyCard>().eq(ConsumerMonthlyCard::getConsumerId, user.getId()));
-            consumerSecondaryCardList = consumerSecondaryCardService.list(new LambdaQueryWrapper<ConsumerSecondaryCard>().eq(ConsumerSecondaryCard::getConsumerId, user.getId())
-                    .ne(ConsumerSecondaryCard::getNumber, YesNoEnum.no.getIndex())
-            );
+            consumerMonthlyCard = consumerMonthlyCardService.getOne(new LambdaQueryWrapper<ConsumerMonthlyCard>().eq(ConsumerMonthlyCard::getId, request.getMonthlyCardId()));
+            consumerSecondaryCard = consumerSecondaryCardService.getOne(new LambdaQueryWrapper<ConsumerSecondaryCard>().eq(ConsumerSecondaryCard::getId, request.getSecondaryCardId()));
             if (ObjectUtil.isNotEmpty(consumerMember)) {
                 queryWrapper.eq(Activity::getIsOpen, YesNoEnum.yes.getIndex());
 //                if (consumerMember.getIsRights().equals(YesNoEnum.yes.getIndex())) {
@@ -2711,6 +2709,9 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme
                 priceResponse.setTotalFeeNow(payPrice);
                 request.setBuyType(BuyTypeEnum.TIME.getCode());
                 if (ObjectUtil.isNotEmpty(consumerMember)) {
+                    if (ObjectUtil.isNotEmpty(consumerMonthlyCard)) {
+                        totalFee = getBigDecimal(consumerMonthlyCard, timeLong, priceResponse, totalPrice, room, consumerMember);
+                    } else {
                         queryWrapper.eq(Activity::getLabelId, roomLabel.getLabelId());
                         activity = activityService.getOne(queryWrapper);
                         totalFee = getBigDecimal(request, activity, payPrice, user, consumerMember);
@@ -2721,9 +2722,8 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme
                         priceResponse.setDiscountRatio(priceResponse.getDiscount());
                         totalFee = getBigDecimal(consumerWallet, activity, timeLong, priceResponse, totalFee, room, request, consumerMember);
                     }
-                if (ObjectUtil.isNotEmpty(consumerMonthlyCard)) {
-                    totalFee = getBigDecimal(consumerMonthlyCard, timeLong, priceResponse, totalPrice, room);
                 }
+
             } else {
                 SPack byId = packService.getById(roomLabel.getPackId());
                 if (!ObjectUtils.isEmpty(byId) && byId.getIsOpen().equals(YesNoEnum.yes.getIndex())) {
@@ -2732,6 +2732,9 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme
                     priceResponse.setTotalFeeNow(payPrice);
                     request.setBuyType(BuyTypeEnum.PACK.getCode());
                     if (ObjectUtil.isNotEmpty(consumerMember)) {
+                        if (ObjectUtil.isNotEmpty(consumerSecondaryCard)) {
+                            totalFee = getBigDecimal(consumerSecondaryCard, priceResponse, byId, payPrice);
+                        } else {
                             queryWrapper.eq(Activity::getPackId, roomLabel.getPackId());
                             activity = activityService.getOne(queryWrapper);
                             totalFee = getBigDecimal(request, activity, payPrice, user, consumerMember);
@@ -2741,9 +2744,8 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme
                             priceResponse.setDiscountRatio(priceResponse.getDiscount());
                             totalFee = getBigDecimal(consumerWallet, activity, timeLong, priceResponse, totalFee, byId, request);
                         }
-                    if (CollectionUtils.isNotEmpty(consumerSecondaryCardList)) {
-                        totalFee = getBigDecimal(consumerSecondaryCardList, priceResponse, byId, payPrice);
                     }
+
 //                    if(ObjectUtil.isNotEmpty(consumerMonthlyCard)){
 //                        totalFee = getBigDecimal(consumerMonthlyCard,timeLong,priceResponse,totalFee,room);
 //                    }
@@ -2755,6 +2757,9 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme
                     priceResponse.setTotalFeeNow(payPrice);
                     request.setBuyType(BuyTypeEnum.TIME.getCode());
                     if (ObjectUtil.isNotEmpty(consumerMember)) {
+                        if (ObjectUtil.isNotEmpty(consumerMonthlyCard)) {
+                            totalFee = getBigDecimal(consumerMonthlyCard, timeLong, priceResponse, totalPrice, room, consumerMember);
+                        } else {
                             queryWrapper.eq(Activity::getLabelId, roomLabel.getLabelId());
                             activity = activityService.getOne(queryWrapper);
                             totalFee = getBigDecimal(request, activity, payPrice, user, consumerMember);
@@ -2764,8 +2769,6 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme
                             priceResponse.setDiscountRatio(priceResponse.getDiscount());
                             totalFee = getBigDecimal(consumerWallet, activity, timeLong, priceResponse, totalFee, room, request, consumerMember);
                         }
-                    if (ObjectUtil.isNotEmpty(consumerMonthlyCard)) {
-                        totalFee = getBigDecimal(consumerMonthlyCard, timeLong, priceResponse, totalPrice, room);
                     }
 //                    totalFee = getBigDecimal(consumerWallet, timeLong, priceResponse, totalFee, room);
 
@@ -2778,6 +2781,9 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme
             priceResponse.setTotalFeeNow(payPrice);
             request.setBuyType(BuyTypeEnum.PACK.getCode());
             if (ObjectUtil.isNotEmpty(consumerMember)) {
+                if (ObjectUtil.isNotEmpty(consumerSecondaryCard)) {
+                    totalFee = getBigDecimal(consumerSecondaryCard, priceResponse, byId, payPrice);
+                } else {
                     queryWrapper.eq(Activity::getPackId, request.getPackId());
                     activity = activityService.getOne(queryWrapper);
                     totalFee = getBigDecimal(request, activity, payPrice, user, consumerMember);
@@ -2787,10 +2793,7 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme
                     priceResponse.setDiscountRatio(priceResponse.getDiscount());
                     totalFee = getBigDecimal(consumerWallet, activity, timeLong, priceResponse, totalFee, byId, request);
                 }
-            if (CollectionUtils.isNotEmpty(consumerSecondaryCardList)) {
-                totalFee = getBigDecimal(consumerSecondaryCardList, priceResponse, byId, payPrice);
             }
-
         }
         priceResponse.setTotalFee(payPrice);
         if (ObjectUtil.isEmpty(consumerWallet) && totalFee.compareTo(new BigDecimal(0)) == 0) {
@@ -3121,7 +3124,10 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme
     }
 
     private BigDecimal getBigDecimal(ConsumerMonthlyCard consumerMonthlyCard, BigDecimal timeLong,
-                                     ComputedOrderPriceResponse priceResponse, BigDecimal totalFee, SRoom room) {
+                                     ComputedOrderPriceResponse priceResponse, BigDecimal totalFee, SRoom room, ConsumerMember consumerMember) {
+        MemberConfig memberConfig = memberConfigService.getOne(new LambdaQueryWrapper<MemberConfig>().eq(MemberConfig::getMembershipLevel, consumerMember.getMembershipLevel()));
+        priceResponse.setDiscountRatio(memberConfig.getDiscountRatio());
+        priceResponse.setTotalFee(totalFee);
         if (consumerMonthlyCard.getFreeDuration().compareTo(timeLong) >= 0) {
             priceResponse.setDuration(timeLong);
             priceResponse.setRemainingDuration(consumerMonthlyCard.getFreeDuration().subtract(timeLong));
@@ -3138,21 +3144,22 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme
             remainingBalance = totalFee.subtract(remainingBalance);
             priceResponse.setTotalFeeNow(remainingBalance);
             priceResponse.setMemberDiscount(totalFee.subtract(remainingBalance));
-            totalFee = remainingBalance;
+            totalFee = remainingBalance.multiply(memberConfig.getDiscountRatio()).divide(new BigDecimal(100));
+            ;
+            priceResponse.setTotalFeeNow(totalFee);
             priceResponse.setPayFee(remainingBalance);
             priceResponse.setMonthlyCardId(consumerMonthlyCard.getId());
+            priceResponse.setMemberDiscount(remainingBalance.subtract(totalFee));
         }
         return totalFee;
     }
 
-    private BigDecimal getBigDecimal(List<ConsumerSecondaryCard> consumerSecondaryCardList,
+    private BigDecimal getBigDecimal(ConsumerSecondaryCard consumerSecondaryCard,
                                      ComputedOrderPriceResponse priceResponse, SPack byId, BigDecimal payPrice) {
-        //获取集合中次数最少的次卡,次数不低于0
-        ConsumerSecondaryCard consumerSecondaryCard = consumerSecondaryCardList.stream().min(Comparator.comparing(ConsumerSecondaryCard::getNumber)).get();
         if (consumerSecondaryCard.getPackId().equals(byId.getId())) {
             priceResponse.setDiscount(BigDecimal.ZERO);
             priceResponse.setMemberDiscount(BigDecimal.ZERO);
-            priceResponse.setTotalFeeNow(payPrice);
+            priceResponse.setTotalFeeNow(BigDecimal.ZERO);
             priceResponse.setPayFee(BigDecimal.ZERO);
             priceResponse.setSecondaryCardId(consumerSecondaryCard.getId());
             payPrice = BigDecimal.ZERO;