bug修复

mitao

2024-05-23 95c67a5dd1f0ae0651c84f76e429fef6c601f1c2

 meiya-rest/src/main/java/com/sinata/rest/modular/mall/controller/MallGoodsGroupController.java

@@ -3,11 +3,13 @@
import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.google.common.collect.Lists;
import com.sinata.common.enums.EnumMemberGrade;
import com.sinata.common.enums.mall.EnumMallGoodsGroupType;
import com.sinata.common.enums.mall.EnumMallOrderState;
import com.sinata.common.user.VoUserGradeParent;
import com.sinata.rest.common.ApiUtils;
import com.sinata.rest.core.juhe.TelecomUtil;
import com.sinata.rest.core.util.ToolUtil;
import com.sinata.rest.modular.mall.controller.body.BodyApplySaleUser;
import com.sinata.rest.modular.mall.controller.body.BodyUserAuthentication;
import com.sinata.rest.modular.mall.controller.vo.*;
@@ -65,7 +67,28 @@

    @Autowired
    private IMallGoodsService mallGoodsService;

    @GetMapping(value = "/purchase-auth")
    @ApiOperation(value = "营销员购买套餐权限校验")
    @ApiImplicitParams({
            @ApiImplicitParam(name = "userId", value = "用户ID", defaultValue = "1", dataType = "Int", paramType = "query", required = true),
            @ApiImplicitParam(name = "shareUserId", value = "分享套餐用户ID", defaultValue = "1", dataType = "Int", paramType = "query", required = true)
    })
    public ApiUtils purchaseAuth(@RequestParam(value = "userId") Integer userId,@RequestParam("shareUserId") Integer shareUserId) {
        MemUser user = memUserService.getById(userId);
        MemUser shareUser = memUserService.getById(shareUserId);
        Integer isLeaveOffice = user.getIsLeaveOffice();
        Integer memberGradeId = user.getMemberGradeId();
        if (ToolUtil.isNotEmpty(user) && ToolUtil.isNotEmpty(shareUser)) {
//            营销员不可购买营销员分享的套餐
            if (isLeaveOffice == 0  && memberGradeId >= EnumMemberGrade.G_3.index
                    && shareUser.getIsLeaveOffice() == 0 && shareUser.getMemberGradeId()>= EnumMemberGrade.G_3.index) {
                if (!userId.equals(shareUserId)) {
                    return ApiUtils.returnNG("营销员只能购买自己分享的套餐！");
                }
            }
        }
        return ApiUtils.returnOK();
    }
    @GetMapping(value = "/myShare")
    @ApiOperation(value = "我的推广")
    @ApiImplicitParams({
@@ -108,7 +131,13 @@

        List<VoMallOrderEquity> voList = BeanUtil.copyToList(list, VoMallOrderEquity.class);
        voList.stream().map(o -> toVoMallOrderEquity(o, vipEquityList)).collect(Collectors.toList());

        for (VoMallOrderEquity voMallOrderEquity : voList) {
            for (MallOrder mallOrder : list) {
                if (voMallOrderEquity.getOrderNo().equals(mallOrder.getOrderNo())) {
                    voMallOrderEquity.setPriceSale(mallOrder.getPayMoney());
                }
            }
        }
        return ApiUtils.returnOK(voList);
    }
    private VoMallOrderEquity toVoMallOrderEquity(VoMallOrderEquity o,List<MallVipEquity> vipEquityList) {
@@ -129,7 +158,6 @@
        MallGoods goods = mallGoodsService.getById(o.getGoodsId());
        Optional.ofNullable(goods).ifPresent(item ->{
            o.setGoodsName(item.getGoodsName());
            o.setPriceSale(item.getPriceSale());
            o.setGoodsImage(item.getGoodsImage());
        });
        return o;