Merge branch 'dev' into test

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

@@ -2663,9 +2663,9 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme
         priceResponse.setDuration(BigDecimal.ZERO);
         priceResponse.setRemainingDuration(BigDecimal.ZERO);
         priceResponse.setAvailableDuration(BigDecimal.ZERO);
-        priceResponse.setDiscount(BigDecimal.ZERO);
+        priceResponse.setDiscount(new BigDecimal(100));
         priceResponse.setMemberDiscount(BigDecimal.ZERO);
-        priceResponse.setDiscountRatio(BigDecimal.ZERO);
+        priceResponse.setDiscountRatio(new BigDecimal(100));
         Activity activity = null;
         ConsumerMember consumerMember = null;
         ConsumerWallet consumerWallet = null;
@@ -2897,7 +2897,7 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme
                     }
 
                 } else {
-                    priceResponse.setDiscount(BigDecimal.ZERO);
+                    priceResponse.setDiscount(new BigDecimal(100));
                 }
             }
             priceResponse.setDiscountFee(priceResponse.getTotalFee().subtract(priceResponse.getPayFee()));