From 5dc40fcd64b0513150f1d8335ab849e6d8cdc28e Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 04 七月 2025 19:42:49 +0800
Subject: [PATCH] 支付版本更新 根据资金流向使用V2或V3服务商版本支付
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/OperatorController.java | 25 +++++--------------------
1 files changed, 5 insertions(+), 20 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 2173819..38fd136 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
@@ -128,15 +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());
- OperatorUser one = operatorUserService.lambdaQuery()
- .eq(OperatorUser::getOperatorId, id).one();
- if (one!=null){
- model.addAttribute("wechatProportion",one.getWechatProportion());
- }
+ model.addAttribute("merchantNumber",operator.getMerchantNumber());
+ model.addAttribute("merchantNumberAli",operator.getMerchantNumberAli());
return PREFIX + "Operator_wx.html";
}
/**
@@ -197,21 +192,11 @@
*/
@RequestMapping(value = "/merchantNumberWx")
@ResponseBody
- public Object listAll(Integer id, String merchantNumber,String name,String wechatProportion) 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);
- 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());
- }
return SUCCESS_TIP;
}
--
Gitblit v1.7.1