demo补完

jiangqs

2023-05-17 7b005ca364613c9738dbc66f3e4fe3fb7bec043d

 ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopServiceImpl.java

@@ -6,7 +6,7 @@
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.domain.vo.*;
import com.ruoyi.shop.mapper.shop.ShopMapper;
import com.ruoyi.shop.service.shop.*;
import com.ruoyi.shop.service.task.ShopFileService;
@@ -20,9 +20,6 @@
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;
@@ -337,14 +334,14 @@
    public AppNearbyShopVo getNearbyShop(AppNearbyShopDto appNearbyShopDto,Member member){
        AppNearbyShopVo appNearbyShopVo = new AppNearbyShopVo();
        Shop shop = null;
        if(member.getRelationShopId()!=null){
        //获取附近商户
        AppNearShopVo appNearShopVo = shopMapper.getNearbyShop(appNearbyShopDto);
        shop = this.getById(appNearShopVo.getShopId());
        if(member!=null&&member.getRelationShopId()!=null){
            //获取绑定商户
            shop = this.getById(member.getRelationShopId());
        }else{
            //获取附近商户
            shop = this.getById(1L);
        }
        if(member.getBindingFlag()!=1){
        if(member!=null&&member.getBindingFlag()!=1){
            AppMemberBindingDto appMemberBindingDto = new AppMemberBindingDto();
            appMemberBindingDto.setShopId(shop.getShopId());
            appMemberBindingDto.setUserId(member.getUserId());
@@ -385,4 +382,18 @@
        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;
    }


}