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

src/main/java/com/example/demo/controller/AdminController.java

@@ -57,4 +57,16 @@ public class AdminController {
             throw new RuntimeException(e);
         }
     }
+
+    @PostMapping("/adminId")
+    public Result selectId(@RequestBody Admin admin ) {
+
+        try {
+            String ID = adminService.getId(admin.getAccount());
+            return Result.success(ID);
+        } catch (Exception e) {
+            log.error(e.getMessage());
+            return Result.error(e.getMessage());
+        }
+    }
     }

src/main/java/com/example/demo/controller/UserController.java

@@ -1,5 +1,6 @@
 package com.example.demo.controller;
 
+import com.example.demo.domain.entity.User;
 import com.example.demo.domain.vo.Gold;
 import com.example.demo.domain.vo.GoldUser;
 import com.example.demo.domain.vo.Result;
@@ -38,4 +39,34 @@ public class UserController {
             return Result.error("请检查输入精网号");
         }
     }
+    @PostMapping("/selectAllUser")
+    public Result selectUser(@RequestBody User user) {
+        try {
+            user = userService.selectAllUser(user.getJwcode().toString());
+            return Result.success(user);
+        } catch (Exception e) {
+            return Result.error("请检查输入精网号");
+        }
+    }
+    //更新全部金币
+    @PostMapping("/updateAllGold")
+    public Result updateAllGold(@RequestBody User user) {
+        try {
+            userService.updateAllGold(user);
+            return Result.success("更新成功");
+        } catch (Exception e) {
+            return Result.error("请检查输入精网号");
+        }
+    }
+    //新增用户
+    @PostMapping("/addUser")
+    public Result addUser(@RequestBody User user) {
+        try {
+            userService.addUser(user);
+            return Result.success("添加成功");
+        } catch (Exception e) {
+            return Result.error("请检查属性");
+        }
+    }
+
 }

src/main/java/com/example/demo/mapper/AdminMapper.java

@@ -15,4 +15,6 @@ import org.apache.ibatis.annotations.Mapper;
 public interface AdminMapper {
     Admin getAdmin(String  account);
     Admin selectByName(String account);
+    Integer getId(String account);
+
 }

src/main/java/com/example/demo/mapper/AuditMapper.java

@@ -21,8 +21,10 @@ import java.util.List;
 
 @Mapper
 public interface AuditMapper {
-    //根据订单号查订单
+    //根据订单号查未审核订单
     UserGoldRecord selectOrderByOrderCode(String orderCode);
+    //根据订单号查订单
+    UserGoldRecord selectAllOrderByOrderCode(String orderCode);
     //修改订单审核人与审核状态
     int updateOrder (UserGoldRecord userGoldRecord);
     //修改用户余额

src/main/java/com/example/demo/mapper/UserMapper.java

@@ -22,6 +22,13 @@ public interface UserMapper {
     GoldUser selectGold(String jwcode);
 
     void updateGold(User user);
+
+     User selectAllUser(String jwcode);
     //查询充值次数
     Integer selectRechargeNumByJwcode(Integer jwcode);
+
+    void updateAllGold(User  user);
+
+    void addUser(User user);
+
 }

src/main/java/com/example/demo/service/AdminService.java

@@ -13,5 +13,5 @@ import com.example.demo.domain.entity.Admin;
 public interface AdminService {
     Admin login(Admin admin)throws Exception;
 
-    Integer selectId(String account);
+    String getId(String account);
 }

src/main/java/com/example/demo/service/UserService.java

@@ -1,5 +1,6 @@
 package com.example.demo.service;
 
+import com.example.demo.domain.entity.User;
 import com.example.demo.domain.vo.Gold;
 import com.example.demo.domain.vo.GoldUser;
 
@@ -16,4 +17,10 @@ public interface UserService {
 
     GoldUser selectUser(String jwcode);
     GoldUser selectgold(String jwcode);
+
+    User selectAllUser(String jwcode);
+
+    void updateAllGold(User user);
+
+    void addUser(User user);
 }

src/main/java/com/example/demo/serviceImpl/AdminServiceImpl.java

@@ -56,9 +56,8 @@ public class AdminServiceImpl implements AdminService {
     }
 
     @Override
-    public Integer selectId(String account) {
-        Admin admin = adminMapper.getAdmin(account);
-        return admin.getId();
+    public String getId(String account) {
+        return adminMapper.getAdmin(account).getId().toString();
     }
 
     private boolean hasPermissionToMachine(Admin admin, String targetMachineId) {

src/main/java/com/example/demo/serviceImpl/AuditServiceImpl.java

@@ -56,7 +56,7 @@ public class AuditServiceImpl implements AuditService {
                 //2.获取对应的消费订单（退款订单号去掉开头"TK"即为对应消费订单）
                 String consumeOrderCode = order.getOrderCode().replaceFirst("TK", "");
                 //3.更新消费订单是否已退款状态为0
-                UserGoldRecord consumeOrder = auditMapper.selectOrderByOrderCode(consumeOrderCode);
+                UserGoldRecord consumeOrder = auditMapper.selectAllOrderByOrderCode(consumeOrderCode);
                 if (consumeOrderCode != null&&consumeOrder.getType()==1){   //确保是消费订单
                     auditMapper.updateOrderRefund(consumeOrderCode,(byte)0);
                 }else {
@@ -85,14 +85,14 @@ public class AuditServiceImpl implements AuditService {
                 update.setRechargeNum(rechargeNum+1);   //充值次数加一
                 auditMapper.updateUserGold(update);
                 //erp增加充值数据
-                if(update.getJwcode().equals(94226013)){
+            //    if(update.getJwcode().equals(94226013)){
                     GoldTistV2.addCoinNew(order.getJwcode().toString(), 64, //充值永久金币
                             (double) (order.getPermanentGold() ) /100,
                             order.getRemark(),0, order.getPayPlatform(), "金币充值");
                     GoldTistV2.addCoinNew(order.getJwcode().toString(), 63, //充值免费
                             (double) (order.getFreeDecember()+order.getFreeJune() ) /100,
                             order.getRemark(),0, order.getPayPlatform(), "金币充值");
-                }
+           //     }
             }else if (order.getType()==2) {  //退款
                 //更新用户余额
                 User update = new User();
@@ -103,7 +103,7 @@ public class AuditServiceImpl implements AuditService {
                 update.setCurrentTaskGold(order.getTaskGold()); //当前任务金币
                 auditMapper.updateUserGold(update);
                 //erp增加退款数据
-                if(update.getJwcode().equals(94226013)){
+             //   if(update.getJwcode().equals(94226013)){
                     GoldTistV2.addCoinNew(order.getJwcode().toString(), 56, //退款永久金币
                             (double) (order.getPermanentGold() ) /100,
                             order.getRemark(),0, order.getPayPlatform(), "退款商品"+order.getGoodsName());
@@ -113,7 +113,7 @@ public class AuditServiceImpl implements AuditService {
                     GoldTistV2.addCoinNew(order.getJwcode().toString(), 57, //退款任务
                             (double) (order.getTaskGold() ) /100,
                             order.getRemark(),0, order.getPayPlatform(), "退款商品"+order.getGoodsName());
-                }
+              //  }
 
             }
         }

src/main/java/com/example/demo/serviceImpl/ConsumeServiceImpl.java

@@ -165,11 +165,11 @@ public class ConsumeServiceImpl implements ConsumeService {
         user.setConsumeNum(gold.getConsumeNum() + 1);
         user.setSumConsume(-(consumeUser.getPermanentGold() + consumeUser.getFreeGold() + consumeUser.getTaskGold()));
         userMapper.updateGold(user);
-        if(consumeUser.getJwcode().equals(94226013)){
+       // if(consumeUser.getJwcode().equals(94226013)){
             GoldTistV2.addCoinNew(userGoldRecord.getJwcode().toString(), 65,
                     (double) (userGoldRecord.getPermanentGold() + userGoldRecord.getFreeDecember() + userGoldRecord.getFreeJune() + userGoldRecord.getTaskGold()) /100,
                     userGoldRecord.getRemark(),((double) userGoldRecord.getPermanentGold() /100), userGoldRecord.getPayPlatform(), userGoldRecord.getGoodsName());
-        }
+       // }
         return Result.success();
     }
 }

src/main/java/com/example/demo/serviceImpl/UserServiceImpl.java

@@ -1,5 +1,6 @@
 package com.example.demo.serviceImpl;
 
+import com.example.demo.domain.entity.User;
 import com.example.demo.domain.vo.Gold;
 import com.example.demo.domain.vo.GoldUser;
 import com.example.demo.mapper.ConsumeMapper;
@@ -31,6 +32,22 @@ public class UserServiceImpl implements UserService {
     }
 
     @Override
+    public User selectAllUser(String jwcode) {
+        User user = userMapper.selectAllUser(jwcode);
+        return user;
+    }
+
+    @Override
+    public void updateAllGold(User user) {
+        userMapper.updateAllGold(user);
+    }
+
+    @Override
+    public void addUser(User user) {
+        userMapper.addUser(user);
+    }
+
+    @Override
     public GoldUser selectgold(String jwcode) {
         GoldUser gold = userMapper.selectGold(jwcode);
         return gold;

src/main/resources/mapper/AdminMapper.xml

@@ -10,5 +10,8 @@
         select * from admin
         where account= #{account}
     </select>
-
+    <select id="getId" resultType="java.lang.Integer">
+        select id from admin
+        where account=#{account}
+    </select>
 </mapper>

src/main/resources/mapper/AuditMapper.xml

@@ -8,7 +8,7 @@
             audit_status = #{auditStatus},
             reject_reason = #{rejectReason},
             audit_time = #{auditTime}
-        where order_code = #{orderCode}
+        where order_code = #{orderCode} and audit_status = 0
         order by create_time DESC
         limit 1
     </update>
@@ -32,7 +32,7 @@
         set is_refund = #{isRefund}
         where order_code = #{orderCode}
     </update>
-    <!--根据订单号查订单-->
+    <!--根据订单号查未审核订单-->
 
     <select id="selectOrderByOrderCode" resultType="com.example.demo.domain.entity.UserGoldRecord">
         select * from user_gold_record where order_code = #{orderCode} and audit_status = 0
@@ -130,4 +130,11 @@
             </otherwise>
         </choose>
     </select>
+    <!--根据订单号查订单-->
+
+    <select id="selectAllOrderByOrderCode" resultType="com.example.demo.domain.entity.UserGoldRecord">
+        select * from user_gold_record where order_code = #{orderCode}
+        ORDER BY create_time DESC
+            limit 1
+    </select>
 </mapper>

src/main/resources/mapper/UserMapper.xml

@@ -1,6 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.example.demo.mapper.UserMapper">
+    <insert id="addUser">
+        INSERT INTO user(
+            name,jwcode,market
+
+        ) VALUES (
+                     #{name},#{jwcode},#{market}
+                 )
+    </insert>
+
 
     <!-- 根据精网号查询用户信息 -->
     <select id="selectUser" resultType="com.example.demo.domain.vo.GoldUser">
@@ -22,7 +31,13 @@
         FROM user
         WHERE jwcode = #{jwcode}
     </select>
-
+    <!-- 根据精网号查询用户信息 -->
+    <select id="selectAllUser" resultType="com.example.demo.domain.entity.User">
+        SELECT
+           *
+        FROM user
+        WHERE jwcode = #{jwcode}
+    </select>
     <!-- 根据精网号查询金币余额 -->
     <select id="selectGold" resultType="com.example.demo.domain.vo.GoldUser">
         SELECT
@@ -52,4 +67,20 @@
             update_time = NOW()
         WHERE jwcode = #{jwcode}
     </update>
+    <update id="updateAllGold" parameterType="com.example.demo.domain.entity.User">
+        UPDATE user
+        SET
+        <if test="sum_permanent_gold != null">sum_permanent_gold = #{sumPermanentGold},</if>
+        <if test="sum_free_june != null">sum_free_june = #{sumFreeJune},</if>
+        <if test="sum_free_december != null">sum_free_december = #{sumFreeDecember},</if>
+        <if test="sum_task_gold != null">sum_task_gold = #{sumTaskGold},</if>
+        <if test="current_permanent_gold != null">current_permanent_gold = #{currentPermanentGold},</if>
+        <if test="current_free_june != null">current_free_june = #{currentFreeJune},</if>
+        <if test="current_free_december != null">current_free_december = #{currentFreeDecember},</if>
+        <if test="current_task_gold != null">current_task_gold = #{currentTaskGold},</if>
+        <if test="consume_num != null">consume_num = #{consumeNum},</if>
+        <if test="recharge_num != null">recharge_num = #{rechargeNum}</if>
+
+        where jwcode = #{jwcode}
+    </update>
 </mapper>