From 17d9a0bacd9389a913c6f6f51ae9a082f143c0fe Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Sat, 24 Sep 2022 10:54:18 +0800
Subject: [PATCH] 20220902
---
src/main/java/cc/mrbird/febs/mall/entity/MallMemberWithdraw.java | 2 ++
src/main/resources/templates/febs/views/modules/mallMember/chargeFlowList.html | 1 +
src/main/java/cc/mrbird/febs/mall/vo/AdminMoneyChargeListVo.java | 1 +
src/main/resources/mapper/modules/MallMoneyFlowMapper.xml | 1 +
src/main/java/cc/mrbird/febs/pay/controller/UnipayController.java | 11 +++++++++++
5 files changed, 16 insertions(+), 0 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/entity/MallMemberWithdraw.java b/src/main/java/cc/mrbird/febs/mall/entity/MallMemberWithdraw.java
index 0e664a4..aa9a6cd 100644
--- a/src/main/java/cc/mrbird/febs/mall/entity/MallMemberWithdraw.java
+++ b/src/main/java/cc/mrbird/febs/mall/entity/MallMemberWithdraw.java
@@ -30,4 +30,6 @@
private String name;
private String withdrawNo;
+
+ private String remark;
}
diff --git a/src/main/java/cc/mrbird/febs/mall/vo/AdminMoneyChargeListVo.java b/src/main/java/cc/mrbird/febs/mall/vo/AdminMoneyChargeListVo.java
index 05f261f..49df3af 100644
--- a/src/main/java/cc/mrbird/febs/mall/vo/AdminMoneyChargeListVo.java
+++ b/src/main/java/cc/mrbird/febs/mall/vo/AdminMoneyChargeListVo.java
@@ -29,4 +29,5 @@
private String phone;
private String bindPhone;
+ private String remark;
}
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 1ec07bc..e26ca2d 100644
--- a/src/main/java/cc/mrbird/febs/pay/controller/UnipayController.java
+++ b/src/main/java/cc/mrbird/febs/pay/controller/UnipayController.java
@@ -78,6 +78,8 @@
@Autowired
private MallMoneyFlowMapper mallMoneyFlowMapper;
+ private final IApiMallMemberWalletService iApiMallMemberWalletService;
+
@GetMapping(value = "/unipayCallBack")
public String unipayCallBack(HttpServletRequest request, UniPayCallBackDto uniPayCallBackDto){
log.info("进入汇聚支付聚合支付回调"+ JSONUtil.parseObj(uniPayCallBackDto));
@@ -263,6 +265,7 @@
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+";");
@@ -283,6 +286,14 @@
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();
diff --git a/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml b/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml
index 33d93b7..8b00702 100644
--- a/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml
+++ b/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml
@@ -73,6 +73,7 @@
a.amount amount,
a.amount_fee amountFee,
a.withdraw_no withdrawNo,
+ a.remark remark,
a.status status,
b.name,
b.bind_phone bindPhone,
diff --git a/src/main/resources/templates/febs/views/modules/mallMember/chargeFlowList.html b/src/main/resources/templates/febs/views/modules/mallMember/chargeFlowList.html
index 5d6e645..03d6a16 100644
--- a/src/main/resources/templates/febs/views/modules/mallMember/chargeFlowList.html
+++ b/src/main/resources/templates/febs/views/modules/mallMember/chargeFlowList.html
@@ -125,6 +125,7 @@
{field: 'bindPhone', title: '手机号', minWidth: 150,align:'left'},
{field: 'amount', title: '金额', minWidth: 150,align:'left'},
{field: 'amountFee', title: '手续费', minWidth: 150,align:'left'},
+ {field: 'remark', title: '错误信息', minWidth: 150,align:'left'},
{field: 'status', title: '状态',
templet: function (d) {
if (d.status === 1) {
--
Gitblit v1.9.1