diff --git a/jsowell-admin/src/main/java/com/jsowell/service/MemberService.java b/jsowell-admin/src/main/java/com/jsowell/service/MemberService.java
index 53b5b8b67..0ec4e29b1 100644
--- a/jsowell-admin/src/main/java/com/jsowell/service/MemberService.java
+++ b/jsowell-admin/src/main/java/com/jsowell/service/MemberService.java
@@ -458,11 +458,11 @@ public class MemberService {
 		// 累计赠送金额
 		vo.setAccumulatedRechargeGift(memberWalletVO.getAccumulatedRechargeGift());
 
-		// 累计消费金额
-		vo.setTotalConsumption(memberWalletVO.getAccumulatedConsumptionAmount());
+		// 累计充值金额
+		vo.setAccumulatedRechargeAmount(memberWalletVO.getTotalRechargeAmount());
 
-		// 总充值
-		vo.setTotalRechargeAmount(memberWalletVO.getTotalRechargeAmount());
+		// 累计消费金额
+		vo.setAccumulatedConsumptionAmount(memberWalletVO.getAccumulatedConsumptionAmount());
 
 		// 根据日期查询会员钱包变动明细  分页
 		// 获取分页信息
@@ -485,19 +485,19 @@ public class MemberService {
 		List<MemberWalletLogVO> list = memberBasicInfoService.getMemberWalletDetail(dto);
 
 		// 总支出
-		// BigDecimal totalConsumption = list.stream()
-		// 		.map(MemberWalletLogVO::getOrderAmount)
-		// 		.filter(Objects::nonNull)
-		// 		.reduce(BigDecimal.ZERO, BigDecimal::add);
-		// vo.setTotalConsumption(totalConsumption);
+		BigDecimal totalConsumption = list.stream()
+				.map(MemberWalletLogVO::getOrderAmount)
+				.filter(Objects::nonNull)
+				.reduce(BigDecimal.ZERO, BigDecimal::add);
+		vo.setTotalConsumption(totalConsumption);
 
 		// 总充值
-		// BigDecimal totalRechargeAmount = list.stream()
-		// 		.filter(x -> StringUtils.equals(x.getType(), "1"))
-		// 		.filter(x -> StringUtils.equals(x.getSubType(), "10") || StringUtils.equals(x.getSubType(), "11"))
-		// 		.map(MemberWalletLogVO::getAmount)
-		// 		.reduce(BigDecimal.ZERO, BigDecimal::add);
-		// vo.setTotalRechargeAmount(totalRechargeAmount);
+		BigDecimal totalRechargeAmount = list.stream()
+				.filter(x -> StringUtils.equals(x.getType(), "1"))
+				.filter(x -> StringUtils.equals(x.getSubType(), "10") || StringUtils.equals(x.getSubType(), "11"))
+				.map(MemberWalletLogVO::getAmount)
+				.reduce(BigDecimal.ZERO, BigDecimal::add);
+		vo.setTotalRechargeAmount(totalRechargeAmount);
 
 		// PageInfo<MemberWalletLogVO> pageInfo = new PageInfo<>(list);
 		// 获取 type 和 subType 的对应信息
diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/customer/MemberWalletInfoVO.java b/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/customer/MemberWalletInfoVO.java
index bfeea06a7..d6268d6b9 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/customer/MemberWalletInfoVO.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/customer/MemberWalletInfoVO.java
@@ -43,10 +43,15 @@ public class MemberWalletInfoVO {
      */
     private BigDecimal accumulatedRechargeGift;
 
+    /**
+     * 累计充值金额(累计充值本金+累计赠送金额)
+     */
+    private BigDecimal accumulatedRechargeAmount;
+
     /**
      * 累计消费
      */
-    // private BigDecimal accumulatedConsumptionAmount;
+    private BigDecimal accumulatedConsumptionAmount;
 
     /**
      * 总充值金额