src/main/java/cc/mrbird/febs/common/enumerates/YesOrNoOrIngEnum.java | ●●●●● patch | view | raw | blame | history | |
src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallGoodsService.java | ●●●●● patch | view | raw | blame | history | |
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java | ●●●●● patch | view | raw | blame | history |
src/main/java/cc/mrbird/febs/common/enumerates/YesOrNoOrIngEnum.java
New file @@ -0,0 +1,26 @@ package cc.mrbird.febs.common.enumerates; import lombok.Getter; @Getter public enum YesOrNoOrIngEnum { /** * */ YES(1, "成功、是"), NO(0, "失败、否"), ING(2, "进行中、运行中"); private final int value; private final String desc; YesOrNoOrIngEnum(int value, String desc) { this.value = value; this.desc = desc; } } src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallGoodsService.java
@@ -13,6 +13,7 @@ import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.json.JSONUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -1008,9 +1009,11 @@ @Override public List<AdminMallGoodsCouponTreeListVo> findAdminMallGoodsVoTreeList() { QueryWrapper<MallGoods> objectQueryWrapper = new QueryWrapper<>(); objectQueryWrapper.eq("is_sale",1); List<MallGoods> mallGoodsList = mallGoodsMapper.selectList(objectQueryWrapper); List<MallGoods> mallGoodsList = mallGoodsMapper.selectList( new LambdaQueryWrapper<MallGoods>() .select(MallGoods::getId, MallGoods::getGoodsName) .eq(MallGoods::getIsSale, MallGoods.ISSALE_STATUS_ENABLE) ); List<AdminMallGoodsCouponTreeListVo> objects = new ArrayList<>(); if(CollUtil.isNotEmpty(mallGoodsList)){ src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java
@@ -93,11 +93,6 @@ Long memberId = LoginUserUtil.getLoginUser().getId(); MallMember member = mallMemberMapper.selectById(memberId); //验证用户的等级 // if(AgentLevelEnum.ZERO_LEVEL.name().equals(member.getLevel())){ // throw new FebsException("请先申请成为代理人"); // } //订单范围内才允许下单 MallAddressInfo address = mallAddressInfoMapper.selectAddressInfoByMemberIdAndId(member.getId(), addOrderDto.getAddressId()); if(ObjectUtil.isEmpty(address)){