he2802 1 рік тому
батько
коміт
1e18af304a

+ 2 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/order/bo/OrderHandleQueryBo.java

@@ -90,4 +90,6 @@ public class OrderHandleQueryBo extends BaseEntity {
 	/** 经办手机号 */
 	@ApiModelProperty("经办手机号")
 	private String telphone;
+	@ApiModelProperty("录单订单编号")
+	private String inputOrderSn;
 }

+ 7 - 3
zhongzheng-system/src/main/resources/mapper/modules/order/OrderHandleMapper.xml

@@ -171,13 +171,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             og.goods_id,
             oh.pay_status
         FROM
-        order_handle oh
-        LEFT JOIN  `order` o ON oh.handle_order_sn = o.handle_order_sn
+         `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
-            oh.handle_order_sn = #{handleOrderSn}
+            <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>