From 7a49bcc5e561df7a9b65266a57a9c0896c0fd3d0 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期三, 10 五月 2023 13:48:56 +0800
Subject: [PATCH] Merge branch 'master' of ssh://sinata.cn:20202/java/HongRuiTang into master
---
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopServiceImpl.java | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 50 insertions(+), 7 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 7b74d13..c7d149e 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
@@ -5,21 +5,23 @@
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.vo.AppNearbyShopVo;
+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.RemoteConfigService;
+import com.ruoyi.system.api.RemoteMemberService;
+import com.ruoyi.system.api.RemoteOrderService;
import com.ruoyi.system.api.RemoteUserService;
-import com.ruoyi.system.api.domain.poji.activity.ActivityGoods;
+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.vo.AppShopInfoVo;
-import com.ruoyi.shop.domain.vo.MgtShopInfoVo;
-import com.ruoyi.shop.domain.vo.MgtShopPageVo;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.system.api.domain.vo.MerHomeShopTotalVo;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
@@ -55,6 +57,9 @@
private RemoteConfigService configService;
@Resource
+ private RemoteMemberService remoteMemberService;
+
+ @Resource
private RemoteUserService sysUserService;
@Resource
@@ -63,6 +68,8 @@
@Resource
private ShopRelUserService shopRelUserService;
+ @Resource
+ private RemoteOrderService remoteOrderService;
/**
* 获取商户详情
@@ -332,7 +339,15 @@
shop = this.getById(member.getRelationShopId());
}else{
//获取附近商户
- shop = this.getById(1L);
+ AppNearShopVo appNearShopVo = shopMapper.getNearbyShop(appNearbyShopDto);
+ shop = this.getById(appNearShopVo.getShopId());
+ }
+ if(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());
@@ -351,7 +366,35 @@
public Shop getByShopId(Long shopId){
LambdaQueryWrapper<Shop> queryWrapper = Wrappers.lambdaQuery();
queryWrapper.eq(Shop::getDelFlag, 0).eq(Shop::getShopId, shopId);
- Shop shop = this.getOne(queryWrapper);
+ 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