From 3a76fc63a31b12b8c4e9e3fcea82aba46780d70b Mon Sep 17 00:00:00 2001
From: "autumn.g@foxmail.com" <autumn.g@foxmail.com>
Date: Fri, 11 Aug 2023 17:44:01 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=A0=E6=B3=A8=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/jsowell/api/uniapp/PayController.java | 73 +++++++++----------
 1 file changed, 35 insertions(+), 38 deletions(-)

diff --git a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/PayController.java b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/PayController.java
index b1b55dfdd..4c4d9b1e6 100644
--- a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/PayController.java
+++ b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/PayController.java
@@ -48,7 +48,7 @@ public class PayController extends BaseController {
 	private RedisCache redisCache;
 
 	/**
-	 * 充值余额支付
+	 * 充值余额支付/微信余额充值
 	 * 提供给小程序使用
 	 * http://localhost:8080/uniapp/pay/weixinPay
 	 */
@@ -92,40 +92,6 @@ public class PayController extends BaseController {
 		return response;
 	}
 
-
-	/**
-	 * 汇付充值余额
-	 * 会员充值余额 汇付
-	 * http://localhost:8080/uniapp/pay/rechargeBalance
-	 */
-	@PostMapping("/rechargeBalance")
-	public RestApiResponse<?> rechargeBalance(HttpServletRequest request, @RequestBody WeixinPayDTO dto) {
-		logger.info("adapay会员充值余额 param:{}", dto.toString());
-		RestApiResponse<?> response;
-		try {
-			if (StringUtils.isBlank(dto.getCode()) || StringUtils.isBlank(dto.getAmount())) {
-				return new RestApiResponse<>(ReturnCodeEnum.CODE_PARAM_NOT_NULL_ERROR);
-			}
-			// 鉴权
-			String memberId = getMemberIdByAuthorization(request);
-			if (StringUtils.isBlank(memberId)) {
-				throw new BusinessException(ReturnCodeEnum.CODE_TOKEN_ERROR);
-			}
-			dto.setMemberId(memberId);
-			String openId = memberService.getOpenIdByCode(dto.getCode());
-			if (StringUtils.isBlank(openId)) {
-				throw new BusinessException(ReturnCodeEnum.CODE_GET_OPEN_ID_BY_CODE_ERROR);
-			}
-			dto.setOpenId(openId);
-			// 充值余额 附加参数
-			Map<String, Object> weixinMap = memberService.rechargeBalanceWithAdapay(dto);
-			response = new RestApiResponse<>(ImmutableMap.of("weixinMap", weixinMap));
-		} catch (Exception e) {
-			response = new RestApiResponse<>();
-		}
-		return response;
-	}
-
 	/**
 	 * 7002 支付订单
 	 * http://localhost:8080/uniapp/pay/payOrder
@@ -242,7 +208,7 @@ public class PayController extends BaseController {
 	}
 
 	/**
-	 * 微信退款接口
+	 * 微信退款接口/微信余额退款
 	 * https://api.jsowellcloud.com/uniapp/pay/refund
 	 */
 	@PostMapping("/refund")
@@ -271,8 +237,39 @@ public class PayController extends BaseController {
 	}
 
 	/**
-	 * 汇付支付退款
-	 * 用户余额退款
+	 * 汇付充值余额/会员充值余额/汇付余额充值
+	 * http://localhost:8080/uniapp/pay/rechargeBalance
+	 */
+	@PostMapping("/rechargeBalance")
+	public RestApiResponse<?> rechargeBalance(HttpServletRequest request, @RequestBody WeixinPayDTO dto) {
+		logger.info("adapay会员充值余额 param:{}", dto.toString());
+		RestApiResponse<?> response;
+		try {
+			if (StringUtils.isBlank(dto.getCode()) || StringUtils.isBlank(dto.getAmount())) {
+				return new RestApiResponse<>(ReturnCodeEnum.CODE_PARAM_NOT_NULL_ERROR);
+			}
+			// 鉴权
+			String memberId = getMemberIdByAuthorization(request);
+			if (StringUtils.isBlank(memberId)) {
+				throw new BusinessException(ReturnCodeEnum.CODE_TOKEN_ERROR);
+			}
+			dto.setMemberId(memberId);
+			String openId = memberService.getOpenIdByCode(dto.getCode());
+			if (StringUtils.isBlank(openId)) {
+				throw new BusinessException(ReturnCodeEnum.CODE_GET_OPEN_ID_BY_CODE_ERROR);
+			}
+			dto.setOpenId(openId);
+			// 充值余额 附加参数
+			Map<String, Object> weixinMap = memberService.rechargeBalanceWithAdapay(dto);
+			response = new RestApiResponse<>(ImmutableMap.of("weixinMap", weixinMap));
+		} catch (Exception e) {
+			response = new RestApiResponse<>();
+		}
+		return response;
+	}
+
+	/**
+	 * 汇付支付退款/用户余额退款/汇付余额退款
 	 * https://api.jsowellcloud.com/uniapp/pay/refundBalance
 	 */
 	@PostMapping("/refundBalance")