修改会员日计算

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

@@ -1347,9 +1347,9 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme
         order.setDuration(priceResponse.getDuration());
         order.setDiscountRatio(priceResponse.getDiscountRatio());
         if (priceResponse.getPayFee().compareTo(order.getPayPrice()) != 0
-//                || priceResponse.getDuration().compareTo(request.getDuration()) !=0
-//                || priceResponse.getBalance().compareTo(request.getBalance()) !=0
-//                || priceResponse.getDiscountRatio().compareTo(request.getDiscountRatio()) !=0
+                && priceResponse.getDuration().compareTo(request.getDuration()) != 0
+                && priceResponse.getBalance().compareTo(request.getBalance()) != 0
+                && priceResponse.getDiscountRatio().compareTo(request.getDiscountRatio()) != 0
         ) {
             throw new BaseException("订单金额异常！");
         }
@@ -2568,7 +2568,7 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme
                 queryWrapper.eq(SOrder::getConsumerId, user.getId());
                 queryWrapper.in(SOrder::getStatus, OrderStatusEnum.getValidOrderStatus());
                 queryWrapper.eq(SOrder::getPayStatus, YesNoEnum.yes.getIndex());
-                queryWrapper.gt(SOrder::getDiscountRatio, new BigDecimal(50));
+                queryWrapper.ge(SOrder::getDiscountRatio, new BigDecimal(50));
 //            queryWrapper.ne(SOrder::getPayPrice, new BigDecimal(0));
                 //预约结束时间大于等于今天的年月日
                 queryWrapper.ge(SOrder::getPreEndDate, DateUtils.parseDate(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, new Date())));