修改订单计算价格

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

@@ -1159,8 +1159,9 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme
                     }
                 }
             }
-            consumerMember.setMembershipProgress(membershipProgress);
+
             memberProgressLog.setVariableProgress(membershipProgress.subtract(consumerMember.getMembershipProgress()));
+            consumerMember.setMembershipProgress(membershipProgress);
                 memberProgressLog.setOperationType(YesNoEnum.yes.getIndex());
                 memberProgressLog.setOperationTime(new Date());
             memberProgressLog.setCreateTime(new Date());
@@ -2358,18 +2359,6 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme
                 priceResponse.setRemainingBalance(new BigDecimal(0));
                 priceResponse.setRemainingDuration(new BigDecimal(0));
                 if (priceResponse.getPayFee().compareTo(new BigDecimal(0)) > 0) {
-                    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);
-                    }
-
                     if (ObjectUtil.isNotEmpty(consumerMember)) {
                         MemberConfig memberConfig = memberConfigService.getOne(new LambdaQueryWrapper<MemberConfig>().eq(MemberConfig::getId, consumerMember.getMemberConfigId()));
                         //总金额乘以折扣比例除以100
@@ -2382,6 +2371,17 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme
                             priceResponse.setDiscountRatio(new BigDecimal(0));
                         }
                     }
+                    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.setDiscountFee(priceResponse.getTotalFee().subtract(priceResponse.getPayFee()));