From 80d78923d0f4bd76626a56a47d8d24fe5e347c06 Mon Sep 17 00:00:00 2001
From: huangqizhen <huangqizhen@legu168.com>
Date: Tue, 11 Mar 2025 11:50:21 +0800
Subject: [PATCH] =?UTF-8?q?3.11=E4=BF=AE=E5=A4=8Drecharge=E8=A1=A8?=
 =?UTF-8?q?=E6=A0=BC=E6=96=B0=E5=A2=9E=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/example/demo/domain/entity/Recharge.java   |  2 ++
 .../java/com/example/demo/domain/vo/RechargeVo.java     |  2 ++
 .../java/com/example/demo/mapper/RechargeMapper.java    |  4 ++--
 .../com/example/demo/serviceImpl/OtherServiceImpl.java  | 17 ++++++++++++++++-
 4 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/example/demo/domain/entity/Recharge.java b/src/main/java/com/example/demo/domain/entity/Recharge.java
index 54d9f9d..8bfd001 100644
--- a/src/main/java/com/example/demo/domain/entity/Recharge.java
+++ b/src/main/java/com/example/demo/domain/entity/Recharge.java
@@ -43,4 +43,6 @@ public class Recharge {
     private String isInputInvalid;
     private String inputErrorMessage;
 
+    private String adminName;
+
 }
diff --git a/src/main/java/com/example/demo/domain/vo/RechargeVo.java b/src/main/java/com/example/demo/domain/vo/RechargeVo.java
index 7e261f6..3014372 100644
--- a/src/main/java/com/example/demo/domain/vo/RechargeVo.java
+++ b/src/main/java/com/example/demo/domain/vo/RechargeVo.java
@@ -43,4 +43,6 @@ public class RechargeVo {
     private Integer detailId;
     private String orderCode;
 
+    private String adminName;
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/example/demo/mapper/RechargeMapper.java b/src/main/java/com/example/demo/mapper/RechargeMapper.java
index 7279517..6d5f895 100644
--- a/src/main/java/com/example/demo/mapper/RechargeMapper.java
+++ b/src/main/java/com/example/demo/mapper/RechargeMapper.java
@@ -12,9 +12,9 @@ public interface RechargeMapper {
 
     @Insert({
             "INSERT INTO recharge",
-            "(jwcode,order_code,activity_id,paid_gold,free_gold,recharge_gold,pay_way,recharge_way,recharge_time,recharge_voucher,admin_id,remark,flag)",
+            "(jwcode,order_code,activity_id,paid_gold,free_gold,recharge_gold,pay_way,recharge_way,recharge_time,recharge_voucher,admin_id,remark,flag,admin_name)",
             "values ",
-            "(#{jwcode},#{orderCode},#{activityId},#{paidGold},#{freeGold},#{rechargeGold},#{payWay},#{rechargeWay},#{rechargeTime},#{rechargeVoucher},#{adminId},#{remark},1)"
+            "(#{jwcode},#{orderCode},#{activityId},#{paidGold},#{freeGold},#{rechargeGold},#{payWay},#{rechargeWay},#{rechargeTime},#{rechargeVoucher},#{adminId},#{remark},1,#{adminName})"
     })
     @Options(useGeneratedKeys = true,keyColumn = "recharge_id",keyProperty = "rechargeId")
     int insert(Recharge recharge);
diff --git a/src/main/java/com/example/demo/serviceImpl/OtherServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/OtherServiceImpl.java
index d47e415..723f35c 100644
--- a/src/main/java/com/example/demo/serviceImpl/OtherServiceImpl.java
+++ b/src/main/java/com/example/demo/serviceImpl/OtherServiceImpl.java
@@ -2,10 +2,13 @@ package com.example.demo.serviceImpl;
 
 import com.example.demo.Util.BaseDES;
 import com.example.demo.domain.entity.DetailY;
+import com.example.demo.domain.entity.Recharge;
 import com.example.demo.domain.entity.UserGold;
 import com.example.demo.domain.vo.ERP;
+import com.example.demo.domain.vo.RechargeVo;
 import com.example.demo.mapper.DetailYMapper;
 import com.example.demo.mapper.OtherMapper;
+import com.example.demo.mapper.RechargeMapper;
 import com.example.demo.mapper.UserMapper;
 import com.example.demo.sevice.OtherService;
 import lombok.RequiredArgsConstructor;
@@ -40,6 +43,7 @@ public class OtherServiceImpl implements OtherService {
     private final OtherMapper otherMapper;
     private final DetailYMapper detailYMapper;
     private final UserMapper userMapper;
+    private final RechargeMapper rechargeMapper;
 
     static {
         typesToUpdateZero.add("1");
@@ -111,6 +115,7 @@ public class OtherServiceImpl implements OtherService {
     @Override
     public int addERP(ERP erp) throws Exception {
         DetailY detailY = new DetailY();
+        Recharge recharge = new Recharge();
 
 
         String type = erp.getType();
@@ -223,7 +228,17 @@ public class OtherServiceImpl implements OtherService {
                 BigDecimal free12 = userGold.getFree12().add(freeJb);
                 userGold.setFree12(free12);
             }
-
+            recharge.setJwcode(JwCode);
+            recharge.setPaidGold(rechargeJb);
+            recharge.setFreeGold(freeJb);
+            recharge.setRechargeGold(rechargeJb);
+            recharge.setRechargeWay(Way);
+            recharge.setPayWay("ERP");
+            recharge.setRechargeTime(erp.getCreateTime());
+            recharge.setRemark(remark);
+            recharge.setAdminName(adminName);
+
+            rechargeMapper.insert(recharge);
 
         } else if (typesToUpdateOne.contains(type)) {
             System.out.println("消费------------------------------------------------------");