From 0e7e1cfea951c7aee59a862c514e08a040523d9f Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 25 Oct 2023 16:12:29 +0800
Subject: [PATCH] 版本管理
---
src/main/java/cc/mrbird/febs/pay/controller/UnipayController.java | 98 +++++++++++++++++++++++++++++-------------------
1 files changed, 59 insertions(+), 39 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..49a2210 100644
--- a/src/main/java/cc/mrbird/febs/pay/controller/UnipayController.java
+++ b/src/main/java/cc/mrbird/febs/pay/controller/UnipayController.java
@@ -14,10 +14,7 @@
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.model.*;
import cc.mrbird.febs.pay.service.UnipayService;
import cc.mrbird.febs.pay.util.JsonUtil;
import cc.mrbird.febs.rabbit.producter.AgentProducer;
@@ -27,6 +24,7 @@
import cn.hutool.core.util.StrUtil;
import cn.hutool.json.JSONObject;
import cn.hutool.json.JSONUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
@@ -75,6 +73,12 @@
private MallMemberBankMapper mallMemberBankMapper;
@Autowired
private MallMemberBankSignMapper mallMemberBankSignMapper;
+ @Autowired
+ private MallMemberWithdrawMapper mallMemberWithdrawMapper;
+ @Autowired
+ private MallMoneyFlowMapper mallMoneyFlowMapper;
+
+ private final IApiMallMemberWalletService iApiMallMemberWalletService;
@GetMapping(value = "/unipayCallBack")
public String unipayCallBack(HttpServletRequest request, UniPayCallBackDto uniPayCallBackDto){
@@ -133,30 +137,11 @@
}
mallMoneyFlowService.addMoneyFlow(mallMember.getId(), orderInfo.getAmount().negate(), MoneyFlowTypeEnum.PAY.getValue(), orderInfo.getOrderNo(), FlowTypeEnum.BALANCE.getValue());
- agentProducer.sendAutoLevelUpMsg(mallMember.getId());
- agentProducer.sendOrderReturn(orderInfo.getId());
}
}
}
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")
@@ -180,16 +165,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 +187,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){
@@ -271,12 +248,55 @@
}
mallMoneyFlowService.addMoneyFlow(mallMember.getId(), orderInfo.getAmount().negate(), MoneyFlowTypeEnum.PAY.getValue(), orderInfo.getOrderNo(), FlowTypeEnum.BALANCE.getValue());
- agentProducer.sendAutoLevelUpMsg(mallMember.getId());
- agentProducer.sendOrderReturn(orderInfo.getId());
}
}
}
return "success";
}
+ @PostMapping(value = "/singlePayCallBack")
+ public JSONObject singlePayCallBack(@RequestBody SinglePayCallBackDto singlePayCallBackDto){
+ log.info("进入汇聚支付代付回调"+ JSONUtil.parseObj(singlePayCallBackDto));
+ String status = singlePayCallBackDto.getStatus();
+ BigDecimal paidAmount = singlePayCallBackDto.getPaidAmount();
+ BigDecimal paidAmountFee = singlePayCallBackDto.getFee();
+ String errorCode = singlePayCallBackDto.getErrorCode();
+ String errorCodeDesc = singlePayCallBackDto.getErrorCodeDesc();
+ String merchantOrderNo = singlePayCallBackDto.getMerchantOrderNo();
+
+ log.info("进入汇聚支付代付回调"+status+";"+paidAmount+";"+paidAmountFee+";");
+ if("205".equals(status) && "".equals(errorCode)){
+ QueryWrapper<MallMemberWithdraw> objectQueryWrapper = new QueryWrapper<>();
+ objectQueryWrapper.eq("withdraw_no",merchantOrderNo);
+ MallMemberWithdraw mallMemberWithdraw = mallMemberWithdrawMapper.selectOne(objectQueryWrapper);
+ if(ObjectUtil.isNotEmpty(mallMemberWithdraw)){
+ mallMemberWithdraw.setStatus(2);
+ mallMemberWithdrawMapper.updateById(mallMemberWithdraw);
+
+ QueryWrapper<MallMoneyFlow> flowQueryWrapper = new QueryWrapper<>();
+ flowQueryWrapper.eq("order_no",mallMemberWithdraw.getWithdrawNo());
+ flowQueryWrapper.eq("type",MoneyFlowTypeEnum.WITHDRAWAL.getValue());
+ MallMoneyFlow mallMoneyFlow = mallMoneyFlowMapper.selectOne(flowQueryWrapper);
+ if(ObjectUtil.isNotEmpty(mallMoneyFlow)){
+ mallMoneyFlow.setStatus(2);
+ mallMoneyFlowMapper.updateById(mallMoneyFlow);
+ }
+ }
+ }else{
+ QueryWrapper<MallMemberWithdraw> objectQueryWrapper = new QueryWrapper<>();
+ objectQueryWrapper.eq("withdraw_no",merchantOrderNo);
+ MallMemberWithdraw mallMemberWithdraw = mallMemberWithdrawMapper.selectOne(objectQueryWrapper);
+ if(ObjectUtil.isNotEmpty(mallMemberWithdraw)){
+ mallMemberWithdraw.setRemark(errorCodeDesc);
+ mallMemberWithdrawMapper.updateById(mallMemberWithdraw);
+ }
+ }
+
+ SinglePayCallBackVo singlePayCallBackVo = new SinglePayCallBackVo();
+ singlePayCallBackVo.setStatusCode("2001");
+ singlePayCallBackVo.setMessage("成功");
+ JSONObject jsonObject = JSONUtil.parseObj(singlePayCallBackVo);
+ return jsonObject;
+ }
+
}
--
Gitblit v1.9.1