diff --git a/src/main/java/com/example/demo/controller/coin/RefundController.java b/src/main/java/com/example/demo/controller/coin/RefundController.java index 2b66254..cfda074 100644 --- a/src/main/java/com/example/demo/controller/coin/RefundController.java +++ b/src/main/java/com/example/demo/controller/coin/RefundController.java @@ -124,7 +124,7 @@ public class RefundController { // @Log("筛选商品") @PostMapping("/selectGoods") public Result getSelectGoods(@RequestBody RefundUser refundUser) { - List list = refundService.selectGoods(refundUser.getJwcode()); + List list = refundService.selectGoods(refundUser); return Result.success(list); } diff --git a/src/main/java/com/example/demo/mapper/coin/RefundMapper.java b/src/main/java/com/example/demo/mapper/coin/RefundMapper.java index 0b99c4a..8312e87 100644 --- a/src/main/java/com/example/demo/mapper/coin/RefundMapper.java +++ b/src/main/java/com/example/demo/mapper/coin/RefundMapper.java @@ -33,7 +33,7 @@ public interface RefundMapper { List getRefundType(); //获取商品 - List selectGoods(Integer jwcode); + List selectGoods(RefundUser refundUser); Gold sumGold(RefundUser refundUser); } diff --git a/src/main/java/com/example/demo/service/coin/RefundService.java b/src/main/java/com/example/demo/service/coin/RefundService.java index 5c10024..999728e 100644 --- a/src/main/java/com/example/demo/service/coin/RefundService.java +++ b/src/main/java/com/example/demo/service/coin/RefundService.java @@ -36,5 +36,5 @@ public interface RefundService { List getRefundType(); //查找退款商品 - List selectGoods(Integer jwcode); + List selectGoods(RefundUser refundUser); } 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 bdcc67f..1d13b53 100644 --- a/src/main/java/com/example/demo/serviceImpl/coin/RefundServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/coin/RefundServiceImpl.java @@ -203,8 +203,8 @@ public class RefundServiceImpl implements RefundService { //查找退款商品 @Override - public List selectGoods(Integer jwcode) { - List refundUsers = refundMapper.selectGoods(jwcode); + public List selectGoods(RefundUser refundUser) { + List refundUsers = refundMapper.selectGoods(refundUser); List list = new ArrayList<>(); for (RefundUser record : refundUsers) { if (record == null) { @@ -216,14 +216,14 @@ public class RefundServiceImpl implements RefundService { // 拼接格式:订单号_商品名(例如:XF20250629_商品BC) String combined = orderCode + "_" + goodsName; - RefundUser refundUser = new RefundUser(); - refundUser.setOrderCode(orderCode); - refundUser.setGoodsName(goodsName); - refundUser.setSumGold(record.getPermanentGold().add(record.getFreeGold()).add(record.getTaskGold())); - refundUser.setPermanentGold(record.getPermanentGold()); - refundUser.setFreeGold(record.getFreeGold()); - refundUser.setTaskGold(record.getTaskGold()); - list.add(refundUser); + RefundUser newRefundUser = new RefundUser(); + newRefundUser.setOrderCode(orderCode); + newRefundUser.setGoodsName(goodsName); + newRefundUser.setSumGold(record.getPermanentGold().add(record.getFreeGold()).add(record.getTaskGold())); + newRefundUser.setPermanentGold(record.getPermanentGold()); + newRefundUser.setFreeGold(record.getFreeGold()); + newRefundUser.setTaskGold(record.getTaskGold()); + list.add(newRefundUser); } return list; } diff --git a/src/main/resources/mapper/RefundMapper.xml b/src/main/resources/mapper/RefundMapper.xml index 208aadd..a87d783 100644 --- a/src/main/resources/mapper/RefundMapper.xml +++ b/src/main/resources/mapper/RefundMapper.xml @@ -271,7 +271,7 @@ FROM user_gold_record ugr ugr.is_refund = 0 - AND ugr.flag = 1 + AND ugr.type = 0 AND ugr.type = #{type}