联调bug和统计完善

jiangqs

2023-06-30 cbc564a7088503ad8cc7af4e1d2ba417d061e615

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

@@ -4,12 +4,16 @@
import com.ruoyi.common.core.exception.ServiceException;
import com.ruoyi.shop.domain.pojo.shop.ShopRelUser;
import com.ruoyi.shop.domain.pojo.shop.ShopStaff;
import com.ruoyi.shop.service.shop.ShopRelUserService;
import com.ruoyi.shop.service.shop.ShopService;
import com.ruoyi.shop.service.shop.ShopStaffService;
import com.ruoyi.shop.service.shop.*;
import com.ruoyi.shop.service.task.MemberTaskService;
import com.ruoyi.shop.service.task.ShopTaskService;
import com.ruoyi.system.api.domain.dto.MgtBaseBathDto;
import com.ruoyi.system.api.domain.dto.MgtBasePlatformDto;
import com.ruoyi.system.api.domain.dto.MgtShopIdByCodeDto;
import com.ruoyi.system.api.domain.dto.ShopTotalChangeDto;
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.ShopRelUserVo;
import com.ruoyi.system.api.domain.vo.*;
import com.ruoyi.system.api.model.QwH5LoginVo;
import com.ruoyi.system.api.model.QwUserDetailDto;
import com.ruoyi.system.api.service.RemoteUserService;
@@ -19,6 +23,7 @@
import org.springframework.web.bind.annotation.RestController;

import javax.annotation.Resource;
import java.util.List;
import java.util.Optional;

/**
@@ -43,6 +48,18 @@

    @Resource
    private RemoteUserService remoteUserService;

    @Resource
    private ShopSuggestService shopSuggestService;

    @Resource
    private ShopTaskService shopTaskService;

    @Resource
    private ShopTotalService shopTotalService;

    @Resource
    private MemberTaskService memberTaskService;

    /**
     * 企业微信H5登录
@@ -97,4 +114,110 @@
        shopService.deleteShopTag(tag);
        return R.ok();
    }

    /**
     * @description
     * @author  jqs
     * @date    2023/6/9 10:18
     * @param suggestTag
     * @return  R
     */
    @PostMapping("/deleteShopSuggestTag")
    public R deleteShopSuggestTag(@RequestBody String suggestTag)
    {
        shopSuggestService.deleteShopSuggestTag(suggestTag);
        return R.ok();
    }

    /**
     * @description  通过区域代码获取shopId
     * @author  jqs
     * @date    2023/6/21 15:50
     * @param mgtShopIdByCodeDto
     * @return  R<MgtShopIdByCodeVo>
     */
    @PostMapping("/getShopIdByCode")
    public R<MgtShopIdByCodeVo> getShopIdByCode(@RequestBody MgtShopIdByCodeDto mgtShopIdByCodeDto)
    {
        MgtShopIdByCodeVo mgtShopIdByCodeVo = shopService.getShopIdByCode(mgtShopIdByCodeDto);
        return R.ok(mgtShopIdByCodeVo);
    }

    /**
     * @description  通过id获取商户简易信息list
     * @author  jqs
     * @date    2023/6/21 15:50
     * @param mgtBaseBathDto
     * @return  R<List<MgtSimpleShopVo>>
     */
    @PostMapping("/listShopSimpleVoByIds")
    public R<List<MgtSimpleShopVo>> listShopSimpleVoByIds(@RequestBody MgtBaseBathDto mgtBaseBathDto)
    {
        List<MgtSimpleShopVo> mgtShopListSimpleVos = shopService.listShopSimpleVoByIds(mgtBaseBathDto.getIds());
        return R.ok(mgtShopListSimpleVos);
    }

    /**
     * @description boardShopTotal
     * @param
     * @return R<MgtBulletinBoardVo>
     * @author jqs34
     * @date 2023/6/18 16:45
     */
    @PostMapping("/boardShopTotal")
    public R<MgtBulletinBoardVo> boardShopTotal()
    {
        MgtBulletinBoardVo bulletinBoardVo = new MgtBulletinBoardVo();
        MgtBulletinBoardVo bulletinBoardVoShop = shopService.boardShopTotal();
        MgtBulletinBoardVo bulletinBoardVoTask = shopTaskService.boardTaskTotal();
        bulletinBoardVo.setShopTotal(bulletinBoardVoShop.getShopTotal());
        bulletinBoardVo.setDealerTotal(bulletinBoardVoShop.getDealerTotal());
        bulletinBoardVo.setAgencyTotal(bulletinBoardVoShop.getAgencyTotal());
        bulletinBoardVo.setFollowShopToday(bulletinBoardVoTask.getFollowShopToday());
        return R.ok(bulletinBoardVo);
    }

    /**
    * @description 获取平台统计shopId
    * @param mgtBasePlatformDto
    * @return R<List<Long>>
    * @author jqs34
    * @date 2023/6/23 14:14
    */
    @PostMapping("/listShopIdByPlTotal")
    public R<List<Long>> listShopIdByPlTotal(@RequestBody MgtBasePlatformDto mgtBasePlatformDto)
    {
        List<Long> shopIdList = shopService.listShopIdByPlTotal(mgtBasePlatformDto);
        return R.ok(shopIdList);
    }


    /**
     * @description  更新商户统计
     * @author  jqs
     * @date    2023/6/28 17:52
     * @param shopTotalChangeDto
     * @return  R
     */
    @PostMapping("/changeShopTotal")
    public R changeShopTotal(@RequestBody ShopTotalChangeDto shopTotalChangeDto)
    {
        shopTotalService.changeShopTotal(shopTotalChangeDto);
        return R.ok();
    }

    /**
     * @description  获取最近任务
     * @author  jqs
     * @date    2023/6/29 18:25
     * @param userId
     * @return  R<MemberTaskSimpleVo>
     */
    @PostMapping("/getLastMemberTask")
    public R<MemberTaskSimpleVo> getLastMemberTask(@RequestBody Long userId)
    {
        MemberTaskSimpleVo taskSimpleVo = memberTaskService.getLastMemberTask(userId);
        return R.ok(taskSimpleVo);
    }

}