From fc36aba9fc2df65861c65766fb8843277c3d6765 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 02 Sep 2022 17:14:49 +0800
Subject: [PATCH] 20220902
---
src/main/java/cc/mrbird/febs/pay/service/impl/UnipayServiceImpl.java | 3 ++-
src/main/java/cc/mrbird/febs/common/configure/WebMvcConfigure.java | 1 +
src/main/java/cc/mrbird/febs/pay/controller/UnipayController.java | 6 ++++--
3 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/common/configure/WebMvcConfigure.java b/src/main/java/cc/mrbird/febs/common/configure/WebMvcConfigure.java
index f37d47f..a1aeaf2 100644
--- a/src/main/java/cc/mrbird/febs/common/configure/WebMvcConfigure.java
+++ b/src/main/java/cc/mrbird/febs/common/configure/WebMvcConfigure.java
@@ -26,5 +26,6 @@
registration.excludePathPatterns("/api/member/cashOutSetting");
registration.excludePathPatterns("/api/unipay/unipayCallBack");
registration.excludePathPatterns("/api/unipay/agreeMentPayCallBack");
+ registration.excludePathPatterns("/api/unipay/singlePayCallBack");
}
}
diff --git a/src/main/java/cc/mrbird/febs/pay/controller/UnipayController.java b/src/main/java/cc/mrbird/febs/pay/controller/UnipayController.java
index 4a10555..1ec07bc 100644
--- a/src/main/java/cc/mrbird/febs/pay/controller/UnipayController.java
+++ b/src/main/java/cc/mrbird/febs/pay/controller/UnipayController.java
@@ -257,7 +257,7 @@
}
@PostMapping(value = "/singlePayCallBack")
- public SinglePayCallBackVo singlePayCallBack(@RequestBody SinglePayCallBackDto singlePayCallBackDto){
+ public JSONObject singlePayCallBack(@RequestBody SinglePayCallBackDto singlePayCallBackDto){
log.info("进入汇聚支付代付回调"+ JSONUtil.parseObj(singlePayCallBackDto));
String status = singlePayCallBackDto.getStatus();
BigDecimal paidAmount = singlePayCallBackDto.getPaidAmount();
@@ -284,10 +284,12 @@
}
}
}
+
SinglePayCallBackVo singlePayCallBackVo = new SinglePayCallBackVo();
singlePayCallBackVo.setStatusCode("2001");
singlePayCallBackVo.setMessage("成功");
- return singlePayCallBackVo;
+ JSONObject jsonObject = JSONUtil.parseObj(singlePayCallBackVo);
+ return jsonObject;
}
}
diff --git a/src/main/java/cc/mrbird/febs/pay/service/impl/UnipayServiceImpl.java b/src/main/java/cc/mrbird/febs/pay/service/impl/UnipayServiceImpl.java
index d2a4e29..741115f 100644
--- a/src/main/java/cc/mrbird/febs/pay/service/impl/UnipayServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/pay/service/impl/UnipayServiceImpl.java
@@ -48,6 +48,7 @@
public static final String MD5KEY = "2e95f6a3e11e47fa8a4386d6aefe1735";
public static final String notifyUrl = "http://47.111.90.145:8800/api/unipay/unipayCallBack";
public static final String agreementPayNotifyUrl = "http://47.111.90.145:8800/api/unipay/agreeMentPayCallBack";
+ public static final String singlePayNotifyUrl = "http://47.111.90.145:8800/api/unipay/singlePayCallBack";
public static final String p1MerchantNo = "888118000001971";/** 商户编号 */
public static final String aesKey = "1234567891234567";/** 商户编号 */
@@ -253,7 +254,7 @@
map.put("isChecked", singlePayDto.getIsChecked());//是否复核
map.put("paidDesc", singlePayDto.getPaidDesc());//代付说明
map.put("paidUse", singlePayDto.getPaidUse());//代付用途
-// map.put("callbackUrl", singlePayDto.getCallbackUrl());//商户通知地址
+ map.put("callbackUrl", singlePayNotifyUrl);//商户通知地址
String reqSign = getRequestSign(map);
// 签名
--
Gitblit v1.9.1