From 9a3226d85b9245fb2e3d0492f8a05e76c96871cb Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期三, 12 十一月 2025 17:45:36 +0800
Subject: [PATCH] 小程序接口
---
ruoyi-system/src/main/resources/mapper/system/TAssistedDiningMapper.xml | 2 +-
ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/MerchantController.java | 7 +++++++
ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java | 3 +++
ruoyi-applet/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java | 21 ++++++++++-----------
4 files changed, 21 insertions(+), 12 deletions(-)
diff --git a/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/MerchantController.java b/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/MerchantController.java
index 150dd06..82c765b 100644
--- a/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/MerchantController.java
+++ b/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/MerchantController.java
@@ -69,5 +69,12 @@
return R.ok(merchant);
}
+ @GetMapping("/getMerchantTypeList")
+ @ApiOperation(value = "惠民商务--商户分类列表",response = TMerchantType.class)
+ public R<List<TMerchantType>> getMerchantTypeList() {
+ List<TMerchantType> list = merchantTypeService.list();
+ return R.ok(list);
+ }
+
}
diff --git a/ruoyi-applet/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java b/ruoyi-applet/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
index 3936557..c4f95cf 100644
--- a/ruoyi-applet/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
+++ b/ruoyi-applet/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
@@ -110,21 +110,20 @@
// if (StringUtils.isNotBlank(data.getSignature())) {
// WxUtils.verifySignature(data.getRawData(), sessionKey, data.getSignature());
// }
- if(StringUtils.isEmpty(data.getEncryptedData()) || StringUtils.isEmpty(data.getIv())){
- return R.fail("已拒绝授权");
- }
- AppletUserDecodeData appletUserDecodeData = WxUtils.encryptedData(data.getEncryptedData(), sessionKey, data.getIv());
- appletUserDecodeData.setOpenId(openid);
+// if(StringUtils.isEmpty(data.getEncryptedData()) || StringUtils.isEmpty(data.getIv())){
+// return R.fail("已拒绝授权");
+// }
+// AppletUserDecodeData appletUserDecodeData = WxUtils.encryptedData(data.getEncryptedData(), sessionKey, data.getIv());
+// appletUserDecodeData.setOpenId(openid);
// 先使用openId和当前手机号进行查询
TAppUser sysAppUser = appUserService.getOne(Wrappers.lambdaQuery(TAppUser.class)
- .and(e->e.eq(TAppUser::getOpenId, appletUserDecodeData.getOpenId()).or()
- .eq(TAppUser::getPhoneNumber, appletUserDecodeData.getPhoneNumber())));
+ .and(e->e.eq(TAppUser::getOpenId, openid)));
if (sysAppUser==null){
sysAppUser = new TAppUser();
- sysAppUser.setPhoneNumber(appletUserDecodeData.getPhoneNumber());
- sysAppUser.setOpenId(appletUserDecodeData.getOpenId());
+// sysAppUser.setPhoneNumber(appletUserDecodeData.getPhoneNumber());
+ sysAppUser.setOpenId(openid);
// 手机号中间四位替换为*
- sysAppUser.setNickName(appletUserDecodeData.getPhoneNumber().replaceAll("(\\d{3})\\d{4}(\\d{4})", "$1****$2"));
+// sysAppUser.setNickName(appletUserDecodeData.getPhoneNumber().replaceAll("(\\d{3})\\d{4}(\\d{4})", "$1****$2"));
appUserService.save(sysAppUser);
}else {
// 判断账号是否被冻结
@@ -132,7 +131,7 @@
return R.fail("账号已冻结,请联系管理员");
}
// 手机号相同但openId为空的情况
- sysAppUser.setOpenId(appletUserDecodeData.getOpenId());
+ sysAppUser.setOpenId(openid);
appUserService.updateById(sysAppUser);
}
LoginUserApplet loginUserApplet = new LoginUserApplet();
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
index 591b099..cb8ac3b 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
@@ -123,11 +123,14 @@
"/partyBuilding/**",
"/convenience/**",
"/merchant/**",
+ "/openIdByJsCode",
"/t-appeal-services/pageListLarge","/t-large-dept/list",
"/t-large-key-grid-user/pageListLarge","/t-large-key-personnel-type/pageListLarge",
"/t-large-organization/pageListLarge","/t-large-resource/pageListLarge",
"/t-large-resource-type/list","/t-large-social-worker/pageListLarge",
"/t-large-user/pageListLarge","/t-large-volunteer/pageListLarge",
+ "/pension/getAssistedDiningList",
+ "/pension/getAssistedDiningDetail",
"/statistics/**"
).permitAll()
// 静态资源，可匿名访问
diff --git a/ruoyi-system/src/main/resources/mapper/system/TAssistedDiningMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TAssistedDiningMapper.xml
index 2c124ca..130a49e 100644
--- a/ruoyi-system/src/main/resources/mapper/system/TAssistedDiningMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/TAssistedDiningMapper.xml
@@ -22,7 +22,7 @@
id, point_name, point_phone, point_cover, address, point_detail, create_time, update_time, create_by, update_by, disabled
</sql>
<select id="pageList" resultType="com.ruoyi.system.model.TAssistedDining">
- select t1.* from t_assisted_dining t1
+ select t1.* from t_assisted_dining t1 where 1=1
<if test="query.pointName != null and query.pointName != ''">
and t1.point_name like concat('%',#{query.pointName},'%')
</if>
--
Gitblit v1.7.1