Merge remote-tracking branch 'origin/2.0' into 2.0

Pu Zhibing

2 天以前 1730a7fc4bb96f258d9dc8dec2e629cadbfdefc0

 ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/shop/ShopService.java

@@ -8,9 +8,12 @@
import com.ruoyi.common.core.domain.R;
import com.ruoyi.shop.domain.dto.*;
import com.ruoyi.shop.domain.vo.*;
import com.ruoyi.shop.domain.vo.MgtShopPageVo;
import com.ruoyi.system.api.domain.dto.MGtOneClinkSyncingShopPageDTO;
import com.ruoyi.system.api.domain.dto.MerBaseDto;
import com.ruoyi.system.api.domain.dto.MgtBasePlatformDto;
import com.ruoyi.system.api.domain.dto.MgtShopIdByCodeDto;
import com.ruoyi.system.api.domain.poji.config.OneClinkSyncing;
import com.ruoyi.system.api.domain.poji.member.Member;
import com.ruoyi.system.api.domain.poji.shop.Shop;
import com.ruoyi.system.api.domain.vo.*;
@@ -71,7 +74,7 @@
     * @param mgtShopPageDto
     * @return
     */
    List<MgtShopPageVo> pageMgtShop(Page page, MgtShopPageDto mgtShopPageDto,List<Long> scope);
    List<MgtShopPageVo> pageMgtShop(Page page, MgtShopPageDto mgtShopPageDto, List<Long> scope);

    /**
     * 获取商户详情
@@ -468,4 +471,22 @@
     * @return
     */
    List<Shop> getFranchiseeIdsBYDealerId(Long shopId);
    /**
     * 修改商户类型
     * @param shopId
     * @return
     */
    R<Void> changeShopType(Long shopId);

    /**
     * 根据ids分页获取一键同步的商户信息
     * @param dto
     * @return
     */
    Page<MgtOneClinkSyncingShopPageVo> getMgtShopPageVoByShopIds(MGtOneClinkSyncingShopPageDTO dto);

    /**
     * 一键同步商户信息
     */
    R updateShopByOneClinkSyncing(OneClinkSyncing oneClinkSyncing);
}