Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/HongRuiTang...

puzhibing

4 天以前 3dddd301e97c263dda6326c89fa11176d5960b04

 ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/mapper/shop/ShopMapper.java

@@ -4,13 +4,12 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.shop.domain.dto.*;
import com.ruoyi.shop.domain.vo.*;
import com.ruoyi.system.api.domain.dto.MGtOneClinkSyncingShopPageDTO;
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.shop.Shop;
import com.ruoyi.system.api.domain.vo.MgtBulletinBoardVo;
import com.ruoyi.system.api.domain.vo.MgtMapIntTotalVo;
import com.ruoyi.system.api.domain.vo.MgtSimpleShopVo;
import com.ruoyi.system.api.domain.vo.MgtUserTaskMsgVo;
import com.ruoyi.system.api.domain.vo.*;
import org.apache.ibatis.annotations.Param;

import java.util.List;
@@ -39,7 +38,7 @@
     * @param mgtShopPageDto
     * @return
     */
    List<MgtShopPageVo> pageMgtShop(Page page, @Param("param") MgtShopPageDto mgtShopPageDto,@Param("list") List<Long> scope);
    List<MgtShopPageVo> pageMgtShop(Page page, @Param("param") MgtShopPageDto mgtShopPageDto,@Param("list") List<Long> scope, @Param("associatedAccount")List<Integer> associatedAccount);


    /**
@@ -153,7 +152,7 @@
    * @author jqs34
    * @date 2023/6/18 17:01
    */
    MgtBulletinBoardVo shopTotal();
    MgtBulletinBoardVo shopTotal(@Param("userIds") List<Long> userIds);

    /**
     * @description  获取平台商户统计
@@ -161,7 +160,7 @@
     * @date    2023/6/21 16:25
     * @return  MgtPlTotalShopTotalVo
     */
    MgtPlTotalShopTotalVo getPlTotalShopTotal();
    MgtPlTotalShopTotalVo getPlTotalShopTotal(@Param("userIds") List<Long> userIds);

    /**
     * @description  获取统计关联shopId
@@ -293,4 +292,24 @@
     * @return  List<Long>
     */
    List<Shop> listShopByCityCode(@Param("cityCodes")List<String> cityCodes);

    List<Shop> getFranchiseeIdsBYDealerId(@Param("shopId")Long shopId);


    /**
     * 设置加盟商的归属经销商为null
     * @param shopId
     */
    void setBelongShopIdNull(@Param("shopId")Long shopId);

    /**
     * 根据shopIds获取一键同步的店铺信息
     * @param page
     * @param scope
     * @return
     */
    List<MgtOneClinkSyncingShopPageVo> getMgtShopPageVoByShopIds(Page page, @Param("list") List<Long> scope);

    void updateShopByOneClinkSyncing(@Param("param") OneClinkSyncing oneClinkSyncing);

}