From c203ff63489126a94d1be5dbfe32cadb69a70594 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期四, 25 五月 2023 16:26:56 +0800
Subject: [PATCH] 完善数据库和框架
---
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopServiceImpl.java | 23 ++++++++++++++---------
1 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopServiceImpl.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopServiceImpl.java
index f8f38b5..94fb893 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopServiceImpl.java
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopServiceImpl.java
@@ -11,10 +11,10 @@
import com.ruoyi.shop.service.shop.*;
import com.ruoyi.shop.service.task.ShopFileService;
import com.ruoyi.shop.util.CodeFactoryUtil;
-import com.ruoyi.system.api.RemoteConfigService;
-import com.ruoyi.system.api.RemoteMemberService;
-import com.ruoyi.system.api.RemoteOrderService;
-import com.ruoyi.system.api.RemoteUserService;
+import com.ruoyi.system.api.service.RemoteConfigService;
+import com.ruoyi.system.api.service.RemoteMemberService;
+import com.ruoyi.system.api.service.RemoteOrderService;
+import com.ruoyi.system.api.service.RemoteUserService;
import com.ruoyi.system.api.domain.dto.AppMemberBindingDto;
import com.ruoyi.system.api.domain.poji.shop.Shop;
import com.ruoyi.system.api.domain.poji.config.SysTag;
@@ -22,7 +22,7 @@
import com.ruoyi.system.api.domain.poji.sys.SysUser;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.system.api.domain.vo.MerHomeShopTotalVo;
-import org.apache.commons.lang3.StringUtils;
+import com.ruoyi.common.core.utils.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
@@ -334,14 +334,17 @@
public AppNearbyShopVo getNearbyShop(AppNearbyShopDto appNearbyShopDto,Member member){
AppNearbyShopVo appNearbyShopVo = new AppNearbyShopVo();
Shop shop = null;
- if(member.getRelationShopId()!=null){
+ //获取附近商户
+ if(member!=null&&member.getRelationShopId()!=null&&member.getBindingFlag()==1){
//获取绑定商户
shop = this.getById(member.getRelationShopId());
+ }else if(StringUtils.isNotBlank(appNearbyShopDto.getLatitude())&&StringUtils.isNotBlank(appNearbyShopDto.getLongitude())){
+ AppNearShopVo appNearShopVo = shopMapper.getNearbyShop(appNearbyShopDto);
+ shop = this.getById(appNearShopVo.getShopId());
}else{
- //获取附近商户
- shop = this.getById(1L);
+ return appNearbyShopVo;
}
- if(member.getBindingFlag()!=1){
+ if(member!=null&&member.getBindingFlag()!=1){
AppMemberBindingDto appMemberBindingDto = new AppMemberBindingDto();
appMemberBindingDto.setShopId(shop.getShopId());
appMemberBindingDto.setUserId(member.getUserId());
@@ -394,4 +397,6 @@
List<MerAgencyPageVo> merAgencyPageVoList = shopMapper.pageMerAgencyVo(page, merAgencyPageDto);
return merAgencyPageVoList;
}
+
+
}
--
Gitblit v1.7.1