|
@@ -263,7 +263,7 @@
|
263
|
263
|
SELECT
|
264
|
264
|
t.*,
|
265
|
265
|
t3.audit_status,
|
266
|
|
- t3.audit_result,
|
|
266
|
+ t3.audit_result
|
267
|
267
|
FROM
|
268
|
268
|
ta_org_order t
|
269
|
269
|
INNER JOIN ta_org_order_detail t2 ON t.order_id = t2.order_id AND t2.item_type = 'refund'
|
|
@@ -277,7 +277,7 @@
|
277
|
277
|
<if test=" auditStatus != null and auditStatus != ''">
|
278
|
278
|
AND t3.audit_status = #{auditStatus}
|
279
|
279
|
</if>
|
280
|
|
- <if test=" refundStartTime!= null">
|
|
280
|
+ <if test=" refundStartTime != null">
|
281
|
281
|
AND t.create_date >= #{refundStartTime}
|
282
|
282
|
</if>
|
283
|
283
|
<if test=" refundEndTime != null">
|
|
@@ -382,17 +382,11 @@
|
382
|
382
|
<if test = " orderId != null and orderId != ''">
|
383
|
383
|
AND t.order_id like concat( '%',#{orderId},'%')
|
384
|
384
|
</if>
|
385
|
|
- <if test = " tradeNo != null and tradeNo != ''">
|
386
|
|
- AND t.trade_no like concat( '%',#{tradeNo},'%')
|
387
|
|
- </if>
|
388
|
|
- <if test = " wxOrderId != null and wxOrderId != ''">
|
389
|
|
- AND t.wx_order_id like concat ('%',#{wxOrderId},'%')
|
390
|
|
- </if>
|
391
|
385
|
<if test = " startTime != null ">
|
392
|
386
|
AND t.create_date >= #{startTime}
|
393
|
387
|
</if>
|
394
|
|
- <if test = " entartTime != null and">
|
395
|
|
- AND t.create_date <= #{entartTime}
|
|
388
|
+ <if test = " endTime != null">
|
|
389
|
+ AND t.create_date <= #{endTime}
|
396
|
390
|
</if>
|
397
|
391
|
<if test = " status != null">
|
398
|
392
|
AND t2.status = #{status}
|
|
@@ -432,17 +426,11 @@
|
432
|
426
|
<if test = " orderId != null and orderId != ''">
|
433
|
427
|
AND t.order_id like concat( '%',#{orderId},'%')
|
434
|
428
|
</if>
|
435
|
|
- <if test = " tradeNo != null and tradeNo != ''">
|
436
|
|
- AND t.trade_no like concat( '%',#{tradeNo},'%')
|
437
|
|
- </if>
|
438
|
|
- <if test = " wxOrderId != null and wxOrderId != ''">
|
439
|
|
- AND t.wx_order_id like concat ('%',#{wxOrderId},'%')
|
440
|
|
- </if>
|
441
|
429
|
<if test = " startTime != null ">
|
442
|
430
|
AND t.create_date >= #{startTime}
|
443
|
431
|
</if>
|
444
|
|
- <if test = " entartTime != null and">
|
445
|
|
- AND t.create_date <= #{entartTime}
|
|
432
|
+ <if test = " endTime != null">
|
|
433
|
+ AND t.create_date <= #{endTime}
|
446
|
434
|
</if>
|
447
|
435
|
<if test = " status != null">
|
448
|
436
|
AND t2.status = #{status}
|