From 6902e669b81c26f58f9cb9d18ad2813749c68ba7 Mon Sep 17 00:00:00 2001 From: lijianlin Date: Wed, 9 Jul 2025 17:02:08 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E9=80=9A=E8=BF=87bug?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/example/demo/domain/vo/RechargeAudit.java | 2 +- src/main/resources/mapper/AuditMapper.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/example/demo/domain/vo/RechargeAudit.java b/src/main/java/com/example/demo/domain/vo/RechargeAudit.java index 546f2c4..f3b5616 100644 --- a/src/main/java/com/example/demo/domain/vo/RechargeAudit.java +++ b/src/main/java/com/example/demo/domain/vo/RechargeAudit.java @@ -35,7 +35,7 @@ public class RechargeAudit { private Integer freeGold; // 免费金币 private Integer freeJune; // 6月免费金币 private Integer freeDecember; // 12月免费金币 - private Integer rateId; //汇率id + // private Integer rateId; //汇率id private String remark; // 备注 private String payModel; //支付方式 private String voucher; //支付凭证 diff --git a/src/main/resources/mapper/AuditMapper.xml b/src/main/resources/mapper/AuditMapper.xml index fd57882..49869f9 100644 --- a/src/main/resources/mapper/AuditMapper.xml +++ b/src/main/resources/mapper/AuditMapper.xml @@ -61,9 +61,9 @@ AND ugr.pay_model = #{rechargeAudit.payModel} - + AND u.market = #{rechargeAudit.market} From 0972f08e05936513c68a67f5dc9aaaff04bf1d3b Mon Sep 17 00:00:00 2001 From: lijianlin Date: Wed, 9 Jul 2025 17:42:38 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E9=80=9A=E8=BF=87bug?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/example/demo/mapper/UserMapper.java | 2 ++ src/main/java/com/example/demo/serviceImpl/AuditServiceImpl.java | 6 +++++- src/main/resources/mapper/AuditMapper.xml | 2 +- src/main/resources/mapper/UserMapper.xml | 3 +++ 4 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/example/demo/mapper/UserMapper.java b/src/main/java/com/example/demo/mapper/UserMapper.java index 6368553..8bd3f69 100644 --- a/src/main/java/com/example/demo/mapper/UserMapper.java +++ b/src/main/java/com/example/demo/mapper/UserMapper.java @@ -22,4 +22,6 @@ public interface UserMapper { GoldUser selectGold(String jwcode); void updateGold(User user); + //查询充值次数 + Integer selectRechargeNumByJwcode(Integer jwcode); } diff --git a/src/main/java/com/example/demo/serviceImpl/AuditServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/AuditServiceImpl.java index cc44907..73901e2 100644 --- a/src/main/java/com/example/demo/serviceImpl/AuditServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/AuditServiceImpl.java @@ -7,6 +7,7 @@ import com.example.demo.domain.vo.Gold; import com.example.demo.domain.vo.RechargeAudit; import com.example.demo.domain.vo.RefundAudit; import com.example.demo.mapper.AuditMapper; +import com.example.demo.mapper.UserMapper; import com.example.demo.service.AuditService; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; @@ -29,6 +30,8 @@ import java.util.List; public class AuditServiceImpl implements AuditService { @Autowired private AuditMapper auditMapper; + @Autowired + private UserMapper userMapper; /* 审核订单并修改用户余额等 */ @@ -69,6 +72,7 @@ public class AuditServiceImpl implements AuditService { if (order.getType()==0){ //充值 //更新用户余额 User update = new User(); + Integer rechargeNum = userMapper.selectRechargeNumByJwcode(order.getJwcode()); update.setJwcode(order.getJwcode()); //精网号 update.setSumPermanentGold(order.getPermanentGold()); //历史永久金币 update.setSumFreeJune(order.getFreeJune()); //历史六月免费金币 @@ -78,7 +82,7 @@ public class AuditServiceImpl implements AuditService { update.setCurrentFreeJune(order.getFreeJune()); //当前六月免费金币 update.setCurrentFreeDecember(order.getFreeDecember()); //当前十二月免费金币 update.setCurrentTaskGold(order.getTaskGold()); //当前任务金币 - update.setRechargeNum(update.getRechargeNum()+1); //充值次数加一 + update.setRechargeNum(rechargeNum+1); //充值次数加一 auditMapper.updateUserGold(update); //erp增加充值数据 if(update.getJwcode().equals(94226013)){ diff --git a/src/main/resources/mapper/AuditMapper.xml b/src/main/resources/mapper/AuditMapper.xml index 49869f9..14b665a 100644 --- a/src/main/resources/mapper/AuditMapper.xml +++ b/src/main/resources/mapper/AuditMapper.xml @@ -35,7 +35,7 @@ diff --git a/src/main/resources/mapper/UserMapper.xml b/src/main/resources/mapper/UserMapper.xml index aae9e60..aa7ddc6 100644 --- a/src/main/resources/mapper/UserMapper.xml +++ b/src/main/resources/mapper/UserMapper.xml @@ -35,6 +35,9 @@ FROM user WHERE jwcode = #{jwcode} +