|
|
@ -265,13 +265,15 @@ |
|
|
|
|
|
|
|
ugr.goods_name AS goodsName, |
|
|
|
ugr.is_refund AS isRefund, |
|
|
|
ugr.type AS type, |
|
|
|
ugr.order_code AS orderCode, |
|
|
|
ugr.permanent_gold AS permanentGold, |
|
|
|
(COALESCE(ugr.free_june, 0) + COALESCE(ugr.free_december, 0)) AS freeGold, |
|
|
|
ugr.task_gold AS taskGold |
|
|
|
FROM user_gold_record ugr |
|
|
|
<where> |
|
|
|
ugr.is_refund = 0 |
|
|
|
AND ugr.type = 0 |
|
|
|
AND ugr.flag = 1 |
|
|
|
<if test="type !=null and type != '' "> |
|
|
|
AND ugr.type = #{type} |
|
|
|
</if> |
|
|
|