From 1ddef753413655b4278a694b38d6b6b421a2473e Mon Sep 17 00:00:00 2001
From: "autumn.g@foxmail.com" <autumn.g@foxmail.com>
Date: Wed, 5 Jul 2023 15:42:44 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E6=96=B0=E5=9B=9E=E8=B0=83=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/jsowell/api/uniapp/PayController.java | 35 +++++++++++++++++++
 .../adapay/service/AdapayMemberService.java   |  3 ++
 2 files changed, 38 insertions(+)

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 ea959d33f..318802ce0 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
@@ -2,6 +2,8 @@ package com.jsowell.api.uniapp;
 
 import com.alibaba.fastjson2.JSONObject;
 import com.google.common.collect.ImmutableMap;
+import com.huifu.adapay.core.AdapayCore;
+import com.huifu.adapay.core.util.AdapaySign;
 import com.jsowell.common.annotation.Anonymous;
 import com.jsowell.common.core.controller.BaseController;
 import com.jsowell.common.core.redis.RedisCache;
@@ -33,6 +35,7 @@ import java.util.Map;
 /**
  * 支付相关controller
  */
+
 @Anonymous
 @RestController
 @RequestMapping("/uniapp/pay")
@@ -365,4 +368,36 @@ public class PayController extends BaseController {
 			logger.error("汇付支付退款回调失败 error", e);
 		}
 	}
+
+	/**
+	 * 回调接口
+	 * https://api.jsowellcloud.com/uniapp/pay/callbackAdapay
+	 * @param request
+	 */
+	@PostMapping("/callbackAdapay")
+	public void callback(HttpServletRequest request) {
+		try {
+			//验签请参data
+			String data = request.getParameter("data");
+			//验签请参sign
+			String sign = request.getParameter("sign");
+
+			String object = request.getParameter("object");
+			//验签标记
+			boolean checkSign;
+			//验签请参publicKey
+			String publicKey = AdapayCore.PUBLIC_KEY;
+			logger.info("新的汇付回调接口验签请参：data={}, sign={}, object:{}", data, sign, object);
+			//验签
+			checkSign = AdapaySign.verifySign(data, sign, publicKey);
+			if(checkSign){
+				//验签成功逻辑
+				System.out.println("成功返回数据data:"+data);
+			}else {
+				//验签失败逻辑
+			}
+		}catch (Exception e){
+			logger.info("异步回调开始，参数，request={}", JSONObject.toJSONString(request));
+		}
+	}
 }
diff --git a/jsowell-pile/src/main/java/com/jsowell/adapay/service/AdapayMemberService.java b/jsowell-pile/src/main/java/com/jsowell/adapay/service/AdapayMemberService.java
index c365ce414..60ae551c8 100644
--- a/jsowell-pile/src/main/java/com/jsowell/adapay/service/AdapayMemberService.java
+++ b/jsowell-pile/src/main/java/com/jsowell/adapay/service/AdapayMemberService.java
@@ -43,6 +43,8 @@ public class AdapayMemberService {
     @Value("${adapay.appId}")
     private String ADAPAY_APP_ID;
 
+    private final String CALLBACK_URL = "https://api.jsowellcloud.com/uniapp/pay/callbackAdapay";
+
     @Autowired
     private IAdapayMemberAccountService adapayMemberAccountService;
 
@@ -359,6 +361,7 @@ public class AdapayMemberService {
         memberParams.put("bank_acct_type", dto.getBankAcctType());
         memberParams.put("card_no", dto.getCardNo());
         memberParams.put("card_name", dto.getCardName());
+        memberParams.put("notify_url", CALLBACK_URL);
         File file = ZipUtil.createZipFileFromImages(dto.getImgList());
         log.info("创建企业账户param:{}", memberParams);
         Map<String, Object> member = CorpMember.create(memberParams, file);