修改bug

Pu Zhibing

2025-07-12 981aacc8d5de2638a0f5b3eb2585e64cfaf2807d

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

@@ -36,6 +36,7 @@
        <result column="shopId" property="shopId" />
        <result column="orderFrom" property="orderFrom" />
        <result column="createTime" property="createTime" />
        <result column="cancelType" property="cancelType" />
        <collection property="appUserOrderGoodsPageVoList"
                    ofType="com.ruoyi.order.domain.vo.AppUserOrderGoodsPageVo"
                    select="listOrderGoodsByOrderId"
@@ -87,6 +88,7 @@
        <result column="orderRemark" property="orderRemark" />
        <result column="orderFrom" property="orderFrom" />
        <result column="createTime" property="createTime" />
        <result column="tripartiteOrderId" property="tripartiteOrderId" />
        <collection property="merOrderGoodsVoList"
                    ofType="com.ruoyi.order.domain.vo.MerOrderGoodsPageVo"
                    select="listSimpleOrderGoodsByOrderId"
@@ -296,7 +298,8 @@
        toc.receivable_money receivableMoney,
        toc.goods_num goodsNum,
        toc.shop_id shopId,
        toc.create_time createTime
        toc.create_time createTime,
        toc.cancel_type cancelType,
        FROM t_order toc
        WHERE toc.del_flag = 0
        <if test="param.userId != null">
@@ -380,7 +383,8 @@
        toc.order_from orderFrom,
        CASE toc.order_from WHEN 1 THEN '商城订单' WHEN 2 THEN CONCAT('平台秒杀活动(',toc.activity_name,')') WHEN 3 THEN
        '线下创建' END orderFromDesc,
        toc.activity_name activityName
        toc.activity_name activityName,
        toc.tripartite_order_id tripartiteOrderId
        FROM t_order toc
        WHERE toc.del_flag = 0 AND toc.shop_id = #{param.shopId}
        <if test="param.memberUserId != null and param.memberUserId != ''">