From 855712e41283375ad2a19544bcb7f069a0d389a2 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 31 一月 2024 17:36:10 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/OperatorController.java | 33 +++++++++++++++++++++++++++------
cloud-server-management/src/main/webapp/WEB-INF/view/system/operator/OperatorUser_proportionAuth_info.html | 11 ++++++++++-
cloud-server-management/src/main/resources/mapper/TOperatorUserMapper.xml | 4 ++--
cloud-server-management/src/main/java/com/dsh/guns/modular/system/api/AliPayMsgConfig.java | 4 ++++
4 files changed, 43 insertions(+), 9 deletions(-)
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/api/AliPayMsgConfig.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/api/AliPayMsgConfig.java
index e1dfd0d..00bc4f7 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/api/AliPayMsgConfig.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/api/AliPayMsgConfig.java
@@ -56,12 +56,15 @@
OperatorAuthAlipay orderNo = operatorAuthService.getOne(new QueryWrapper<OperatorAuthAlipay>()
.eq("orderNo", order_id));
if (orderNo!=null){
+ orderNo.setRefuseReason(null);
+ operatorAuthService.updateById(orderNo);
Integer operatorId = orderNo.getOperatorId();
OperatorUser operatorId1 = operatorUserService.getOne(new QueryWrapper<OperatorUser>()
.eq("operatorId", operatorId));
if (operatorId1!=null){
operatorId1.setAlipayNum(smid);
operatorId1.setAlipayAudit(2);
+ operatorUserService.updateById(operatorId1);
}
}
}else if (msgApi.equals("ant.merchant.expand.indirect.zft.rejected")){
@@ -71,6 +74,7 @@
String order_id = json.getString("order_id");
OperatorAuthAlipay orderNo = operatorAuthService.getOne(new QueryWrapper<OperatorAuthAlipay>()
.eq("orderNo", order_id));
+
if (orderNo!=null){
orderNo.setRefuseReason(reason);
operatorAuthService.updateById(orderNo);
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/OperatorController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/OperatorController.java
index 8fd6fcf..19ac002 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/OperatorController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/OperatorController.java
@@ -223,8 +223,26 @@
TOperator data = operatorService.getById(id);
User byId = userService.getById(data.getUserId());
model.addAttribute("user",byId);
+ OperatorUser operatorId = operatorUserService.getOne(new QueryWrapper<OperatorUser>()
+ .eq("operatorId", data.getId()));
model.addAttribute("data",data);
+ String state="";
+ switch (operatorId.getAlipayAudit()){
+ case 0:
+ state="未认证";
+ break;
+ case 1:
+ state="待审核";
+ break;
+ case 2:
+ state="已通过";
+ break;
+ case 3:
+ state="已拒绝";
+ break;
+ }
+ model.addAttribute("state",state);
OperatorAuthAlipay info = operatorAuthService.getOne(new QueryWrapper<OperatorAuthAlipay>()
.eq("operatorId", id));
model.addAttribute("item",info);
@@ -244,9 +262,6 @@
List<TCity> list5 = cityService.list(new LambdaQueryWrapper<TCity>().eq(TCity::getParentId, 1));
model.addAttribute("list5",list5);
}
-
-
-
model.addAttribute("bodyType",info.getBodyType());
model.addAttribute("accountType",info.getAccountType());
model.addAttribute("useType",info.getUseType());
@@ -324,12 +339,18 @@
Integer userId1 = byId.getUserId();
OperatorUser userId2 = operatorUserService.getOne(new QueryWrapper<OperatorUser>()
.eq("userId", userId1));
-
+ userId2.setAlipayAudit(1);
+ // 01是企业
+ if (bodyType.equals("01")){
+ userId2.setAlipayType(2);
+ }else{
+ userId2.setAlipayType(1);
+ }
+ operatorUserService.saveOrUpdate(userId2);
OperatorAuthAlipay data = operatorAuthService.getOne(new QueryWrapper<OperatorAuthAlipay>().eq("operatorId", operatorId));
- // 调用支付宝接口 通过银行卡号获取银行信息
+ // 调用支付宝接口 通过银行卡号获取银行信息
String url = "https://ccdcapi.alipay.com/validateAndCacheCardInfo.json?_input_charset=utf-8&" +
"cardNo="+bankCard+"&cardBinCheck=true";
-
HashMap<String, String> hashMap = new HashMap<>();
String result = HttpRequestUtil.postRequest(url,hashMap);
System.err.println(result);
diff --git a/cloud-server-management/src/main/resources/mapper/TOperatorUserMapper.xml b/cloud-server-management/src/main/resources/mapper/TOperatorUserMapper.xml
index 242206b..ce5f4a2 100644
--- a/cloud-server-management/src/main/resources/mapper/TOperatorUserMapper.xml
+++ b/cloud-server-management/src/main/resources/mapper/TOperatorUserMapper.xml
@@ -56,10 +56,10 @@
<if test="platform !=null and platform !='' and platform==2">
and t1.platform = "支付宝"
</if>
- <if test="type !=null and type !='' ">
+ <if test="type !=null ">
and t1.type = #{type}
</if>
- <if test="state !=null and state !=''">
+ <if test="state !=null ">
and t1.audit = #{state}
</if>
ORDER BY t1.id;
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/operator/OperatorUser_proportionAuth_info.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/operator/OperatorUser_proportionAuth_info.html
index 11420bb..2a8879b 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/operator/OperatorUser_proportionAuth_info.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/operator/OperatorUser_proportionAuth_info.html
@@ -196,7 +196,16 @@
</div>
</div>
</div>
-
+ <div class="row" id="state">
+ <div class="col-lg-6" >
+ <div class="form-group">
+ <label class="col-sm-3 control-label">*审核状态：</label>
+ <div class="col-sm-9">
+ <h3 style="color: red">${state}</h3>
+ </div>
+ </div>
+ </div>
+ </div>
@if(reasons != null && reasons!=""){
<div class="row" id="reasons">
<div class="col-lg-6" >
--
Gitblit v1.7.1