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 | 119 ++++++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 101 insertions(+), 18 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 e448515..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
@@ -1,25 +1,28 @@
package com.ruoyi.shop.service.impl.shop;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.shop.domain.dto.*;
import com.ruoyi.shop.domain.pojo.shop.*;
+import com.ruoyi.shop.domain.pojo.task.ShopFile;
+import com.ruoyi.shop.domain.vo.*;
import com.ruoyi.shop.mapper.shop.ShopMapper;
import com.ruoyi.shop.service.shop.*;
+import com.ruoyi.shop.service.task.ShopFileService;
import com.ruoyi.shop.util.CodeFactoryUtil;
+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;
+import com.ruoyi.system.api.domain.poji.member.Member;
import com.ruoyi.system.api.domain.poji.sys.SysUser;
-import com.ruoyi.shop.domain.dto.MgtChangeCoopDto;
-import com.ruoyi.shop.domain.dto.MgtEditShopDto;
-import com.ruoyi.shop.domain.dto.MgtEditShopTagDto;
-import com.ruoyi.shop.domain.dto.MgtShopPageDto;
-import com.ruoyi.system.domain.pojo.config.SysTag;
-import com.ruoyi.system.domain.pojo.shop.*;
-import com.ruoyi.shop.domain.vo.AppShopInfoVo;
-import com.ruoyi.shop.domain.vo.MgtShopInfoVo;
-import com.ruoyi.shop.domain.vo.MgtShopPageVo;
-import com.ruoyi.system.service.config.SysTagService;
-import com.ruoyi.system.service.shop.*;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ruoyi.system.service.sys.ISysUserService;
-import org.apache.commons.lang3.StringUtils;
+import com.ruoyi.system.api.domain.vo.MerHomeShopTotalVo;
+import com.ruoyi.common.core.utils.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
@@ -51,7 +54,13 @@
private ShopCertificateService shopCertificateService;
@Resource
- private SysTagService sysTagService;
+ private RemoteConfigService configService;
+
+ @Resource
+ private RemoteMemberService remoteMemberService;
+
+ @Resource
+ private RemoteUserService sysUserService;
@Resource
private ShopRelTagService shopRelTagService;
@@ -60,7 +69,7 @@
private ShopRelUserService shopRelUserService;
@Resource
- private ISysUserService sysUserService;
+ private RemoteOrderService remoteOrderService;
/**
* 获取商户详情
@@ -136,7 +145,7 @@
for(String str : shopTagIdArray){
shopRelTag = new ShopRelTag();
tagid = Long.valueOf(str);
- sysTag = sysTagService.getById(tagid);
+ sysTag = configService.getSysTag(tagid).getData();
shopRelTag.setDelFlag(0);
shopRelTag.setShopId(shop.getShopId());
shopRelTag.setTagId(tagid);
@@ -156,7 +165,7 @@
for(String str : relUserIdArray){
shopRelUser = new ShopRelUser();
userId = Long.valueOf(str);
- sysUser = sysUserService.selectUserById(userId);
+ sysUser = sysUserService.getSysUser(userId).getData();
shopRelUser.setDelFlag(0);
shopRelUser.setShopId(shop.getShopId());
shopRelUser.setUserId(userId);
@@ -301,7 +310,7 @@
StringJoiner shopTagSj = new StringJoiner(",");
for(String str : shopTagIdArray){
tagId = Long.valueOf(str);
- sysTag = sysTagService.getById(tagId);
+ sysTag = configService.getSysTag(tagId).getData();
shopRelTag = new ShopRelTag();
shopRelTag.setDelFlag(0);
shopRelTag.setShopId(shopId);
@@ -316,4 +325,78 @@
this.saveOrUpdate(shop);
}
+ /**
+ * 获取附近门店
+ * @param appNearbyShopDto
+ * @return
+ */
+ @Override
+ public AppNearbyShopVo getNearbyShop(AppNearbyShopDto appNearbyShopDto,Member member){
+ AppNearbyShopVo appNearbyShopVo = new AppNearbyShopVo();
+ Shop shop = 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{
+ return appNearbyShopVo;
+ }
+ if(member!=null&&member.getBindingFlag()!=1){
+ AppMemberBindingDto appMemberBindingDto = new AppMemberBindingDto();
+ appMemberBindingDto.setShopId(shop.getShopId());
+ appMemberBindingDto.setUserId(member.getUserId());
+ appMemberBindingDto.setBindingFlag(0);
+ remoteMemberService.updateMemberBinding(appMemberBindingDto);
+ }
+ appNearbyShopVo.setShopId(shop.getShopId());
+ appNearbyShopVo.setShopName(shop.getShopName());
+ appNearbyShopVo.setShopAddress(shop.getShopAreaName()+shop.getShopAddress());
+ appNearbyShopVo.setShopLatitude(shop.getShopLatitude());
+ appNearbyShopVo.setShopLongitude(shop.getShopLongitude());
+ return appNearbyShopVo;
+ }
+
+ /**
+ *
+ * @param shopId
+ * @return
+ */
+ @Override
+ public Shop getByShopId(Long shopId){
+ LambdaQueryWrapper<Shop> queryWrapper = Wrappers.lambdaQuery();
+ queryWrapper.eq(Shop::getDelFlag, 0).eq(Shop::getShopId, shopId);
+ Shop shop = this.getOne(queryWrapper,false);
+ return shop;
+ }
+
+ @Override
+ public MerHomeShopTotalVo getMerHomeTotal(Long userId){
+ MerHomeShopTotalVo merHomeShopTotalVo = new MerHomeShopTotalVo();
+ ShopRelUser shopRelUser = shopRelUserService.getByUserId(userId);
+ Long shopId = shopRelUser.getShopId();
+ merHomeShopTotalVo.setShopId(shopId);
+ Shop shop = this.getById(shopId);
+ merHomeShopTotalVo.setShopType(shop.getShopType());
+ Integer task = 0;
+ merHomeShopTotalVo.setTask(task);
+ merHomeShopTotalVo = remoteOrderService.getMerHomeTotal(merHomeShopTotalVo).getData();
+ return merHomeShopTotalVo;
+ }
+
+ /**
+ *
+ * @param page
+ * @param merAgencyPageDto
+ * @return
+ */
+ @Override
+ public List<MerAgencyPageVo> pageMerAgencyVo(Page page, MerAgencyPageDto merAgencyPageDto){
+ List<MerAgencyPageVo> merAgencyPageVoList = shopMapper.pageMerAgencyVo(page, merAgencyPageDto);
+ return merAgencyPageVoList;
+ }
+
+
}
--
Gitblit v1.7.1