Merge branch 'dev' into test

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

@@ -2844,7 +2844,9 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme
                             totalFee = priceResponse.getPayFee().subtract(consumerWallet.getBalance());
                         }
                         priceResponse.setPayFee(totalFee);
+                        if (totalFee.compareTo(BigDecimal.ZERO) > 0) {
                             priceResponse.setTotalFeeNow(totalFee);
+                        }
                         if (priceResponse.getPayFee().compareTo(BigDecimal.ZERO) > 0) {
                             BigDecimal payFee = priceResponse.getPayFee();
                             BigDecimal divide = priceResponse.getPayFee().multiply(memberConfig.getDiscountRatio()).divide(new BigDecimal(100), 2, RoundingMode.HALF_UP);