Merge branch 'refs/heads/dev' into test

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

@@ -2463,6 +2463,7 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme
                 priceResponse.setMemberDiscount(BigDecimal.ZERO);
                 priceResponse.setTotalFee(payPrice);
                 priceResponse.setTotalFeeNow(payPrice);
+                priceResponse.setDiscount(BigDecimal.ZERO);
                 SConsumerCoupon consumerCoupon = consumerCouponService.getById(request.getCouponId());
                 computedCouponPrice(request, priceResponse, user, consumerCoupon);
                 priceResponse.setDuration(new BigDecimal(0));
@@ -2706,7 +2707,8 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme
                         boolean match1 = executionTime.isMatch(ZonedDateTime.ofInstant(item.getPreEndDate().toInstant(), ZoneId.systemDefault()));
                         if (match && match1
                                 && 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
+                                && (item.getPayPrice().add(item.getBalance())).divide(item.getTotalPrice(), 2, RoundingMode.HALF_UP)
+                                .multiply(new BigDecimal(100)).compareTo(activity.getDiscountRatio()) == 0
                         ) {
                             i.getAndIncrement();
                         }