From c77909ffc32e43ccde9e530cc746161a61f16b30 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 21 三月 2024 14:45:00 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/PlayPai into 2.0
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/OperatorController.java | 18 +++++++++++++++++-
1 files changed, 17 insertions(+), 1 deletions(-)
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 19ac002..a881797 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
@@ -487,7 +487,6 @@
" \"mobile\":\""+phone+"\"," +
" }" +
" ],";
- // todo 拼接
String biz_cards=" \"biz_cards\":[" +
" {" +
" \"account_holder_name\":\""+accountName+"\"," +
@@ -554,6 +553,7 @@
System.err.println("订单号"+order_no);
operatorAuth.setOrderNo(order_no);
operatorAuth.setRefuseReason("");
+
operatorAuthService.saveOrUpdate(operatorAuth);
Integer userId = operatorService.getById(operatorId).getUserId();
OperatorUser user = operatorUserService.getOne(new QueryWrapper<OperatorUser>().eq("userId", userId));
@@ -566,6 +566,11 @@
}
operatorUserService.saveOrUpdate(user);
} else {
+ Integer userId = operatorService.getById(operatorId).getUserId();
+ OperatorUser user = operatorUserService.getOne(new QueryWrapper<OperatorUser>().eq("userId", userId));
+ user.setAlipayAudit(3);
+ operatorUserService.saveOrUpdate(user);
+ operatorAuth.setRefuseReason(response.getSubMsg());
if (response.getCode().equals("40004")){
String subMsg = response.getSubMsg();
return ResultUtil.error(subMsg);
@@ -850,4 +855,15 @@
}
return ResultUtil.success("添加成功");
}
+
+
+ /**
+ * 获取所有运营商
+ * @return
+ */
+ @ResponseBody
+ @PostMapping("/getOperatorListAll")
+ public Object getOperatorListAll(){
+ return operatorService.list(new QueryWrapper<TOperator>().eq("state", 1));
+ }
}
--
Gitblit v1.7.1