修改使用优惠券和钱包的计算

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

@@ -1963,16 +1963,18 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme
                 priceResponse.setDuration(new BigDecimal(0));
                 priceResponse.setRemainingDuration(new BigDecimal(0));
                 if (priceResponse.getPayFee().compareTo(new BigDecimal(0)) > 0) {
-                    if (consumerWallet.getBalance().compareTo(priceResponse.getPayFee()) >= 0) {
-                        priceResponse.setBalance(priceResponse.getPayFee());
-                        priceResponse.setRemainingBalance(consumerWallet.getBalance().subtract(priceResponse.getPayFee()));
-                        totalFee = new BigDecimal(0);
-                    } else if (consumerWallet.getBalance().compareTo(priceResponse.getPayFee()) < 0) {
-                        priceResponse.setBalance(consumerWallet.getBalance());
-                        totalFee = priceResponse.getPayFee().subtract(consumerWallet.getBalance());
+                    if (ObjectUtil.isNotEmpty(consumerWallet)) {
+                        if (consumerWallet.getBalance().compareTo(priceResponse.getPayFee()) >= 0) {
+                            priceResponse.setBalance(priceResponse.getPayFee());
+                            priceResponse.setRemainingBalance(consumerWallet.getBalance().subtract(priceResponse.getPayFee()));
+                            totalFee = new BigDecimal(0);
+                        } else if (consumerWallet.getBalance().compareTo(priceResponse.getPayFee()) < 0) {
+                            priceResponse.setBalance(consumerWallet.getBalance());
+                            totalFee = priceResponse.getPayFee().subtract(consumerWallet.getBalance());
+                        }
+                        priceResponse.setPayFee(totalFee);
                     }
 
-                    priceResponse.setPayFee(totalFee);
                     if (ObjectUtil.isNotEmpty(consumerMember)) {
                         MemberConfig memberConfig = memberConfigService.getOne(new LambdaQueryWrapper<MemberConfig>().eq(MemberConfig::getId, consumerMember.getMemberConfigId()));
                         //总金额乘以折扣比例除以100