修改订单计算

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

@@ -2382,38 +2382,11 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme
         if (ObjectUtil.isNull(request.getCouponId()) || request.getCouponId() <= 0) {
             priceResponse.setCouponFee(BigDecimal.ZERO);
             priceResponse.setDiscountFee(priceResponse.getTotalFee().subtract(priceResponse.getPayFee()));
-            if (priceResponse.getTotalFee().compareTo(new BigDecimal(0)) == 0) {
-                priceResponse.setDiscountRatio(BigDecimal.ZERO);
-            } else {
-                priceResponse.setDiscountRatio(priceResponse.getDiscountFee().divide(priceResponse.getTotalFee(), 2, RoundingMode.HALF_UP).multiply(new BigDecimal(100)));
-            }
-//            CronParser cronParser = new CronParser(CronDefinitionBuilder.instanceDefinitionFor(CronType.QUARTZ));
-//            if (ObjectUtil.isNotEmpty(activity)) {
-//                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 (ObjectUtil.isNotEmpty(consumerMember) && !match && !match1) {
-//                    MemberConfig memberConfig = memberConfigService.getOne(new LambdaQueryWrapper<MemberConfig>().eq(MemberConfig::getId, consumerMember.getMemberConfigId()));
-//                    //总金额乘以折扣比例除以100
-//                    priceResponse.setPayFee(priceResponse.getPayFee().multiply(memberConfig.getDiscountRatio()).divide(new BigDecimal(100)));
-////                    priceResponse.setCouponFee(priceResponse.getDiscountFee());
-//                }
+//            if (priceResponse.getTotalFee().compareTo(new BigDecimal(0)) == 0) {
+//                priceResponse.setDiscountRatio(BigDecimal.ZERO);
 //            } else {
-//                if (ObjectUtil.isNotEmpty(consumerMember)) {
-//                    MemberConfig memberConfig = memberConfigService.getOne(new LambdaQueryWrapper<MemberConfig>().eq(MemberConfig::getId, consumerMember.getMemberConfigId()));
-//                    //总金额乘以折扣比例除以100
-//                    priceResponse.setPayFee(priceResponse.getPayFee().multiply(memberConfig.getDiscountRatio()).divide(new BigDecimal(100)));
-//                    priceResponse.setDiscountFee(priceResponse.getTotalFee().subtract(priceResponse.getPayFee()));
-////                    priceResponse.setCouponFee(priceResponse.getDiscountFee());
-//                    if (ObjectUtil.isNotEmpty(priceResponse.getDiscountFee()) && priceResponse.getTotalFee().compareTo(new BigDecimal(0.00)) > 0) {
 //                priceResponse.setDiscountRatio(priceResponse.getDiscountFee().divide(priceResponse.getTotalFee(), 2, RoundingMode.HALF_UP).multiply(new BigDecimal(100)));
-//                    } else {
-//                        priceResponse.setDiscountRatio(new BigDecimal(0));
-//                    }
 //            }
-//            }
-            priceResponse.setDiscountFee(priceResponse.getTotalFee().subtract(priceResponse.getPayFee()));
             if (ObjectUtil.isNotEmpty(priceResponse.getDiscountFee()) && priceResponse.getTotalFee().compareTo(new BigDecimal(0.00)) > 0) {
                 priceResponse.setDiscountRatio(priceResponse.getDiscountFee().divide(priceResponse.getTotalFee(), 2, RoundingMode.HALF_UP).multiply(new BigDecimal(100)));
             } else {