From f33a410f4d65b200083c3a4b97d51c10ac38bbd9 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 26 Aug 2022 18:13:08 +0800
Subject: [PATCH] 20220822
---
src/main/java/cc/mrbird/febs/pay/controller/UnipayController.java | 25 +++++++++++++------------
1 files changed, 13 insertions(+), 12 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..4e1bcda 100644
--- a/src/main/java/cc/mrbird/febs/pay/controller/UnipayController.java
+++ b/src/main/java/cc/mrbird/febs/pay/controller/UnipayController.java
@@ -27,8 +27,9 @@
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.Api;
import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -37,7 +38,6 @@
import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
-import java.util.Map;
/**
* 平台公钥:MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCwSAEXsiC0IYha6a94imKq8VfOkk7WjDRAQWMBRnoKOZeEUeMrHYiblcrqeMYXGpV13288iUOkuyKwkPXkYXyIQK8emvJIbQOhtB5bSlAbodsPgncM9Ney1GFiz+7ogBxyt58mP8AA9UHtMw7u78zZoQ1+dUWwUUowVXml3Q0cVQIDAQAB
@@ -45,6 +45,8 @@
@Slf4j
@RestController
@RequestMapping(value = "/api/unipay")
+@RequiredArgsConstructor
+@Api(value = "ApiMallMemberController", tags = "支付接口类")
public class UnipayController {
@Autowired
@@ -156,10 +158,10 @@
@PostMapping(value = "getAgreeMentPaySms")
public FebsResponse getAgreeMentPaySms(@RequestBody AgreeMentPaySmsDto agreeMentPaySmsDto) {
String agreeMentPaySms = unipayService.getAgreeMentPaySms(agreeMentPaySmsDto);
- if("fail".equals(agreeMentPaySms)){
- return new FebsResponse().fail().message("获取失败");
- }else{
+ if("JS000000".equals(agreeMentPaySms)){
return new FebsResponse().success().message("获取成功");
+ }else{
+ return new FebsResponse().fail().message(agreeMentPaySms);
}
}
@@ -170,17 +172,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)){
--
Gitblit v1.9.1