8月12.新增校验

README.md

@@ -6,7 +6,7 @@
 
 ## Maven：3.9.8
 
-## Mysql：5.7.44        地址端口号：18.143.76.3:3306
+## Mysql：5.7.44        地址端口号：54.255.212.181:3306
 
 ### 数据库：
 #### 正式 hwgold aDiw7MERSATdfGta 

src/main/java/com/example/demo/Mysql/MysqlServiceImpl.java

@@ -76,7 +76,7 @@ public class MysqlServiceImpl implements MysqlService {
                 //退款类型 61：ERP退款（退金币）
                 String insertSql = "INSERT INTO user_gold_record (order_code,jwcode,sum_gold,permanent_gold,free_june,free_december," +
                         "task_gold,pay_platform,goods_name,refund_type,refund_model,remark,type,admin_id," +
-                        "audit_status,create_time,flag) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?) ";
+                        "audit_status,create_time,flag,update_time) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?) ";
                 try (PreparedStatement mysqlStmt = mysqlConn.prepareStatement(insertSql)) {
                     while (resultSet.next()) {
                         int gtype = resultSet.getInt("gtype");
@@ -167,6 +167,7 @@ public class MysqlServiceImpl implements MysqlService {
                         }else {
                             mysqlStmt.setInt(17, 1);
                         }
+                        mysqlStmt.setTimestamp(18, created_at);
 
                        // 更新时的值
                         mysqlStmt.addBatch();

src/main/java/com/example/demo/serviceImpl/bean/BeanRechargeServiceImpl.java

@@ -1,14 +1,12 @@
 package com.example.demo.serviceImpl.bean;
 
-import com.example.demo.domain.vo.bean.BeanOnlineRechargeInfo;
-import com.example.demo.domain.vo.bean.BeanRecharge;
-import com.example.demo.domain.vo.bean.BeanSystemRechargeInfo;
-import com.example.demo.domain.vo.bean.GoldBean;
+import com.example.demo.domain.vo.bean.*;
 import com.example.demo.domain.vo.coin.Gold;
 import com.example.demo.domain.vo.coin.GoldUser;
 import com.example.demo.domain.vo.coin.RechargeUser;
 import com.example.demo.domain.vo.coin.Result;
 import com.example.demo.mapper.bean.BeanRechargeMapper2;
+import com.example.demo.mapper.bean.BeanUserMapper;
 import com.example.demo.mapper.coin.BeanRechargeMapper1;
 import com.example.demo.mapper.coin.UserMapper;
 import com.example.demo.mapper.pay.BeanRechargeMapper3;
@@ -56,6 +54,9 @@ public class BeanRechargeServiceImpl implements BeanRechargeService {
     @Autowired
     private UserMapper userMapper;
 
+    @Autowired
+    private BeanUserMapper beanUserMapper;
+
     //新增金豆
     @Override
     public Result add(BeanRecharge recharge) {
@@ -80,6 +81,10 @@ public class BeanRechargeServiceImpl implements BeanRechargeService {
             if (recharge.getFreeBean() == 0 && recharge.getPermanentBean() == 0) {
                 return Result.error("免费豆和永久豆不能同时为0");
             }
+            BeanUserCard user = beanUserMapper.userCard(String.valueOf(recharge.getJwcode()));
+            if(user==null){
+                return Result.error("用户查找不到");
+            }
             // 验证备注是否为空
             if (recharge.getRemark() == null || recharge.getRemark().toString().isEmpty()) {
                 return Result.error("备注不能为空");
@@ -87,10 +92,7 @@ public class BeanRechargeServiceImpl implements BeanRechargeService {
             if(recharge.getAdminName() == null || recharge.getAdminName().toString().isEmpty()){
                 return Result.error("管理员名称不能为空");
             }
-            GoldUser goldUser = userMapper.selectUser(recharge.getJwcode().toString());
-            if(goldUser==null){
-                return Result.error("用户不存在");
-            }
+
             beanRechargeMapper1.add(recharge);
 //            String jwcode = recharge.getJwcode().toString();
 //            String op = "recharge"; // 操作类型（根据实际业务定义，例如"recharge"表示充值）

src/main/java/com/example/demo/serviceImpl/coin/RechargeServiceImpl.java

@@ -123,9 +123,9 @@ public class RechargeServiceImpl implements RechargeService {
         if (rechargeUser.getFreeGold() == 0 && rechargeUser.getPermanentGold() == 0) {
             return Result.error("免费金币和永久金币不能同时为0");
         }
-        BeanUserCard user = beanUserMapper.userCard(String.valueOf(rechargeUser.getJwcode()));
-        if(user==null){
-            return Result.error("用户查找不到");
+        GoldUser goldUser = userMapper.selectUser(rechargeUser.getJwcode().toString());
+        if(goldUser==null){
+            return Result.error("用户不存在");
         }
 
         UserGoldRecord userGoldRecord = new UserGoldRecord();

src/main/resources/application-test.yml

@@ -67,9 +67,9 @@ spring:
   data:
     redis:
       database: 0
-      host: localhost
-      port: 6379
-      password: 123456
+      host: 54.255.212.181
+      port: 10703
+      password: Ngc0FYUTA6h3wC5J
 
       lettuce:
         pool:

src/main/resources/mapper/GoldDetailMapper.xml

@@ -88,7 +88,7 @@
                 and jwcode = #{jwcode}
             </if>
             <if test="markets != null and markets.size > 0">
-                AND m.name IN
+                AND m.id IN
                 <foreach collection="markets" item="market" open="(" separator="," close=")">
                     #{market}
                 </foreach>

src/main/resources/mapper/StatisticsMapper.xml

@@ -134,7 +134,7 @@
                     (
                         SELECT s.current_gold
                         FROM statistics s
-                        WHERE s.market = u.market
+                        WHERE s.market = m.name
                           AND s.current_datetime = DATE_SUB(#{today}, INTERVAL 1 DAY)
                     LIMIT 1
                 ), 0