From 30f13db308bb6c050a4aa44e10ae993dc4fb3bb4 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 02 Sep 2022 16:09:45 +0800
Subject: [PATCH] 20220822
---
src/main/java/cc/mrbird/febs/pay/controller/UnipayController.java | 94 +++++++++++++++++++++++++++--------------------
1 files changed, 54 insertions(+), 40 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..d7779f7 100644
--- a/src/main/java/cc/mrbird/febs/pay/controller/UnipayController.java
+++ b/src/main/java/cc/mrbird/febs/pay/controller/UnipayController.java
@@ -5,18 +5,18 @@
import cc.mrbird.febs.common.enumerates.FlowTypeEnum;
import cc.mrbird.febs.common.enumerates.MoneyFlowTypeEnum;
import cc.mrbird.febs.common.enumerates.OrderStatusEnum;
+import cc.mrbird.febs.common.exception.FebsException;
+import cc.mrbird.febs.common.utils.LoginUserUtil;
import cc.mrbird.febs.mall.dto.RegisterAppealDto;
import cc.mrbird.febs.mall.entity.*;
-import cc.mrbird.febs.mall.mapper.MallGoodsMapper;
-import cc.mrbird.febs.mall.mapper.MallGoodsSkuMapper;
-import cc.mrbird.febs.mall.mapper.MallMemberMapper;
-import cc.mrbird.febs.mall.mapper.MallOrderInfoMapper;
+import cc.mrbird.febs.mall.mapper.*;
import cc.mrbird.febs.mall.service.IApiMallMemberService;
import cc.mrbird.febs.mall.service.IApiMallMemberWalletService;
import cc.mrbird.febs.mall.service.IMallAchieveService;
import cc.mrbird.febs.mall.service.IMallMoneyFlowService;
import cc.mrbird.febs.pay.model.AgreeMentPayCallBackDto;
import cc.mrbird.febs.pay.model.AgreeMentPaySmsDto;
+import cc.mrbird.febs.pay.model.AgreementSignDto;
import cc.mrbird.febs.pay.model.UniPayCallBackDto;
import cc.mrbird.febs.pay.service.UnipayService;
import cc.mrbird.febs.pay.util.JsonUtil;
@@ -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
@@ -69,6 +71,10 @@
private MallMemberMapper memberMapper;
@Autowired
private UnipayService unipayService;
+ @Autowired
+ private MallMemberBankMapper mallMemberBankMapper;
+ @Autowired
+ private MallMemberBankSignMapper mallMemberBankSignMapper;
@GetMapping(value = "/unipayCallBack")
public String unipayCallBack(HttpServletRequest request, UniPayCallBackDto uniPayCallBackDto){
@@ -135,52 +141,60 @@
return "success";
}
-// public static void main(String[] args) {
-// String output = "https://www.baidu.com?r1_MerchantNo=888000000000000&r2_OrderNo=2020100000000000000&r3_Amount=10.00&r4_Cur=1&r5_Mp=goods&r6_Status=100&r7_TrxNo=100220100000000000&r8_BankOrderNo=100220100000000000&r9_BankTrxNo=4200000000202000000000000000&ra_PayTime=2022-08-11%2B16%253A14%253A39&rb_DealTime=2022-08-11%2B16%253A14%253A39&rc_BankCode=WEIXI_GZH&hmac=14c3819b5cc7bb80635901934f76c7a4";
-// String params = StrUtil.subAfter(output, "?", true);
-// System.out.println(params);
-// List<String> paramStrList = StrUtil.splitTrim(params, "&");
-// String orderNo = "";
-// if(CollUtil.isNotEmpty(paramStrList)){
-// for(String paramStr :paramStrList){
-// boolean r2_orderNo = paramStr.startsWith("r2_OrderNo");
-// if(r2_orderNo){
-// orderNo = StrUtil.subAfter(paramStr, "=", true);
-// }
-// }
-// }
-// System.out.println(orderNo);
-// }
-
@ApiOperation(value = "获取协议支付签约短信", notes = "获取协议支付签约短信")
@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);
}
}
-// public static void main(String[] args) {
-// String data = "{\\\"bank_trx_no\\\":\\\"0825144603229910\\\",\\\"jp_order_no\\\":\\\"100120220825446322447537651712\\\",\\\"mch_order_no\\\":\\\"2022082514435329133\\\",\\\"order_amount\\\":0.10,\\\"order_desc\\\":\\\"测试\\\",\\\"order_status\\\":\\\"P1000\\\",\\\"pay_success_time\\\":\\\"2022-08-25 14:46:04\\\"}";
-// JSONObject jsonObject = JSONUtil.parseObj(data);
-// String orderNo = jsonObject.get("mch_order_no").toString();
-// 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();
+ @ApiOperation(value = "协议支付签约短信签约", notes = "协议支付签约短信签约")
+ @PostMapping(value = "agreeMentPaySmsSign")
+ public FebsResponse agreeMentPaySmsSign(@RequestBody AgreementSignDto agreementSignDto) {
+ String agreeMentPaySms = unipayService.agreementSign(agreementSignDto);
+ if("fail".equals(agreeMentPaySms)){
+ return new FebsResponse().fail().message("签约失败，请重新下单");
+ }else{
+ JSONObject jsonObject = JSONUtil.parseObj(agreeMentPaySms);
+ String resultStr = (String) jsonObject.get("biz_code");
+ String signData = (String) jsonObject.get("data");
+ String signBizMsg = (String) jsonObject.get("biz_msg");
+ if(StrUtil.isNotBlank(signData)){
+ JSONObject signDatajsonObject = JSONUtil.parseObj(signData);
+ String err_msg = (String) signDatajsonObject.get("err_msg");
+ if(ObjectUtil.isNotNull(signDatajsonObject.get("err_code"))){
+ return new FebsResponse().fail().message(err_msg+"签约失败，请重新下单");
+ }
+ }
+ if(!"JS000000".equals(resultStr)){
+ return new FebsResponse().fail().message(signBizMsg+"签约失败，请重新下单");
+ }else{
+ MallMember member = LoginUserUtil.getLoginUser();
+ Long bankId = agreementSignDto.getBankId();
+ MallMemberBank mallMemberBank = mallMemberBankMapper.selectById(bankId);
+ String bankNo = mallMemberBank.getBankNo();
+ MallMemberBankSign mallMemberBankSign = new MallMemberBankSign();
+ mallMemberBankSign.setMemberId(member.getId());
+ mallMemberBankSign.setBankCardNo(bankNo);
+ mallMemberBankSignMapper.insert(mallMemberBankSign);
+ return new FebsResponse().success().message(signBizMsg);
+ }
+ }
+ }
+
+ @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