Merge branch 'milestone-20250702-金币重构一期' of http://39.101.133.168:8807/huangqizhen/gold-java into milestone-20250702-金币重构一期

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; //支付凭证

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);
 }

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)){

src/main/resources/mapper/AuditMapper.xml

@@ -35,7 +35,7 @@
     <!--根据订单号查订单-->
 
     <select id="selectOrderByOrderCode" resultType="com.example.demo.domain.entity.UserGoldRecord">
-        select * from user_gold_record where order_code = #{orderCode}
+        select * from user_gold_record where order_code = #{orderCode} and audit_status = 0
         ORDER BY create_time DESC
         limit 1
     </select>
@@ -61,9 +61,9 @@
             <if test="rechargeAudit.payModel != null and rechargeAudit.payModel != ''">
                 AND ugr.pay_model = #{rechargeAudit.payModel}
             </if>
-            <if test="rechargeAudit.rateId != null and rechargeAudit.rateId != ''">
+       <!--     <if test="rechargeAudit.rateId != null and rechargeAudit.rateId != ''">
                 AND ugr.rate_id = #{rechargeAudit.rateId}
-            </if>
+            </if>-->
             <if test="rechargeAudit.market != null and rechargeAudit.market != ''">
                 AND u.market = #{rechargeAudit.market}
             </if>

src/main/resources/mapper/UserMapper.xml

@@ -35,6 +35,9 @@
         FROM user
         WHERE jwcode = #{jwcode}
     </select>
+    <select id="selectRechargeNumByJwcode" resultType="java.lang.Integer">
+        select recharge_num from user where jwcode = #{jwcode}
+    </select>
 
     <!-- 根据精网号更新数据 -->
     <update id="updateGold" parameterType="com.example.demo.domain.entity.User">