From 8b005a808d6ab8fae1480ed57bdfd68af2dafcd4 Mon Sep 17 00:00:00 2001
From: wlzboy <66905212@qq.com>
Date: 星期六, 01 十一月 2025 23:07:49 +0800
Subject: [PATCH] feat:输入出入地址时，会自动计算距离
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/evaluation/EvaluationController.java | 69 +++++++++++++++++++++++++++++++++-
1 files changed, 67 insertions(+), 2 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/evaluation/EvaluationController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/evaluation/EvaluationController.java
index 450ce95..2786bef 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/evaluation/EvaluationController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/evaluation/EvaluationController.java
@@ -1,6 +1,8 @@
package com.ruoyi.web.controller.evaluation;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -155,6 +157,38 @@
private String wechatAppSecret;
/**
+ * 鐢熸垚寰俊鎺堟潈URL
+ */
+ @Anonymous
+ @GetMapping("/wechat/authurl")
+ public AjaxResult getWechatAuthUrl(String redirectUri, String state) {
+ try {
+ if (StringUtils.isEmpty(redirectUri)) {
+ return error("鍥炶皟鍦板潃涓嶈兘涓虹┖");
+ }
+
+ logger.info("鐢熸垚寰俊鎺堟潈URL - 鍘熷redirectUri: {}", redirectUri);
+
+ // 鐢熸垚寰俊鎺堟潈URL锛屼娇鐢╯nsapi_userinfo鑾峰彇鐢ㄦ埛淇℃伅
+ String authUrl = WechatUtils.generateAuthUrl(wechatAppId, redirectUri, "snsapi_userinfo", state);
+ if (authUrl == null) {
+ return error("鐢熸垚寰俊鎺堟潈URL澶辫触");
+ }
+
+ logger.info("鐢熸垚寰俊鎺堟潈URL鎴愬姛: {}", authUrl);
+
+ Map<String, String> result = new HashMap<>();
+ result.put("authUrl", authUrl);
+ result.put("originalRedirectUri", redirectUri);
+ result.put("appId", wechatAppId);
+ return success(result);
+ } catch (Exception e) {
+ logger.error("鐢熸垚寰俊鎺堟潈URL澶辫触", e);
+ return error("鐢熸垚寰俊鎺堟潈URL澶辫触: " + e.getMessage());
+ }
+ }
+
+ /**
* 鑾峰彇寰俊鐢ㄦ埛淇℃伅
*/
@Anonymous
@@ -162,7 +196,7 @@
public AjaxResult getWechatUserInfo(String code, HttpServletRequest request) {
try {
- if (StringUtils.isEmpty(code)) {
+ if (code.isEmpty()) {
return error("鎺堟潈鐮佷笉鑳戒负绌�");
}
@@ -181,7 +215,22 @@
return error("鑾峰彇寰俊鐢ㄦ埛淇℃伅澶辫触");
}
- return success(userInfo);
+ // 澶勭悊鐢ㄦ埛淇℃伅锛岀‘淇濆瓧娈靛悕绉颁竴鑷�
+ Map<String, Object> result = new HashMap<>();
+ result.put("openid", userInfo.getString("openid"));
+ result.put("nickname", userInfo.getString("nickname"));
+ result.put("headimgurl", userInfo.getString("headimgurl"));
+ result.put("sex", userInfo.getInteger("sex"));
+ result.put("province", userInfo.getString("province"));
+ result.put("city", userInfo.getString("city"));
+ result.put("country", userInfo.getString("country"));
+ result.put("unionid", userInfo.getString("unionid"));
+ // 娉ㄦ剰锛氬井淇＄綉椤垫巿鏉冩棤娉曠洿鎺ヨ幏鍙栨墜鏈哄彿锛岄渶瑕侀�氳繃鍏朵粬鏂瑰紡
+ // 濡傞渶鑾峰彇鎵嬫満鍙凤紝闇�瑕佷娇鐢ㄥ井淇″皬绋嬪簭鐨刧etPhoneNumber鎺ュ彛鎴栧井淇″紑鏀惧钩鍙扮殑鎵嬫満鍙峰揩閫熼獙璇佺粍浠�
+ result.put("phone", "");
+ result.put("phoneNote", "寰俊缃戦〉鎺堟潈鏃犳硶鐩存帴鑾峰彇鎵嬫満鍙凤紝璇锋墜鍔ㄨ緭鍏�");
+
+ return success(result);
} catch (Exception e) {
logger.error("鑾峰彇寰俊鐢ㄦ埛淇℃伅澶辫触", e);
return error("鑾峰彇寰俊鐢ㄦ埛淇℃伅澶辫触");
@@ -190,6 +239,22 @@
/**
+ * 鑾峰彇璇勪环缁熻鏁版嵁
+ */
+ @PreAuthorize("@ss.hasPermi('evaluation:statistics')")
+ @GetMapping("/evaluation/statistics")
+ public AjaxResult getStatistics(CustomerEvaluation customerEvaluation) {
+ try {
+ // 鑾峰彇缁熻鏁版嵁
+ Map<String, Object> statistics = customerEvaluationService.getEvaluationStatistics(customerEvaluation);
+ return success(statistics);
+ } catch (Exception e) {
+ logger.error("鑾峰彇璇勪环缁熻鏁版嵁澶辫触", e);
+ return error("鑾峰彇缁熻鏁版嵁澶辫触");
+ }
+ }
+
+ /**
* 鑾峰彇瀹㈡埛绔疘P鍦板潃
*/
private String getClientIP(HttpServletRequest request) {
--
Gitblit v1.9.1