From aa8f41d3b4fcc7aae0bd50fdea92b126f22485df Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期五, 05 五月 2023 18:34:54 +0800
Subject: [PATCH] 商户端主流程
---
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopServiceImpl.java | 33 ++++++++++++++++++++++++++-------
1 files changed, 26 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 85710a6..e02f88b 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,13 +5,15 @@
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.AppNearbyShopVo;
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.RemoteOrderService;
import com.ruoyi.system.api.RemoteUserService;
-import com.ruoyi.system.api.domain.poji.activity.ActivityGoods;
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;
@@ -20,6 +22,7 @@
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;
@@ -51,8 +54,8 @@
@Resource
private ShopCertificateService shopCertificateService;
- /*@Resource
- private RemoteConfigService configService;*/
+ @Resource
+ private RemoteConfigService configService;
@Resource
private RemoteUserService sysUserService;
@@ -63,6 +66,8 @@
@Resource
private ShopRelUserService shopRelUserService;
+ @Resource
+ private RemoteOrderService remoteOrderService;
/**
* 获取商户详情
@@ -138,12 +143,12 @@
for(String str : shopTagIdArray){
shopRelTag = new ShopRelTag();
tagid = Long.valueOf(str);
- //sysTag = configService.getSysTag(tagid).getData();
+ sysTag = configService.getSysTag(tagid).getData();
shopRelTag.setDelFlag(0);
shopRelTag.setShopId(shop.getShopId());
shopRelTag.setTagId(tagid);
shopRelTagService.save(shopRelTag);
- //shopTagSj.add(sysTag.getTagName());
+ shopTagSj.add(sysTag.getTagName());
}
shop.setShopTags(shopTagSj.toString());
this.saveOrUpdate(shop);
@@ -303,7 +308,7 @@
StringJoiner shopTagSj = new StringJoiner(",");
for(String str : shopTagIdArray){
tagId = Long.valueOf(str);
- sysTag = sysUserService.getSysTag(tagId).getData();
+ sysTag = configService.getSysTag(tagId).getData();
shopRelTag = new ShopRelTag();
shopRelTag.setDelFlag(0);
shopRelTag.setShopId(shopId);
@@ -351,7 +356,21 @@
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;
+ }
}
--
Gitblit v1.7.1