管理台bug和用户端生日卡

jiangqs

2023-07-07 5627daeb1ac1a29947e902f9a7efb6730ed98611

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

@@ -4,19 +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.ShopSuggestService;
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.MgtBulletinBoardVo;
import com.ruoyi.system.api.domain.vo.MgtShopIdByCodeVo;
import com.ruoyi.system.api.domain.vo.MgtSimpleShopVo;
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;
@@ -58,6 +55,11 @@
    @Resource
    private ShopTaskService shopTaskService;

    @Resource
    private ShopTotalService shopTotalService;

    @Resource
    private MemberTaskService memberTaskService;

    /**
     * 企业微信H5登录
@@ -127,6 +129,13 @@
        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)
    {
@@ -134,6 +143,13 @@
        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)
    {
@@ -160,4 +176,98 @@
        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);
    }

    /**
     * @description  获取商户下属代理商
     * @author  jqs
     * @date    2023/7/3 17:26
     * @return  R<List<Long>>
     */
    @PostMapping("/listShopIdByShopId")
    public R<List<Long>> listShopIdByShopId(@RequestBody Long shopId)
    {
        List<Long> shopIdList = shopService.listShopIdByShopId(shopId);
        return R.ok(shopIdList);
    }

    /**
     * @description  获取未回复数量
     * @author  jqs
     * @date    2023/7/5 12:49
     * @param
     * @return  R<Integer>
     */
    @PostMapping("/getUnReplaySuggestVo")
    public R<Integer> getUnReplaySuggestVo()
    {
        Integer count = shopSuggestService.getUnReplaySuggestVo();
        return R.ok(count);
    }

    /**
     * @description  获取商户营销状态
     * @author  jqs
     * @date    2023/7/7 14:05
     * @param shopId
     * @return  R<Integer>
     */
    @PostMapping("/getShopMarketingStatus")
    public R<Integer> getShopMarketingStatus(@RequestBody Long shopId)
    {
        Shop shop = shopService.getByShopId(shopId);
        Integer platformCouponFlag = shop.getPlatformCouponFlag();
        Integer platformBirthdayFlag = shop.getPlatformBirthdayFlag();
        Integer marketingStatus = 0;
        if(platformCouponFlag==1&&platformBirthdayFlag==0){
            marketingStatus = 1;
        }else if(platformCouponFlag==0&&platformBirthdayFlag==1){
            marketingStatus = 2;
        }else if(platformCouponFlag==1&&platformBirthdayFlag==1){
            marketingStatus = 3;
        }
        return R.ok(marketingStatus);
    }
}