bug

jiangqs

2023-08-15 bb95ec391d10f04702822705ecb82c027e849b98

 ruoyi-modules/ruoyi-order/src/main/resources/mapper/order/OrderMapper.xml

@@ -36,20 +36,25 @@
        <result column="shopId" property="shopId" />
        <result column="orderFrom" property="orderFrom" />
        <result column="createTime" property="createTime" />
        <collection property="appUserOrderGoodsPageVoList" ofType="com.ruoyi.order.domain.vo.AppUserOrderGoodsPageVo">
            <result column="orderGoodsId" property="orderGoodsId"/>
            <result column="goodsId" property="goodsId"/>
            <result column="goodsName" property="goodsName"/>
            <result column="goodsIntroduction" property="goodsIntroduction"/>
            <result column="goodsPicture" property="goodsPicture"/>
            <result column="goodsType" property="goodsType"/>
            <result column="buyNum" property="buyNum"/>
            <result column="goodsPrice" property="goodsPrice"/>
            <result column="goodsRealPrice" property="goodsRealPrice" />
            <result column="cycleNumFlag" property="cycleNumFlag" />
            <result column="serviceNum" property="serviceNum" />
        <collection property="appUserOrderGoodsPageVoList" ofType="com.ruoyi.order.domain.vo.AppUserOrderGoodsPageVo" select="listOrderGoodsByOrderId" column="orderId">
        </collection>
    </resultMap>

    <resultMap id="com.ruoyi.order.domain.vo.AppUserOrderGoodsPageVo" type="orderGoodsResultMap">
        <result column="orderGoodsId" property="orderGoodsId"/>
        <result column="goodsId" property="goodsId"/>
        <result column="goodsName" property="goodsName"/>
        <result column="goodsIntroduction" property="goodsIntroduction"/>
        <result column="goodsPicture" property="goodsPicture"/>
        <result column="goodsType" property="goodsType"/>
        <result column="buyNum" property="buyNum"/>
        <result column="goodsPrice" property="goodsPrice"/>
        <result column="goodsRealPrice" property="goodsRealPrice" />
        <result column="cycleNumFlag" property="cycleNumFlag" />
        <result column="serviceNum" property="serviceNum" />
    </resultMap>



    <resultMap id="merOrderResultMap" type="com.ruoyi.order.domain.vo.MerOrderPageVo">
        <result column="userId" property="userId"/>
@@ -263,17 +268,6 @@
        toc.receivable_money receivableMoney,
        toc.goods_num goodsNum,
        toc.shop_id shopId,
        tog.goods_id goodsId,
        tog.goods_name goodsName,
        tog.goods_introduction goodsIntroduction,
        tog.goods_picture goodsPicture,
        tog.order_goods_id orderGoodsId,
        tog.goods_type goodsType,
        tog.buy_num buyNum,
        tog.goods_price goodsPrice,
        tog.goods_total_money goodsRealPrice,
        tog.cycle_num_flag cycleNumFlag,
        tog.service_num serviceNum,
        toc.create_time createTime
        FROM t_order toc
        INNER JOIN t_order_goods tog ON tog.order_id = toc.order_id
@@ -290,6 +284,23 @@
        ORDER BY toc.create_time DESC
    </select>

    <select id="listOrderGoodsByOrderId" resultMap="orderGoodsResultMap">
        SELECT
            tog.goods_id goodsId,
            tog.goods_name goodsName,
            tog.goods_introduction goodsIntroduction,
            tog.goods_picture goodsPicture,
            tog.order_goods_id orderGoodsId,
            tog.goods_type goodsType,
            tog.buy_num buyNum,
            tog.goods_price goodsPrice,
            tog.goods_total_money goodsRealPrice,
            tog.cycle_num_flag cycleNumFlag,
            tog.service_num serviceNum
        FROM t_order_goods tog
        WHERE tog.order_id = #{orderId}
    </select>

    <select id="pageMerMemberNoClearOrder" resultType="com.ruoyi.order.domain.vo.MerMemberNoClearOrderVo">
        SELECT
        toc.order_id orderId,