|
@@ -337,8 +337,8 @@
|
337
|
337
|
WHERE
|
338
|
338
|
t.org_id = #{orgId}
|
339
|
339
|
AND t2.target_id = #{activityId}
|
340
|
|
- AND t2.target_type = 'redPacket'
|
341
|
|
- AND t2.item_type = 'redPacket'
|
|
340
|
+ AND t2.target_type = 'RedPacket'
|
|
341
|
+ AND t2.item_type = 'RedPacket'
|
342
|
342
|
AND t.`status` >- 1
|
343
|
343
|
<if test = " orderId != null and orderId != ''">
|
344
|
344
|
AND t.order_id like concat( '%',#{orderId},'%')
|
|
@@ -353,7 +353,7 @@
|
353
|
353
|
AND t.trading_status = #{tradingStatus}
|
354
|
354
|
</if>
|
355
|
355
|
<if test = "phone != null and phone != ''">
|
356
|
|
- AND t3.phone like concat ('%',phone,'%')
|
|
356
|
+ AND t3.phone like concat ('%',#{phone},'%')
|
357
|
357
|
</if>
|
358
|
358
|
ORDER BY
|
359
|
359
|
t.create_date DESC
|
|
@@ -363,7 +363,7 @@
|
363
|
363
|
SELECT
|
364
|
364
|
t.*,
|
365
|
365
|
t3.phone
|
366
|
|
- <if test="consumeType == 'redPacket'">
|
|
366
|
+ <if test="consumeType == 'RedPacket'">
|
367
|
367
|
,t4.activity_name
|
368
|
368
|
</if>
|
369
|
369
|
FROM
|
|
@@ -373,7 +373,7 @@
|
373
|
373
|
AND t2.item_type = #{consumeType}
|
374
|
374
|
</if>
|
375
|
375
|
LEFT JOIN ta_person t3 on t2.receiver_id = t3.person_id
|
376
|
|
- <if test="consumeType == 'redPacket'">
|
|
376
|
+ <if test="consumeType == 'RedPacket'">
|
377
|
377
|
LEFT JOIN ta_red_packet t4 ON t2.target_id = t4.activity_id
|
378
|
378
|
</if>
|
379
|
379
|
WHERE
|
|
@@ -414,8 +414,8 @@
|
414
|
414
|
SELECT
|
415
|
415
|
t.order_id,
|
416
|
416
|
t.amount,
|
417
|
|
- ( CASE t2.item_type WHEN 'redPacket' THEN '红包' ELSE '' END ) consumeType,
|
418
|
|
- <if test="consumeType == 'redPacket'">
|
|
417
|
+ ( CASE t2.item_type WHEN 'RedPacket' THEN '红包' ELSE '' END ) consumeType,
|
|
418
|
+ <if test="consumeType == 'RedPacket'">
|
419
|
419
|
t4.activity_name,
|
420
|
420
|
</if>
|
421
|
421
|
t.create_date,
|
|
@@ -428,7 +428,7 @@
|
428
|
428
|
AND t2.item_type = #{consumeType}
|
429
|
429
|
</if>
|
430
|
430
|
LEFT JOIN ta_person t3 ON t2.receiver_id = t3.person_id
|
431
|
|
- <if test="consumeType == 'redPacket'">
|
|
431
|
+ <if test="consumeType == 'RedPacket'">
|
432
|
432
|
LEFT JOIN ta_red_packet t4 ON t2.target_id = t4.activity_id
|
433
|
433
|
</if>
|
434
|
434
|
WHERE
|