20220902

xiaoyong931011

2022-09-06 4c90ddfec52291a0977c9cea0df6fa0acfec6e03

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

@@ -74,6 +74,7 @@
        <result column="carriage" property="carriage" />
        <result column="remark" property="remark" />
        <result column="del_flag" property="delFlag" />
        <result column="is_home" property="isHome" />
        <collection property="items" ofType="cc.mrbird.febs.mall.entity.MallOrderItem">
            <id property="id" column="item_id" />
            <result property="orderId" column="order_id" />
@@ -87,6 +88,7 @@
            <result property="price" column="price" />
            <result property="amount" column="amount" />
            <result property="isNormal" column="is_normal" />
            <result property="state" column="state" />
        </collection>
    </resultMap>

@@ -101,6 +103,7 @@
        b.style_name,
        b.sku_name,
        b.sku_image,
        b.state,
        b.cnt,
        b.price,
        b.amount
@@ -124,7 +127,7 @@
                and a.status = #{record.status}
            </if>
            <if test="record.status == 5">
                and a.status = 7
                and (a.status = 6 or b.state = 2)
            </if>
            <if test="record.status == 1">
                and a.status = 2