From 8f2abbbda6c87c59d0c2c5da9979e78ea38e74db Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 21 一月 2025 18:15:00 +0800
Subject: [PATCH] 合并代码
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/OperatorController.java | 14 +++++++++++++-
1 files changed, 13 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 ca128ff..2173819 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
@@ -132,6 +132,11 @@
model.addAttribute("id",id);
model.addAttribute("merchantNumber",operatorService.getById(id).getMerchantNumber());
model.addAttribute("name",operatorService.getById(id).getMerchantName());
+ OperatorUser one = operatorUserService.lambdaQuery()
+ .eq(OperatorUser::getOperatorId, id).one();
+ if (one!=null){
+ model.addAttribute("wechatProportion",one.getWechatProportion());
+ }
return PREFIX + "Operator_wx.html";
}
/**
@@ -192,10 +197,17 @@
*/
@RequestMapping(value = "/merchantNumberWx")
@ResponseBody
- public Object listAll(Integer id, String merchantNumber,String name) throws Exception {
+ public Object listAll(Integer id, String merchantNumber,String name,String wechatProportion) throws Exception {
TOperator byId = operatorService.getById(id);
byId.setMerchantNumber(merchantNumber);
+ byId.setMerchantName(name);
operatorService.updateById(byId);
+ OperatorUser one = operatorUserService.lambdaQuery()
+ .eq(OperatorUser::getOperatorId, id).one();
+ if (one!=null){
+ one.setWechatProportion(wechatProportion);
+ operatorUserService.updateById(one);
+ }
ResultUtil resultUtil = payMoneyUtil.addReceiver(merchantNumber, name);
if (resultUtil.getCode() == 500){
return ResultUtil.error(resultUtil.getMsg());
--
Gitblit v1.7.1