From 98aa256f8bc920e0820e56ffb6fe1b6472bd05ac Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 25 Aug 2022 16:36:05 +0800
Subject: [PATCH] 20220822
---
src/main/java/cc/mrbird/febs/pay/controller/UnipayController.java | 24 ++++++++++++++++--------
1 files changed, 16 insertions(+), 8 deletions(-)
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 2a7eada..4cbffb5 100644
--- a/src/main/java/cc/mrbird/febs/pay/controller/UnipayController.java
+++ b/src/main/java/cc/mrbird/febs/pay/controller/UnipayController.java
@@ -27,6 +27,7 @@
import cn.hutool.core.util.StrUtil;
import cn.hutool.json.JSONObject;
import cn.hutool.json.JSONUtil;
+import com.ijpay.alipay.AliPayApi;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -36,6 +37,7 @@
import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
+import java.util.Map;
/**
* 平台公钥:MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCwSAEXsiC0IYha6a94imKq8VfOkk7WjDRAQWMBRnoKOZeEUeMrHYiblcrqeMYXGpV13288iUOkuyKwkPXkYXyIQK8emvJIbQOhtB5bSlAbodsPgncM9Ney1GFiz+7ogBxyt58mP8AA9UHtMw7u78zZoQ1+dUWwUUowVXml3Q0cVQIDAQAB
@@ -153,8 +155,12 @@
@ApiOperation(value = "获取协议支付签约短信", notes = "获取协议支付签约短信")
@PostMapping(value = "getAgreeMentPaySms")
public FebsResponse getAgreeMentPaySms(@RequestBody AgreeMentPaySmsDto agreeMentPaySmsDto) {
- unipayService.getAgreeMentPaySms(agreeMentPaySmsDto);
- return new FebsResponse().success().message("申请成功");
+ String agreeMentPaySms = unipayService.getAgreeMentPaySms(agreeMentPaySmsDto);
+ if("fail".equals(agreeMentPaySms)){
+ return new FebsResponse().fail().message("获取失败");
+ }else{
+ return new FebsResponse().success().message("获取成功");
+ }
}
// public static void main(String[] args) {
@@ -164,16 +170,17 @@
// String pay_success_time = jsonObject.get("pay_success_time").toString();
// System.out.println(orderNo +"222"+pay_success_time);
// }
-
- @PostMapping(value = "/agreeMentPayCallBack")
- public String agreeMentPayCallBack(@RequestBody AgreeMentPayCallBackDto agreeMentPayCallBackDto){
- log.info("进入汇聚支付协议支付回调"+ JSONUtil.parseObj(agreeMentPayCallBackDto));
- String data = agreeMentPayCallBackDto.getData();
+ @RequestMapping("/agreeMentPayCallBack")
+ public String agreeMentPayCallBack(HttpServletRequest request){
+ Map<String, String> params = AliPayApi.toMap(request);
+ log.info("进入汇聚支付协议支付回调"+ JSONUtil.parseObj(params));
+ JSONObject agreeMentPayCallBackDto = JSONUtil.parseObj(params);
+ String data = agreeMentPayCallBackDto.get("data").toString();
JSONObject jsonObject = JSONUtil.parseObj(data);
String orderNo = jsonObject.get("mch_order_no").toString();
String pay_success_time = jsonObject.get("pay_success_time").toString();
String jp_order_no = jsonObject.get("jp_order_no").toString();
- String biz_code = agreeMentPayCallBackDto.getBiz_code();
+ String biz_code = agreeMentPayCallBackDto.get("biz_code").toString();
log.info("进入汇聚支付协议支付回调"+orderNo+";"+pay_success_time+";"+biz_code+";"+jp_order_no);
if("JS000000".equals(biz_code) && StrUtil.isNotBlank(orderNo)){
@@ -186,6 +193,7 @@
orderInfo.setPayResult("1");
orderInfo.setPayTime(DateUtil.parse(pay_success_time));
orderInfo.setPayTradeNo(jp_order_no);
+ orderInfo.setPayOrderNo(orderNo);
orderInfoMapper.updateById(orderInfo);
boolean hasTc = false;
--
Gitblit v1.9.1