From 1cd9c7d770cd2ef0ef7e24e8a4e03ca535f7b6a4 Mon Sep 17 00:00:00 2001
From: "autumn.g@foxmail.com" <autumn.g@foxmail.com>
Date: Thu, 18 May 2023 16:25:48 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E6=B1=87=E4=BB=98=20=20=E5=85=85?=
 =?UTF-8?q?=E5=80=BC=E4=BC=9A=E5=91=98=E4=BD=99=E9=A2=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/jsowell/api/uniapp/PayController.java | 41 +++++--------------
 1 file changed, 10 insertions(+), 31 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 1add0b626..7882bbc7b 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
@@ -29,6 +29,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;
+import java.util.Enumeration;
 import java.util.List;
 import java.util.Map;
 
@@ -86,36 +87,7 @@ public class PayController extends BaseController {
 		return response;
 	}
 
-	/**
-	 * 会员充值余额
-	 */
-	@PostMapping("/rechargeBalance")
-	public RestApiResponse<?> rechargeBalance(HttpServletRequest request, @RequestBody WeixinPayDTO dto) {
-		logger.info("微信支付 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;
-	}
+	
 
 
 	/**
@@ -269,7 +241,14 @@ public class PayController extends BaseController {
 	 */
 	@PostMapping("/adapayCallback")
 	public void callback(HttpServletRequest request) {
-		logger.info("汇付支付回调 request:{}", JSONObject.toJSONString(request));
+		//获得所有头的名称
+		Enumeration<String> headerNames = request.getHeaderNames();
+		while(headerNames.hasMoreElements()) {//判断是否还有下一个元素
+			String nextElement = headerNames.nextElement();//获取headerNames集合中的请求头
+			String header2 = request.getHeader(nextElement);//通过请求头得到请求内容
+			logger.info("汇付支付回调 请求头=========={}, VALUE:{}", nextElement , header2);
+			//System.out.println(nextElement+":"+header2);
+		}
 		try {
 			//验签请参data
 			String data = request.getParameter("data");