20220902

xiaoyong931011

2022-09-22 217970e78188737cb560fd364a3ef2969687271f

20220902

 src/main/java/cc/mrbird/febs/mall/mapper/MallTeamLeaderMapper.java

@@ -36,4 +36,6 @@
    MallTeamLeader selectByFenceIdAndFenceNameAndLonAndLat(@Param("longitude")Double longitude, @Param("latitude")Double latitude,@Param("fenceId")String gfid, @Param("fenceName")String gfname);

    List<MallTeamLeader> getAllMallTeamLeaderList();

    IPage<MallOrderInfo> selectNewApiLeaderOrderListInPage(IPage<MallOrderInfo> page, @Param("record")ApiLeaderOrderListDto apiLeaderOrderListDto);
}

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

@@ -179,7 +179,17 @@
        MallMember member = LoginUserUtil.getLoginUser();
        IPage<MallOrderInfo> page = new Page<>(apiLeaderOrderListDto.getPageNum(), apiLeaderOrderListDto.getPageSize());
        apiLeaderOrderListDto.setMemberId(member.getId());
        IPage<MallOrderInfo> mallOrderInfos = this.baseMapper.selectApiLeaderOrderListInPage(page, apiLeaderOrderListDto);
//        IPage<MallOrderInfo> mallOrderInfos = this.baseMapper.selectApiLeaderOrderListInPage(page, apiLeaderOrderListDto);
        IPage<MallOrderInfo> mallOrderInfos = this.baseMapper.selectNewApiLeaderOrderListInPage(page, apiLeaderOrderListDto);
        if(CollUtil.isNotEmpty(mallOrderInfos.getRecords())){
            for(MallOrderInfo mallOrderInfo : mallOrderInfos.getRecords()){
                Long orderInfoId = mallOrderInfo.getId();
                List<MallOrderItem> mallOrderItemList = mallOrderItemMapper.selectListByOrderId(orderInfoId);
                if(CollUtil.isNotEmpty(mallOrderItemList)){
                    mallOrderInfo.setItems(mallOrderItemList);
                }
            }
        }
        return MallOrderInfoConversion.INSTANCE.entitysToVos(mallOrderInfos.getRecords());
    }


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

@@ -74,6 +74,7 @@
        <result column="comment_state" property="commentState" />
        <result column="delivery_state" property="deliveryState" />
        <result column="carriage" property="carriage" />
        <result column="take_code" property="takeCode" />
        <result column="remark" property="remark" />
        <result column="del_flag" property="delFlag" />
        <result column="is_home" property="isHome" />
@@ -144,6 +145,69 @@
        order by a.created_time desc
    </select>

    <resultMap id="NewOrderInfoMap" type="cc.mrbird.febs.mall.entity.MallOrderInfo">
        <id column="id" property="id" />
        <result column="order_no" property="orderNo" />
        <result column="member_id" property="memberId" />
        <result column="order_time" property="orderTime" />
        <result column="pay_time" property="payTime" />
        <result column="amount" property="amount" />
        <result column="pay_method" property="payMethod" />
        <result column="pay_order_no" property="payOrderNo" />
        <result column="pay_result" property="payResult" />
        <result column="status" property="status" />
        <result column="cancel_type" property="cancelType" />
        <result column="name" property="name" />
        <result column="phone" property="phone" />
        <result column="address" property="address" />
        <result column="longitude" property="longitude" />
        <result column="latitude" property="latitude" />
        <result column="order_type" property="orderType" />
        <result column="comment_state" property="commentState" />
        <result column="delivery_state" property="deliveryState" />
        <result column="carriage" property="carriage" />
        <result column="take_code" property="takeCode" />
        <result column="remark" property="remark" />
        <result column="del_flag" property="delFlag" />
        <result column="is_home" property="isHome" />
    </resultMap>

    <select id="selectNewApiLeaderOrderListInPage" resultMap="NewOrderInfoMap">
        select
        a.*
        from mall_order_info a
        inner join mall_member c on a.take_unique_code=c.invite_id
        <where>
            c.id=#{record.memberId}
            <if test="record.status == 4 and record.status != 0">
                and a.status = 4
            </if>
            <if test="record.status != 4 and record.status != 1 and record.status != 0 and record.status != 5">
                and a.status = #{record.status}
            </if>
            <if test="record.status == 5">
                and (a.status = 6 or b.state = 2)
            </if>
            <if test="record.status == 1">
                and a.status = 2
            </if>
            <if test="record.status == 0">
                and a.status in (2,3,4)
            </if>
            <if test="record.query != null and record.query != ''">
                and ( a.name like CONCAT('%', CONCAT(#{record.query}, '%'))
                    or a.phone like CONCAT('%', CONCAT(#{record.query}, '%'))
                    or a.take_code like CONCAT('%', CONCAT(#{record.query}, '%'))
                    )
            </if>
            <if test="record.orderType != null">
                and a.order_type=#{record.orderType}
            </if>
            and a.delivery_type = 1
        </where>
        order by a.created_time desc
    </select>

    <select id="getMallTeamLeaderList" resultType="cc.mrbird.febs.mall.entity.MallTeamLeader">
        select
            a.*