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 | 37 ++++++-------------------------------
1 files changed, 6 insertions(+), 31 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 771ac7f..d7779f7 100644
--- a/src/main/java/cc/mrbird/febs/pay/controller/UnipayController.java
+++ b/src/main/java/cc/mrbird/febs/pay/controller/UnipayController.java
@@ -141,23 +141,6 @@
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) {
@@ -180,16 +163,16 @@
String resultStr = (String) jsonObject.get("biz_code");
String signData = (String) jsonObject.get("data");
String signBizMsg = (String) jsonObject.get("biz_msg");
-
- 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(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);
@@ -202,14 +185,6 @@
}
}
}
-
-// 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);
-// }
@PostMapping(value = "/agreeMentPayCallBack")
public String agreeMentPayCallBack(@RequestBody AgreeMentPayCallBackDto agreeMentPayCallBackDto){
--
Gitblit v1.9.1