diff --git a/src/main/java/com/example/demo/serviceImpl/coin/RefundServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/coin/RefundServiceImpl.java index 53404bd..875011f 100644 --- a/src/main/java/com/example/demo/serviceImpl/coin/RefundServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/coin/RefundServiceImpl.java @@ -229,6 +229,7 @@ public class RefundServiceImpl implements RefundService { newRefundUser.setFreeGold(record.getFreeGold()); newRefundUser.setTaskGold(record.getTaskGold()); newRefundUser.setIsRefund(record.getIsRefund()); + newRefundUser.setType(record.getType()); list.add(newRefundUser); } return list; diff --git a/src/main/resources/mapper/RefundMapper.xml b/src/main/resources/mapper/RefundMapper.xml index 3fcb5d8..9f6f05e 100644 --- a/src/main/resources/mapper/RefundMapper.xml +++ b/src/main/resources/mapper/RefundMapper.xml @@ -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 ugr.is_refund = 0 - AND ugr.type = 0 + AND ugr.flag = 1 AND ugr.type = #{type}