创建订单的判断条件去掉，由新增的接口判断

xiaoyong931011

2023-02-13 9e7238e145f785bc38616605cdece2c9802e95b1

创建订单的判断条件去掉，由新增的接口判断

 src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java

@@ -879,4 +879,8 @@
        return new FebsResponse().success();
    }

    public static void main(String[] args) {
        System.out.print(AgentLevelEnum.ZERO_LEVEL.name());
    }

}

 src/main/resources/mapper/modules/MallOrderInfoMapper.xml

@@ -15,18 +15,9 @@
            b.sku_image,
            b.cnt,
            b.price,
            b.amount,
            c.name leader_name,
            c.phone leader_phone,
            c.address_pic,
            c.address_area,
            c.province,
            c.city,
            c.township,
            c.detail_address
            b.amount
        from mall_order_info a
        inner join mall_order_item b on a.id=b.order_id
        inner join mall_team_leader c on a.take_unique_code=c.unique_code
        <where>
            a.del_flag=2
            <if test="record.status == 4 and record.status != 0">
@@ -168,18 +159,9 @@

    <select id="selectApiOrderListInPage" resultType="cc.mrbird.febs.mall.entity.MallOrderInfo">
        select
               a.*,
               c.name leaderName,
               c.phone leaderPhone,
               c.address_pic addressPic,
               c.address_area addressArea,
               c.province,
               c.city,
               c.township,
               c.detail_address detailAddress
               a.*
        from mall_order_info a
        inner join mall_order_item b on a.id=b.order_id
        inner join mall_team_leader c on a.take_unique_code=c.unique_code
        <where>
            a.del_flag=2
            <if test="record.memberId != null">
@@ -219,20 +201,9 @@
            b.cnt,
            b.price,
            b.amount,
            b.is_normal,
            c.name leader_name,
            c.phone leader_phone,
            c.address_pic,
            c.address_area,
            c.province,
            c.city,
            c.township,
            c.longitude leaderLongitude,
            c.latitude leaderLatitude,
            c.detail_address
            b.is_normal
        from mall_order_info a
             inner join mall_order_item b on a.id=b.order_id
             inner join mall_team_leader c on a.take_unique_code=c.unique_code
        where a.id=#{id}
    </select>

@@ -241,7 +212,6 @@
            a.status,
            count(1) cnt
        from mall_order_info a
                 inner join mall_team_leader c on a.take_unique_code=c.unique_code
        where a.del_flag=2 and a.member_id=#{memberId}
        group by a.status
    </select>
@@ -413,17 +383,8 @@

    <select id="selectNewApiOrderListInPage" resultMap="NewOrderInfoMap">
        select
        a.*,
        c.name leader_name,
        c.phone leader_phone,
        c.address_pic,
        c.address_area,
        c.province,
        c.city,
        c.township,
        c.detail_address
        a.*
        from mall_order_info a
        inner join mall_team_leader c on a.take_unique_code=c.unique_code
        <where>
            a.del_flag=2
            <if test="record.memberId != null">
@@ -455,14 +416,9 @@
        b.goods_name,
        b.cnt,
        b.price,
        b.amount,
        c.name leader_name,
        c.phone leader_phone,
        c.address_area,
        c.detail_address
        b.amount
        from mall_order_info a
        inner join mall_order_item b on a.id=b.order_id
        inner join mall_team_leader c on a.take_unique_code=c.unique_code
        where a.del_flag=2 and  a.id = #{orderId} and a.take_unique_code = #{takeUniqueCode}
        order by a.created_time desc
    </select>

 src/main/resources/mapper/modules/MallRefundMapper.xml

@@ -31,14 +31,11 @@
               c.goods_name goodsName,
               c.cnt,
               d.name refundMemberName,
               d.phone refundMemberPhone,
               e.name leaderName,
               e.phone leaderPhone
               d.phone refundMemberPhone
        from mall_refund a
        inner join mall_order_info b on a.order_id = b.id
        inner join mall_order_item c on a.item_id = c.id
        inner join mall_member d on a.member_id = d.id
        inner join mall_team_leader e on b.take_unique_code = e.unique_code
        <where>
            <if test="record != null" >
                <if test="record.state!=null and record.state!=''">
@@ -49,12 +46,6 @@
                </if>
                <if test="record.refundMemberPhone!=null and record.refundMemberPhone!=''">
                    and d.phone like concat('%',#{record.refundMemberPhone},'%')
                </if>
                <if test="record.leaderName!=null and record.leaderName!=''">
                    and e.name like concat('%',#{record.leaderName},'%')
                </if>
                <if test="record.leaderPhone!=null and record.leaderPhone!=''">
                    and e.phone like concat('%',#{record.leaderPhone},'%')
                </if>
            </if>
        </where>

 src/test/java/cc/mrbird/febs/AgentTest.java

@@ -1,10 +1,13 @@
package cc.mrbird.febs;

import cc.mrbird.febs.common.entity.FebsResponse;
import cc.mrbird.febs.common.enumerates.AgentLevelEnum;
import cc.mrbird.febs.common.enumerates.DataDictionaryEnum;
import cc.mrbird.febs.common.exception.FebsException;
import cc.mrbird.febs.common.utils.LoginUserUtil;
import cc.mrbird.febs.mall.dto.AddOrderItemDto;
import cc.mrbird.febs.mall.dto.AgentLevelUpdateDto;
import cc.mrbird.febs.mall.dto.ApiCreateOrderVerifyDto;
import cc.mrbird.febs.mall.dto.ApiMallActWinDetailsDto;
import cc.mrbird.febs.mall.entity.*;
import cc.mrbird.febs.mall.mapper.*;
@@ -63,6 +66,57 @@
    private  MallMemberWalletMapper mallMemberWalletMapper;
    @Autowired
    private  MallActSetMapper mallActSetMapper;
    @Autowired
    private  MallGoodsSkuMapper mallGoodsSkuMapper;
    @Autowired
    private  MallOrderItemMapper mallOrderItemMapper;
    @Autowired
    private  MallGoodsMapper mallGoodsMapper;
    @Test
    public void levelTest(){
        ApiCreateOrderVerifyDto apiCreateOrderVerifyDto = new ApiCreateOrderVerifyDto();
        List<AddOrderItemDto> addOrderItemDtos = new ArrayList<>();
        AddOrderItemDto addOrderItemDto = new AddOrderItemDto();
        addOrderItemDto.setCnt(1);
        addOrderItemDto.setSkuId(243L);
        addOrderItemDtos.add(addOrderItemDto);
        apiCreateOrderVerifyDto.setItems(addOrderItemDtos);
        MallMember member = mallMemberMapper.selectById(401L);
        List<AddOrderItemDto> items = apiCreateOrderVerifyDto.getItems();
        if(CollUtil.isEmpty(items)){
            System.out.println("请先挑选商品");
        }
        for (AddOrderItemDto item : apiCreateOrderVerifyDto.getItems()) {
            MallGoodsSku sku = mallGoodsSkuMapper.selectSkuInfoById(item.getSkuId());
            if (sku == null) {
                System.out.println("购买商品或sku不存在");
            }
            if("样品".equals(sku.getSample())){
                List<MallOrderItem> mallOrderItems = mallOrderItemMapper.selectItemBySkuIdUnCancel(sku.getId(), member.getId());
                if (CollUtil.isNotEmpty(mallOrderItems)) {
                    System.out.println("样品只能购买一次");
                }
                Integer cnt = item.getCnt();
                if(1 < cnt){
                    System.out.println("样品只能购买一件");
                }
            }else{
                //验证用户的等级
                if(AgentLevelEnum.ZERO_LEVEL.name().equals(member.getLevel())){
                    System.out.println(sku.getSkuName() + "请先申请成为代理人");
                }
            }

            if (sku.getStock() < item.getCnt()) {
                System.out.println(sku.getSkuName() + "库存不足");
            }

            MallGoods mallGoods = mallGoodsMapper.selectById(sku.getGoodsId());
            if (MallGoods.ISSALE_STATUS_DISABLED.equals(mallGoods.getIsSale())) {
                System.out.println(mallGoods.getGoodsName() + "已下架");
            }
        }
    }
//    @Test
//    public void skusTest() {
//        ApiMallAwardDetailsVo apiMallAwardDetailsVo = new ApiMallAwardDetailsVo();