From dca0031ad5552679d6dfbb80d6edd7adbfc7ec2c Mon Sep 17 00:00:00 2001
From: jiangqs <343695869@qq.com>
Date: 星期日, 30 四月 2023 16:27:51 +0800
Subject: [PATCH] 分服务
---
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberServiceImpl.java | 54 +++++++++++++-----------------------------------------
1 files changed, 13 insertions(+), 41 deletions(-)
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberServiceImpl.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberServiceImpl.java
index 175c08c..587c7f7 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberServiceImpl.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberServiceImpl.java
@@ -3,24 +3,20 @@
import cn.binarywang.wx.miniapp.api.WxMaService;
import cn.binarywang.wx.miniapp.bean.WxMaJscode2SessionResult;
import cn.binarywang.wx.miniapp.bean.WxMaPhoneNumberInfo;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.core.exception.ServiceException;
import com.ruoyi.common.security.utils.SecurityUtils;
-import com.ruoyi.member.domain.dto.AppNearbyShopDto;
import com.ruoyi.member.domain.dto.AppUserAuthorizeDto;
-import com.ruoyi.member.domain.vo.AppNearbyShopVo;
import com.ruoyi.member.domain.vo.AppUserAuthorizeVo;
import com.ruoyi.member.mapper.member.MemberMapper;
import com.ruoyi.member.service.member.MemberService;
+import com.ruoyi.system.api.RemoteUserService;
+import com.ruoyi.system.api.constant.AppErrorConstant;
+import com.ruoyi.system.api.constant.SecurityConstant;
import com.ruoyi.system.api.domain.poji.member.Member;
import com.ruoyi.system.api.domain.poji.sys.SysUser;
import com.ruoyi.system.api.model.AppMiniLoginDto;
import com.ruoyi.system.api.model.AppMiniLoginVo;
-import com.ruoyi.system.api.constant.AppErrorConstant;
-import com.ruoyi.system.api.constant.SecurityConstant;
-import com.ruoyi.system.domain.pojo.shop.Shop;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ruoyi.system.service.shop.ShopService;
-import com.ruoyi.system.service.sys.ISysUserService;
import org.apache.commons.lang3.StringUtils;
import org.springframework.data.redis.core.StringRedisTemplate;
import org.springframework.stereotype.Service;
@@ -39,17 +35,15 @@
*/
@Service
public class MemberServiceImpl extends ServiceImpl<MemberMapper, Member> implements MemberService {
+
+ @Resource
+ private RemoteUserService sysUserService;
+
@Resource
private WxMaService wxMaService;
@Resource
- private ISysUserService sysUserService;
-
- @Resource
private MemberMapper memberMapper;
-
- @Resource
- private ShopService shopService;
@Resource
private StringRedisTemplate stringRedisTemplate;
@@ -111,7 +105,7 @@
member.setCreateTime(new Date());
this.save(member);
}else{
- sysUser = sysUserService.selectUserById(member.getUserId());
+ sysUser = sysUserService.getSysUser(member.getUserId()).getData();
}
appMiniLoginVo.setMiniOpenid(openid);
appMiniLoginVo.setWxUnionid(unionid);
@@ -156,9 +150,10 @@
e.printStackTrace();
}
//更新用户手机信息
- SysUser sysUser = sysUserService.selectUserById(appUserAuthorizeDto.getUserId());
+ SysUser sysUser = new SysUser();
+ sysUser.setUserId(appUserAuthorizeDto.getUserId());
sysUser.setPhonenumber(mobile);
- sysUserService.updateUser(sysUser);
+ sysUserService.updateUserMobile(sysUser);
member.setMobile(mobile);
this.saveOrUpdate(member);
appUserAuthorizeVo.setMobile(mobile);
@@ -168,28 +163,5 @@
return appUserAuthorizeVo;
}
- /**
- * 获取附近门店
- * @param appNearbyShopDto
- * @return
- */
- @Override
- public AppNearbyShopVo getNearbyShop(AppNearbyShopDto appNearbyShopDto){
- Member member = this.getById(appNearbyShopDto.getUserId());
- AppNearbyShopVo appNearbyShopVo = new AppNearbyShopVo();
- Shop shop = null;
- if(member.getRealtionShopId()!=null){
- //获取绑定商户
- shop = shopService.getById(member.getRealtionShopId());
- }else{
- //获取附近商户
- shop = shopService.getById(1L);
- }
- appNearbyShopVo.setShopId(shop.getShopId());
- appNearbyShopVo.setShopName(shop.getShopName());
- appNearbyShopVo.setShopAddress(shop.getShopAreaName()+shop.getShopAddress());
- appNearbyShopVo.setShopLatitude(shop.getShopLatitude());
- appNearbyShopVo.setShopLongitude(shop.getShopLongitude());
- return appNearbyShopVo;
- }
+
}
--
Gitblit v1.7.1