From 446b8a728233121fa92cda1d6b09c44591732434 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 25 Aug 2022 17:17:02 +0800
Subject: [PATCH] 20220822
---
src/main/java/cc/mrbird/febs/pay/model/AgreeMentPaySmsDto.java | 7 +++++++
src/main/java/cc/mrbird/febs/pay/controller/UnipayController.java | 15 ++++++---------
2 files changed, 13 insertions(+), 9 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 4cbffb5..7a7f3e4 100644
--- a/src/main/java/cc/mrbird/febs/pay/controller/UnipayController.java
+++ b/src/main/java/cc/mrbird/febs/pay/controller/UnipayController.java
@@ -27,7 +27,6 @@
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;
@@ -37,7 +36,6 @@
import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
-import java.util.Map;
/**
* 平台公钥:MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCwSAEXsiC0IYha6a94imKq8VfOkk7WjDRAQWMBRnoKOZeEUeMrHYiblcrqeMYXGpV13288iUOkuyKwkPXkYXyIQK8emvJIbQOhtB5bSlAbodsPgncM9Ney1GFiz+7ogBxyt58mP8AA9UHtMw7u78zZoQ1+dUWwUUowVXml3Q0cVQIDAQAB
@@ -170,17 +168,16 @@
// String pay_success_time = jsonObject.get("pay_success_time").toString();
// System.out.println(orderNo +"222"+pay_success_time);
// }
- @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();
+
+ @PostMapping(value = "/agreeMentPayCallBack")
+ public String agreeMentPayCallBack(@RequestBody AgreeMentPayCallBackDto agreeMentPayCallBackDto){
+ log.info("进入汇聚支付协议支付回调"+ JSONUtil.parseObj(agreeMentPayCallBackDto));
+ String data = agreeMentPayCallBackDto.getData();
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.get("biz_code").toString();
+ String biz_code = agreeMentPayCallBackDto.getBiz_code();
log.info("进入汇聚支付协议支付回调"+orderNo+";"+pay_success_time+";"+biz_code+";"+jp_order_no);
if("JS000000".equals(biz_code) && StrUtil.isNotBlank(orderNo)){
diff --git a/src/main/java/cc/mrbird/febs/pay/model/AgreeMentPaySmsDto.java b/src/main/java/cc/mrbird/febs/pay/model/AgreeMentPaySmsDto.java
index 4dbf055..983db34 100644
--- a/src/main/java/cc/mrbird/febs/pay/model/AgreeMentPaySmsDto.java
+++ b/src/main/java/cc/mrbird/febs/pay/model/AgreeMentPaySmsDto.java
@@ -16,6 +16,13 @@
@ApiModelProperty(value = "订单号")
private String orderNo;
+ // 订单金额；金额保留两位小数
+ @ApiModelProperty(value = "订单号")
+ private BigDecimal orderAmount;
+ //创建时间
+// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "创建时间")
+ private String createdTime;
// 姓名
@ApiModelProperty(value = "姓名")
private String name;
--
Gitblit v1.9.1