Merge branch 'refs/heads/dev' into test

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

@@ -2488,6 +2488,8 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme
                         priceResponse.setMemberDiscount(totalFee);
                         totalFee = new BigDecimal(0);
                     } else if (consumerWallet.getBalance().compareTo(totalFee) < 0) {
+                        priceResponse.setTotalFeeNow(totalFee);
+                        priceResponse.setMemberDiscount(totalFee);
                         priceResponse.setBalance(consumerWallet.getBalance());
                         totalFee = totalFee.subtract(consumerWallet.getBalance());
                     }