update 会员累计充值金额

jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberWalletInfoServiceImpl.java

@@ -95,12 +95,15 @@ public class MemberWalletInfoServiceImpl implements MemberWalletInfoService {
     @Override
     public MemberWalletVO selectMemberWalletInfo(String walletCode) {
         MemberWalletVO memberWalletVO = memberWalletInfoMapper.selectMemberWalletInfo(walletCode);
+        // 总充值金额 = 累计本金充值 + 累计赠送金额
+        memberWalletVO.setTotalRechargeAmount(memberWalletVO.getAccumulatedRechargePrincipal().add(memberWalletVO.getAccumulatedRechargeGift()));
+
         // 累计消费金额 = 累计充值 + 累计赠送 - 本金余额 - 赠送金余额
-        BigDecimal accumulatedConsumptionAmount = memberWalletVO.getAccumulatedRechargeAmount()
-                .add(memberWalletVO.getAccumulatedRechargeGift())
+        BigDecimal accumulatedConsumptionAmount = memberWalletVO.getTotalRechargeAmount()
                 .subtract(memberWalletVO.getPrincipalBalance())
                 .subtract(memberWalletVO.getGiftBalance());
         memberWalletVO.setAccumulatedConsumptionAmount(accumulatedConsumptionAmount);
+
         return memberWalletVO;
     }
 

jsowell-pile/src/main/java/com/jsowell/pile/vo/base/MemberWalletVO.java

@@ -46,13 +46,18 @@ public class MemberWalletVO {
     /**
      * 累计本金充值
      */
-    private BigDecimal accumulatedRechargeAmount;
+    private BigDecimal accumulatedRechargePrincipal;
 
     /**
      * 累计赠送金额
      */
     private BigDecimal accumulatedRechargeGift;
 
+    /**
+     * 总充值金额 = 累计本金充值 + 累计赠送金额
+     */
+    private BigDecimal totalRechargeAmount;
+
     /**
      * 累计消费
      */

jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/MemberWalletInfoVO.java

@@ -34,9 +34,9 @@ public class MemberWalletInfoVO {
     private BigDecimal giftBalance;
 
     /**
-     * 累计充值
+     * 累计充值本金
      */
-    private BigDecimal accumulatedRechargeAmount;
+    private BigDecimal accumulatedRechargePrincipal;
 
     /**
      * 累计赠送金额