From e8f01399a49bb718f184e31d0f6de27c3dc64cef Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 19 八月 2025 08:58:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/OperatorController.java | 16 ++++++----------
1 files changed, 6 insertions(+), 10 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 a5d0e85..35dff86 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
@@ -96,7 +96,7 @@
@ResponseBody
public List<TStore> getStores(Integer id)
{
- payMoneyUtil.getMessage();
+// payMoneyUtil.getMessage();
return storeService.list(new QueryWrapper<TStore>()
.eq("operatorId",id)
.ne("state",3));
@@ -128,10 +128,10 @@
}
@RequestMapping("/bindWx/{id}")
public String bindWx(Model model,@PathVariable("id") Integer id) {
-
+ TOperator operator = operatorService.getById(id);
model.addAttribute("id",id);
- model.addAttribute("merchantNumber",operatorService.getById(id).getMerchantNumber());
- model.addAttribute("name",operatorService.getById(id).getMerchantName());
+ model.addAttribute("merchantNumber",operator.getMerchantNumber());
+ model.addAttribute("merchantNumberAli",operator.getMerchantNumberAli());
return PREFIX + "Operator_wx.html";
}
/**
@@ -192,15 +192,11 @@
*/
@RequestMapping(value = "/merchantNumberWx")
@ResponseBody
- public Object listAll(Integer id, String merchantNumber,String name) throws Exception {
+ public Object listAll(Integer id, String merchantNumber,String merchantNumberAli) throws Exception {
TOperator byId = operatorService.getById(id);
byId.setMerchantNumber(merchantNumber);
- byId.setMerchantName(name);
+ byId.setMerchantNumberAli(merchantNumberAli);
operatorService.updateById(byId);
- ResultUtil resultUtil = payMoneyUtil.addReceiver(merchantNumber, name);
- if (resultUtil.getCode() == 500){
- return ResultUtil.error(resultUtil.getMsg());
- }
return SUCCESS_TIP;
}
--
Gitblit v1.7.1