From b0855d673524c27a7c76e42a2d8e1920f9481ea0 Mon Sep 17 00:00:00 2001
From: huangqizhen <huangqizhen@legu168.com>
Date: Thu, 16 Jan 2025 10:26:23 +0800
Subject: [PATCH] quanxian

---
 .../example/demo/controller/ConsumeController.java    |  8 +++-----
 .../java/com/example/demo/mapper/DetailYMapper.java   |  6 +++---
 src/main/java/com/example/demo/mapper/UserMapper.java |  6 +++---
 .../example/demo/serviceImpl/RechargeServiceImpl.java |  2 +-
 .../com/example/demo/serviceImpl/UserServiceImpl.java |  8 +++++---
 src/main/resources/application.yml                    | 19 +++++++++----------
 6 files changed, 24 insertions(+), 25 deletions(-)

diff --git a/src/main/java/com/example/demo/controller/ConsumeController.java b/src/main/java/com/example/demo/controller/ConsumeController.java
index cb24134..8715a06 100644
--- a/src/main/java/com/example/demo/controller/ConsumeController.java
+++ b/src/main/java/com/example/demo/controller/ConsumeController.java
@@ -58,14 +58,12 @@ public class ConsumeController {
         }
     }
 
-    @PostMapping("/getDeatil/{jwcode}")
-    public Result getDeatil(@PathVariable("jwcode") Integer jwcode) {
+    @PostMapping("/getDeatil")
+    public Result getDeatil(@RequestBody UserVo userVo) {
         try {
-            UserVo userVo = new UserVo();
-            userVo.setJwcode(jwcode.toString());
             userService.search(userVo);
 
-            return Result.success(consumeService.getDeatil(jwcode));
+            return Result.success(consumeService.getDeatil(Integer.valueOf(userVo.getJwcode())));
         } catch (Exception e) {
             log.error(Arrays.toString(e.getStackTrace()));
             return Result.error(e.getMessage());
diff --git a/src/main/java/com/example/demo/mapper/DetailYMapper.java b/src/main/java/com/example/demo/mapper/DetailYMapper.java
index defb362..2942ad2 100644
--- a/src/main/java/com/example/demo/mapper/DetailYMapper.java
+++ b/src/main/java/com/example/demo/mapper/DetailYMapper.java
@@ -82,15 +82,15 @@ public interface DetailYMapper {
             "<script>",
             "SELECT",
             "  SUM(`recharge_coin`) AS 'sumR',",
-            "  SUM(`recharge_coin`) AS 'sumT',",
-            "  SUM(`recharge_coin`) AS 'sumF'",
+            "  SUM(`task_coin`) AS 'sumT',",
+            "  SUM(`free_coin`) AS 'sumF'",
             "FROM",
             "`detail_y`",
             "<where>",
             "<if test='jwcode!=null and jwcode.length>0'>AND jwcode=#{jwcode}</if>",
             "<if test='updateType!=null'>AND update_type=#{updateType}</if>",
             "<if test='startDate != null and endDate != null'>AND create_time BETWEEN #{startDate} AND #{endDate}</if>",
-
+            "<if test='area!=null and area.length>0'>AND area=#{area}</if>",
             "</where>",
             "</script>"
     })
diff --git a/src/main/java/com/example/demo/mapper/UserMapper.java b/src/main/java/com/example/demo/mapper/UserMapper.java
index f928047..851b5cf 100644
--- a/src/main/java/com/example/demo/mapper/UserMapper.java
+++ b/src/main/java/com/example/demo/mapper/UserMapper.java
@@ -21,7 +21,7 @@ public interface UserMapper {
     List<String> selectJwcode();
     @Select({
             "<script>",
-            "select name from user",
+            "select * from user",
             "<where>",
             "<if test='jwcode!=null and jwcode.length>0'>and jwcode=#{jwcode}</if>",
             "</where>",
@@ -65,8 +65,8 @@ public interface UserMapper {
                     "LEFT JOIN\n" +
                     "    audit a ON d.detail_id = a.detail_id AND a.audit_flag = 1\n" +
                     "WHERE\n" +
-                    "     u.jwcode =#{jwcode}\n"+"and\n" +
-                            "refund_flag = 1"
+                    "     u.jwcode =#{jwcode}"
+
 
 
     })
diff --git a/src/main/java/com/example/demo/serviceImpl/RechargeServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/RechargeServiceImpl.java
index 3d4f6ed..ab9060c 100644
--- a/src/main/java/com/example/demo/serviceImpl/RechargeServiceImpl.java
+++ b/src/main/java/com/example/demo/serviceImpl/RechargeServiceImpl.java
@@ -44,7 +44,7 @@ public class RechargeServiceImpl implements RechargeService {
     @Override
     @Transactional
 
-//    @CacheEvict(value = "recharge",allEntries = true)
+    @CacheEvict(value = "recharge",allEntries = true)
     public int add(Recharge recharge) throws Exception {
 //        return rechargeMapper.insert(recharge);
 
diff --git a/src/main/java/com/example/demo/serviceImpl/UserServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/UserServiceImpl.java
index 3d6320c..7f0985d 100644
--- a/src/main/java/com/example/demo/serviceImpl/UserServiceImpl.java
+++ b/src/main/java/com/example/demo/serviceImpl/UserServiceImpl.java
@@ -1,6 +1,5 @@
 package com.example.demo.serviceImpl;
 
-
 import com.example.demo.domain.entity.Detail;
 import com.example.demo.domain.entity.User;
 import com.example.demo.domain.vo.UserVo;
@@ -13,7 +12,6 @@ import org.springframework.cache.annotation.CacheConfig;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.ObjectUtils;
-
 import java.math.BigDecimal;
 import java.util.List;
 @Transactional
@@ -30,7 +28,11 @@ public class UserServiceImpl implements UserSevice {
         if(ObjectUtils.isEmpty(sUser)){
             throw new Exception("无此精网号");
         }
-//        if(sUser.getArea()!=)
+        if(!userVo.getArea().equals("总部")){
+            if(!sUser.getArea().equals(userVo.getArea())){
+                throw new Exception("该地区查无此号");
+            }
+        }
         return userMapper.selectA(userVo);
     }
     @Override
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index d899acb..d1b3c5b 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,5 +1,5 @@
 server:
-  port: 10010
+  port: 10702
 
 spring:
   servlet:
@@ -15,7 +15,7 @@ spring:
       connection-timeout: 30000
       pool-name: HwgoldHikariCP
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://39.101.133.168/hwgold?serverTimezone=GMT%2b8
+    url: jdbc:mysql://54.251.137.151:10701/hwgold?serverTimezone=GMT%2b8
     username: hwgold
     password: 'AGX4Z3YMxiCG3GR2'
   application:
@@ -28,13 +28,13 @@ spring:
       cache-null-values: true
   data:
     redis:
-#      host: 39.99.159.73
-#      port: 20001
-#      password: 8912h12jhhajsd
-#      timeout: 1000
-      host: 127.0.0.1
-      port: 6379
+      host: 54.251.137.151
+      port: 10703
+      password: 8912h12jhhajsd
       timeout: 1000
+      #    host: 127.0.0.1
+      #    port: 6379
+      #    timeout: 1000
       lettuce:
         pool:
           max-active: 20
@@ -47,5 +47,4 @@ mybatis:
     log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
 
 upload:
-  path: D:/gold1
-#  path: /home/java/haiwaiyanfa/gold1/
+  path: /home/java/haiwaiyanfa/gold1/
\ No newline at end of file