From 3a5e49666af1da441633b0a9bae4c3c2b18974b3 Mon Sep 17 00:00:00 2001
From: sgj <1442489573@qq.com>
Date: 星期二, 14 四月 2026 16:05:41 +0800
Subject: [PATCH] 质押合同添加业务经理绑定，H5相关逻辑完善
---
fzzy-igdss-web/src/main/java/com/fzzy/appwx/controller/WeChatController.java | 70 ++++++++++++++++++++++-------------
1 files changed, 44 insertions(+), 26 deletions(-)
diff --git a/fzzy-igdss-web/src/main/java/com/fzzy/appwx/controller/WeChatController.java b/fzzy-igdss-web/src/main/java/com/fzzy/appwx/controller/WeChatController.java
index aaa0ede..aa3ea9f 100644
--- a/fzzy-igdss-web/src/main/java/com/fzzy/appwx/controller/WeChatController.java
+++ b/fzzy-igdss-web/src/main/java/com/fzzy/appwx/controller/WeChatController.java
@@ -5,8 +5,10 @@
import com.fzzy.appwx.constant.WeChatConst;
import com.fzzy.appwx.manager.WeChatManager;
import com.fzzy.appwx.param.WeChatBaseParam;
+import com.fzzy.group.manager.GroupManager;
import com.fzzy.igds.data.ConfigData;
import com.fzzy.igds.data.PageResponse;
+import com.fzzy.igds.domain.Dept;
import com.fzzy.igds.domain.SnapReply;
import com.ruoyi.common.core.domain.entity.SysUser;
import lombok.extern.slf4j.Slf4j;
@@ -16,7 +18,8 @@
import org.springframework.web.servlet.ModelAndView;
import javax.annotation.Resource;
-import java.net.URLEncoder;
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
@Slf4j
@Controller
@@ -27,6 +30,8 @@
private ConfigData configData;
@Resource
private WeChatManager weChatManager;
+ @Resource
+ private GroupManager groupManager;
/**
@@ -46,13 +51,13 @@
tag = "home";
}
- String newUrl = WeChatConst.USER_AUTH_UPR
- .replace("APPID", configData.getWxAppId())
- .replace("REDIRECT_URI", URLEncoder.encode(url, "UTF-8"))
- .replace("STATE", tag);
-
- return "redirect:" + newUrl;
-// return "redirect:" + url + "?state=" + tag;
+// String newUrl = WeChatConst.USER_AUTH_UPR
+// .replace("APPID", configData.getWxAppId())
+// .replace("REDIRECT_URI", URLEncoder.encode(url, "UTF-8"))
+// .replace("STATE", tag);
+//
+// return "redirect:" + newUrl;
+ return "redirect:" + url + "?state=" + tag;
}
@@ -100,21 +105,31 @@
mv.addObject("userName", userName);
}
mv.setViewName("/wx/" + state);
+ //楠岃瘉鐮佺被鍨�
+ if("bind".equals( state) || "unbind".equals( state)){
+ mv.addObject("captchaType", "math");
+ }
-//// //娴嬭瘯浠ｇ爜寮�鍚�
-// String openid = "testOpenId";
-// mv.addObject("openid", openid);
-// SysUser user = weChatManager.getUser(openid);
-// if (StringUtils.isEmpty(userName)) {
-// if (user != null) {
-// userName = user.getUserName();
-// }
-// }
-//
-// if (StringUtils.isNotEmpty(userName)) {
-// mv.addObject("userName", userName);
-// }
-//// //娴嬭瘯浠ｇ爜缁撴潫
+
+ //鏌ヨ搴撳尯淇℃伅
+ List<Dept> deptList = groupManager.getDeptList();
+ mv.addObject("deptList", deptList);
+
+
+// //娴嬭瘯浠ｇ爜寮�鍚�
+ String openid = "testOpenId";
+ mv.addObject("openid", openid);
+ SysUser user = weChatManager.getUser(openid);
+ if (StringUtils.isEmpty(userName)) {
+ if (user != null) {
+ userName = user.getUserName();
+ }
+ }
+
+ if (StringUtils.isNotEmpty(userName)) {
+ mv.addObject("userName", userName);
+ }
+// //娴嬭瘯浠ｇ爜缁撴潫
return mv;
}
@@ -143,8 +158,8 @@
*/
@PostMapping(value = "/bandOpenId")
@ResponseBody
- public PageResponse<String> bandOpenId( @RequestBody WeChatBaseParam param) {
- return weChatManager.bandOpenId(param);
+ public PageResponse<String> bandOpenId(HttpServletRequest httpRequest, @RequestBody WeChatBaseParam param) {
+ return weChatManager.bandOpenId(httpRequest,param);
}
/**
@@ -156,11 +171,14 @@
*/
@PostMapping(value = "/unBandOpenId")
@ResponseBody
- public PageResponse<String> unBandOpenId( @RequestBody WeChatBaseParam param) {
- return weChatManager.unBandOpenId(param);
+ public PageResponse<String> unBandOpenId( HttpServletRequest httpRequest, @RequestBody WeChatBaseParam param) {
+ //鍦ㄨ繖閲岃皟鐢ㄩ獙璇佺爜鏍￠獙
+
+ return weChatManager.unBandOpenId(httpRequest,param);
}
+
/**
* 鑾峰彇鍑哄叆搴撳憡璀︽壒澶嶅垎椤垫暟鎹�
*
--
Gitblit v1.9.3