Merge branch 'dev' into test

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

@@ -3136,6 +3136,7 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme
                                      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.setDiscount(memberConfig.getDiscountRatio());
         priceResponse.setTotalFee(totalFee);
         if (consumerMonthlyCard.getFreeDuration().compareTo(timeLong) >= 0) {
             priceResponse.setDuration(timeLong);