完善数据库和框架

jiangqs

2023-05-25 c203ff63489126a94d1be5dbfe32cadb69a70594

 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;

@@ -335,11 +335,14 @@
        AppNearbyShopVo appNearbyShopVo = new AppNearbyShopVo();
        Shop shop = null;
        //获取附近商户
        AppNearShopVo appNearShopVo = shopMapper.getNearbyShop(appNearbyShopDto);
        shop = this.getById(appNearShopVo.getShopId());
        if(member!=null&&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{
            return appNearbyShopVo;
        }
        if(member!=null&&member.getBindingFlag()!=1){
            AppMemberBindingDto appMemberBindingDto = new AppMemberBindingDto();