查询会员钱包列表

jsowell-admin/src/main/java/com/jsowell/api/uniapp/MemberController.java

@@ -17,6 +17,7 @@ import com.jsowell.pile.domain.MemberPlateNumberRelation;
 import com.jsowell.pile.dto.*;
 import com.jsowell.pile.service.IMemberBasicInfoService;
 import com.jsowell.pile.service.IMemberPlateNumberRelationService;
+import com.jsowell.pile.vo.base.MemberWalletVO;
 import com.jsowell.pile.vo.uniapp.InvoiceTitleVO;
 import com.jsowell.pile.vo.uniapp.MemberVO;
 import com.jsowell.pile.vo.uniapp.MemberWalletInfoVO;
@@ -483,4 +484,26 @@ public class MemberController extends BaseController {
 		logger.info("查询会员发票抬头列表 result:{}", response);
 		return response;
 	}
+
+	/**
+	 * 查询会员钱包列表
+	 * http://localhost:8080/uniapp/member/queryMemberWalletList
+	 */
+	@GetMapping("/queryMemberWalletList")
+	public RestApiResponse<?> queryMemberWalletList(HttpServletRequest request) {
+		RestApiResponse<?> response = null;
+		try {
+			String memberId = getMemberIdByAuthorization(request);
+			List<MemberWalletVO> list = memberService.queryMemberWalletList(memberId);
+			response = new RestApiResponse<>(ImmutableMap.of("list", list));
+		} catch (BusinessException e) {
+			logger.error("查询会员钱包列表 error", e);
+			response = new RestApiResponse<>(e.getCode(), e.getMessage());
+		} catch (Exception e) {
+			logger.error("查询会员钱包列表 error", e);
+			response = new RestApiResponse<>(e);
+		}
+		logger.info("查询会员钱包列表 result:{}", response);
+		return response;
+	}
 }

jsowell-admin/src/main/java/com/jsowell/service/MemberService.java

@@ -37,6 +37,7 @@ import com.jsowell.pile.dto.*;
 import com.jsowell.pile.service.*;
 import com.jsowell.pile.transaction.dto.MemberTransactionDTO;
 import com.jsowell.pile.transaction.service.TransactionService;
+import com.jsowell.pile.vo.base.MemberWalletVO;
 import com.jsowell.pile.vo.uniapp.*;
 import com.jsowell.wxpay.service.WxAppletRemoteService;
 import org.apache.commons.collections4.CollectionUtils;
@@ -689,4 +690,8 @@ public class MemberService {
 			}
 		}
 	}
+
+	public List<MemberWalletVO> queryMemberWalletList(String memberId) {
+		return memberWalletInfoService.selectByMemberWalletList(memberId);
+	}
 }

jsowell-admin/src/main/java/com/jsowell/web/controller/pile/MemberBasicInfoController.java

@@ -170,6 +170,10 @@ public class MemberBasicInfoController extends BaseController {
         return ajaxResult;
     }
 
+    /**
+     * 查询会员钱包列表
+     */
+
     /**
      * 查询会员钱包流水
      * http://localhost:8080/member/info/queryMemberBalanceChanges

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

@@ -7,6 +7,7 @@ import com.jsowell.common.constant.CacheConstants;
 import com.jsowell.common.constant.Constants;
 import com.jsowell.common.core.redis.RedisCache;
 import com.jsowell.common.enums.MemberWalletEnum;
+import com.jsowell.common.exception.BusinessException;
 import com.jsowell.common.util.DateUtils;
 import com.jsowell.common.util.StringUtils;
 import com.jsowell.common.util.id.IdUtils;
@@ -217,7 +218,7 @@ public class MemberBasicInfoServiceImpl implements IMemberBasicInfoService {
 			newPrincipalBalance = oldPrincipalBalance.add(updatePrincipalBalance);
 			if (newPrincipalBalance.compareTo(BigDecimal.ZERO) < 0) {
 				log.warn("变更后本金余额不能为负数");
-				return 0;
+				throw new BusinessException("", "变更后本金余额不能为负数");
 			}
 			// 记流水
 			logList.add(MemberWalletLog.builder()