he2802 1 gadu atpakaļ
vecāks
revīzija
4f6c3a22e8

+ 33 - 26
zhongzheng-system/src/main/resources/mapper/modules/order/OrderHandleMapper.xml

@@ -158,33 +158,40 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectOrderGoodsList" parameterType="com.zhongzheng.modules.order.bo.OrderHandleQueryBo" resultMap="OrderHandleGoodsVoResult">
         SELECT
-            u.realname,
-            u.id_card,
-            u.telphone,
-            g.goods_name,
-            g.`year`,
-            (SELECT GROUP_CONCAT(subject_name) from course_subject where FIND_IN_SET(id,g.subject_ids)) subject_names,
-            og.goods_real_price,
-            og.order_goods_id,
-            o.user_id,
-            og.grade_id,
-            og.goods_id,
-            oh.pay_status
+        u.realname,
+        u.id_card,
+        u.telphone,
+        g.goods_name,
+        g.`year`,
+        (SELECT GROUP_CONCAT(subject_name) from course_subject where FIND_IN_SET(id,g.subject_ids)) subject_names,
+        og.goods_real_price,
+        og.order_goods_id,
+        o.user_id,
+        og.grade_id,
+        <if test="handleOrderSn != null">
+            oh.pay_status,
+        </if>
+        og.goods_id
+
         FROM
-            `order` o
-            LEFT JOIN order_goods og ON o.order_sn = og.order_sn
-            LEFT JOIN `user` u ON o.user_id = u.user_id
-            LEFT JOIN goods g ON og.goods_id = g.goods_id
-            WHERE 1=1
-            <if test="handleOrderSn != null">
-                AND o.handle_order_sn = #{handleOrderSn}
-            </if>
-            <if test="inputOrderSn != null">
-                AND o.input_order_sn = #{inputOrderSn}
-            </if>
-            <if test="refundStatus != null">
-                AND og.refund_status = #{refundStatus}
-            </if>
+        `order` o
+        <if test="handleOrderSn != null">
+            LEFT JOIN order_handle oh ON o.handle_order_sn = oh.handle_order_sn
+        </if>
+        LEFT JOIN order_goods og ON o.order_sn = og.order_sn
+        LEFT JOIN `user` u ON o.user_id = u.user_id
+        LEFT JOIN goods g ON og.goods_id = g.goods_id
+        WHERE
+        1=1
+        <if test="handleOrderSn != null">
+            AND o.handle_order_sn = #{handleOrderSn}
+        </if>
+        <if test="inputOrderSn != null">
+            AND o.input_order_sn = #{inputOrderSn}
+        </if>
+        <if test="refundStatus != null">
+            AND og.refund_status = #{refundStatus}
+        </if>
     </select>
 
     <select id="selectOverTimeOrderList" parameterType="com.zhongzheng.modules.order.bo.OrderHandleQueryBo" resultType="com.zhongzheng.modules.order.vo.OrderHandleOverVo">