diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/WxAppletsController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/WxAppletsController.java
index b4dce3e9..608f5f8e 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/WxAppletsController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/WxAppletsController.java
@@ -3,7 +3,9 @@ package com.ruoyi.system.controller;
import com.ruoyi.common.core.web.domain.AjaxResult;
import com.ruoyi.common.swagger.apiConstants.ApiTerminal;
import com.ruoyi.system.api.domain.vo.WxAppletsCodeVo;
+import com.ruoyi.system.domain.vo.PhoneRequest;
import com.ruoyi.system.service.WxAppletsService;
+import io.seata.core.model.Result;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -38,6 +40,33 @@ public class WxAppletsController {
@Value("${image.domainName}")
private String domainName;
+ @PostMapping("/getPhoneNumber")
+ @ApiOperation(ApiTerminal.wxMiniProgram+"微信小程序-获取用户手机号码")
+ @ResponseBody
+ public AjaxResult getPhoneNumber(@RequestBody PhoneRequest request) throws Exception {
+ String tel="";
+ // 授权成功
+ if (request.getErrMsg().equals("getPhoneNumber:ok")) {
+ tel = wxAppletsService.getPhoneNumber(request);
+ }else{
+ System.out.println("用户拒绝授权获取手机号码 userid="+request.getUserId());
+ }
+ return AjaxResult.success(tel);
+ }
+
+ @PostMapping("/updatePhoneNumber")
+ @ApiOperation(ApiTerminal.wxMiniProgram+"更新获取用户手机号码")
+ @ResponseBody
+ public AjaxResult updatePhoneNumber(@RequestBody PhoneRequest request) throws Exception {
+ String tel="";
+ // 授权成功
+ if (request.getErrMsg().equals("getPhoneNumber:ok")) {
+ tel = wxAppletsService.updatePhoneNumber(request);
+ }else{
+ System.out.println("用户拒绝授权获取手机号码 userid="+request.getUserId());
+ }
+ return AjaxResult.success(tel);
+ }
@PostMapping("/getWxacodeunlimit")
@ApiOperation(ApiTerminal.wxMiniProgram +"微信小程序-获取小程序码")
@ResponseBody
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/WxAppletsServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/WxAppletsServiceImpl.java
index 5a262012..424b45df 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/WxAppletsServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/WxAppletsServiceImpl.java
@@ -74,12 +74,12 @@ public class WxAppletsServiceImpl implements WxAppletsService {
JSONObject myJson = JSONObject.parseObject(json);
log.info("获取AccessToken={}", JSON.toJSONString(myJson));
//保存到缓存
- accessToken = myJson.get("access_token").toString();
+ accessToken = String.valueOf(myJson.get("access_token"));
Long expires_in=myJson.getLong("expires_in");
redisService.setCacheObject(Constants.WX_APPLETS_REDIS_ACCESS_TOKEN_KEY,accessToken,expires_in-100, TimeUnit.SECONDS);
return accessToken;
}else {
- return (String) redisService.getCacheObject(Constants.WX_APPLETS_REDIS_ACCESS_TOKEN_KEY);
+ return redisService.getCacheObject(Constants.WX_APPLETS_REDIS_ACCESS_TOKEN_KEY);
}
}
@Override
diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/CompetitionMembersMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/CompetitionMembersMapper.xml
index 0f22d7ff..b119d982 100644
--- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/CompetitionMembersMapper.xml
+++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/CompetitionMembersMapper.xml
@@ -269,7 +269,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
where id = #{id}
- update competition_members set user_id = #{userId} where contacts_tel = #{contactsTel}
+ update competition_members set user_id = #{userId} where contacts_tel = #{telephone}