会员日活动判断只判断开始时间

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

@@ -2599,8 +2599,9 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme
                 Cron cron = cronParser.parse(activity.getCronExpression());
                 ExecutionTime executionTime = ExecutionTime.forCron(cron);
                 boolean match = executionTime.isMatch(ZonedDateTime.ofInstant(request.getPreStartDate().toInstant(), ZoneId.systemDefault()));
-                boolean match1 = executionTime.isMatch(ZonedDateTime.ofInstant(request.getPreEndDate().toInstant(), ZoneId.systemDefault()));
-                if (match && match1 && priceResponse.getDiscount().compareTo(activity.getDiscountRatio()) == 0) {
+//                boolean match1 = executionTime.isMatch(ZonedDateTime.ofInstant(request.getPreEndDate().toInstant(), ZoneId.systemDefault()));
+//                if (match && match1 && priceResponse.getDiscount().compareTo(activity.getDiscountRatio()) == 0) {
+                if (match && priceResponse.getDiscount().compareTo(activity.getDiscountRatio()) == 0) {
                     if (consumerWallet.getBalance().compareTo(totalFee) >= 0) {
                         priceResponse.setBalance(totalFee);
                         priceResponse.setRemainingBalance(consumerWallet.getBalance().subtract(totalFee));
@@ -2688,8 +2689,9 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme
                 Cron cron = cronParser.parse(activity.getCronExpression());
                 ExecutionTime executionTime = ExecutionTime.forCron(cron);
                 boolean match = executionTime.isMatch(ZonedDateTime.ofInstant(request.getPreStartDate().toInstant(), ZoneId.systemDefault()));
-                boolean match1 = executionTime.isMatch(ZonedDateTime.ofInstant(request.getPreEndDate().toInstant(), ZoneId.systemDefault()));
-                if (match && match1 && priceResponse.getDiscount().compareTo(activity.getDiscountRatio()) == 0) {
+//                boolean match1 = executionTime.isMatch(ZonedDateTime.ofInstant(request.getPreEndDate().toInstant(), ZoneId.systemDefault()));
+//                if (match && match1 && priceResponse.getDiscount().compareTo(activity.getDiscountRatio()) == 0) {
+                if (match && priceResponse.getDiscount().compareTo(activity.getDiscountRatio()) == 0) {
                     if (consumerWallet.getBalance().compareTo(totalFee) >= 0) {
                         priceResponse.setTotalFeeNow(totalFee);
                         priceResponse.setMemberDiscount(totalFee);
@@ -2771,8 +2773,9 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme
                 List<SOrder> orderList = list(queryWrapper);
                 if (CollectionUtils.isEmpty(orderList)) {
                     boolean match = executionTime.isMatch(ZonedDateTime.ofInstant(request.getPreStartDate().toInstant(), ZoneId.systemDefault()));
-                    boolean match1 = executionTime.isMatch(ZonedDateTime.ofInstant(request.getPreEndDate().toInstant(), ZoneId.systemDefault()));
-                    if (match && match1) {
+//                    boolean match1 = executionTime.isMatch(ZonedDateTime.ofInstant(request.getPreEndDate().toInstant(), ZoneId.systemDefault()));
+//                    if (match && match1) {
+                    if (match) {
                         payPrice = payPrice.multiply(activity.getDiscountRatio()).divide(new BigDecimal(100), 2, RoundingMode.HALF_UP);
                     } else {
 
@@ -2782,8 +2785,9 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme
                     AtomicInteger i = new AtomicInteger();
                     orderList.stream().forEach(item -> {
                         boolean match = executionTime.isMatch(ZonedDateTime.ofInstant(item.getPreStartDate().toInstant(), ZoneId.systemDefault()));
-                        boolean match1 = executionTime.isMatch(ZonedDateTime.ofInstant(item.getPreEndDate().toInstant(), ZoneId.systemDefault()));
-                        if (match && match1
+//                        boolean match1 = executionTime.isMatch(ZonedDateTime.ofInstant(item.getPreEndDate().toInstant(), ZoneId.systemDefault()));
+//                        if (match && match1
+                        if (match
                                 && item.getDuration().compareTo(BigDecimal.ZERO) == 0
                                 && (item.getPayPrice().add(item.getBalance())).divide(item.getTotalPrice(), 2, RoundingMode.HALF_UP)
                                 .multiply(new BigDecimal(100)).compareTo(activity.getDiscountRatio()) == 0
@@ -2793,8 +2797,9 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme
                     });
                     if (i.get() == 0) {
                         boolean match = executionTime.isMatch(ZonedDateTime.ofInstant(request.getPreStartDate().toInstant(), ZoneId.systemDefault()));
-                        boolean match1 = executionTime.isMatch(ZonedDateTime.ofInstant(request.getPreEndDate().toInstant(), ZoneId.systemDefault()));
-                        if (match && match1) {
+//                        boolean match1 = executionTime.isMatch(ZonedDateTime.ofInstant(request.getPreEndDate().toInstant(), ZoneId.systemDefault()));
+//                        if (match && match1) {
+                        if (match) {
                             payPrice = payPrice.multiply(activity.getDiscountRatio()).divide(new BigDecimal(100), 2, RoundingMode.HALF_UP);
                         } else {
                             payPrice = payPrice.multiply(memberConfig.getDiscountRatio()).divide(new BigDecimal(100), 2, RoundingMode.HALF_UP);