修改bug

Pu Zhibing

18 小时以前 981aacc8d5de2638a0f5b3eb2585e64cfaf2807d

 ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/console/ShopController.java

@@ -1,6 +1,8 @@
package com.ruoyi.shop.controller.console;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.constant.CacheConstants;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.exception.ServiceException;
@@ -14,6 +16,7 @@
import com.ruoyi.shop.service.task.ShopTaskService;
import com.ruoyi.system.api.constant.AppErrorConstant;
import com.ruoyi.system.api.domain.dto.*;
import com.ruoyi.system.api.domain.poji.config.OneClinkSyncing;
import com.ruoyi.system.api.domain.poji.shop.Shop;
import com.ruoyi.system.api.domain.poji.sys.SysUser;
import com.ruoyi.system.api.domain.vo.*;
@@ -21,10 +24,7 @@
import com.ruoyi.system.api.model.QwUserDetailDto;
import com.ruoyi.system.api.service.RemoteUserService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;
import java.util.List;
@@ -451,8 +451,46 @@
     * @param shopId
     * @return
     */
    @PostMapping("/shop/getFranchiseeIdsBYDealerId")
    @PostMapping("/getFranchiseeIdsBYDealerId")
    List<Shop> getFranchiseeIdsBYDealerId(@RequestBody Long shopId){
        return shopService.getFranchiseeIdsBYDealerId(shopId);
    }

    /**
     * 根据shopIds分页查看
     * @param dto
     * @return
     */
    @PostMapping("/getMgtShopPageVoByShopIds")
    Page<MgtOneClinkSyncingShopPageVo> getMgtShopPageVoByShopIds(@RequestBody MGtOneClinkSyncingShopPageDTO dto){
        return  shopService.getMgtShopPageVoByShopIds(dto);
    }

    /**
     * 一键同步商户信息
     */
    @PostMapping("/updateShopByOneClinkSyncing")
    R updateShopByOneClinkSyncing(@RequestBody OneClinkSyncing oneClinkSyncing){
        return shopService.updateShopByOneClinkSyncing(oneClinkSyncing);
    }

    /**
     * 根据shopName模糊查询门店集合
     */
    @PostMapping("/getShopListByShopName")
    List<Shop> getShopListByShopName(@RequestBody String content){
        return  shopService.getBaseMapper().selectList(new LambdaQueryWrapper<Shop>().like(Shop::getShopName, content));
    }
    
    
    /**
     * 获取有跟进任务的用户id
     * @param shopId
     * @return
     */
    @PostMapping("/getMemberIngTotal")
    public R<List<Integer>> getMemberIngTotal(@RequestParam("shopId") Long shopId){
        List<Integer> list = memberTaskService.getMemberIngTotal(shopId);
        return R.ok(list);
    }
}