From 9307b8672a174c59f1ecb8e8ab1105f3db804fb6 Mon Sep 17 00:00:00 2001
From: huangqizhen <15552608129@163.com>
Date: Sat, 26 Apr 2025 10:52:24 +0800
Subject: [PATCH 1/2] =?UTF-8?q?4.26=20=E6=96=B0=E5=A2=9E=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E9=BB=98=E8=AE=A4=E5=8A=A0=E5=85=A5123=E5=AF=86=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/example/demo/serviceImpl/UserServiceImpl.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/main/java/com/example/demo/serviceImpl/UserServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/UserServiceImpl.java
index fb08232..c8fa981 100644
--- a/src/main/java/com/example/demo/serviceImpl/UserServiceImpl.java
+++ b/src/main/java/com/example/demo/serviceImpl/UserServiceImpl.java
@@ -9,6 +9,7 @@ import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import lombok.RequiredArgsConstructor;
 import org.springframework.cache.annotation.CacheConfig;
+import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.ObjectUtils;
@@ -58,6 +59,8 @@ public class UserServiceImpl implements UserSevice {
         if (!ObjectUtils.isEmpty(sUser)){
             throw new Exception("已存在此用户");
         }
+        BCryptPasswordEncoder passwordEncoder = new BCryptPasswordEncoder();
+        user.setPassword(passwordEncoder.encode("123"));
         return userMapper.add(user);
     }
 

From 8f62f0305cdcfef30889ca60eaa9b3ee935b378c Mon Sep 17 00:00:00 2001
From: huangqizhen <15552608129@163.com>
Date: Sun, 27 Apr 2025 09:32:59 +0800
Subject: [PATCH 2/2] =?UTF-8?q?4.26=20=E4=BF=AE=E5=A4=8D=E9=87=91=E8=B1=86?=
 =?UTF-8?q?=E5=85=85=E5=80=BC=E6=98=8E=E7=BB=86=E5=9C=B0=E5=8C=BA=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/example/demo/domain/dou/Total.java       |  1 +
 .../com/example/demo/serviceImpl/OtherServiceImpl.java     |  2 +-
 src/main/resources/mapper/StatisticsMapper.xml             | 14 ++++++++++++++
 src/main/resources/mapperLink/DouMapper.xml                |  4 ++--
 4 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/example/demo/domain/dou/Total.java b/src/main/java/com/example/demo/domain/dou/Total.java
index 25529dd..e62325d 100644
--- a/src/main/java/com/example/demo/domain/dou/Total.java
+++ b/src/main/java/com/example/demo/domain/dou/Total.java
@@ -17,6 +17,7 @@ public class Total {
     private String orderNo;
     private String type;
     private String ipAddress;
+    private String deptName;
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date startTime;
diff --git a/src/main/java/com/example/demo/serviceImpl/OtherServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/OtherServiceImpl.java
index e4c5c4e..86b7c35 100644
--- a/src/main/java/com/example/demo/serviceImpl/OtherServiceImpl.java
+++ b/src/main/java/com/example/demo/serviceImpl/OtherServiceImpl.java
@@ -98,9 +98,9 @@ public class OtherServiceImpl implements OtherService {
         typesToUpdateOne.add("43");
         typesToUpdateOne.add("50");
         typesToUpdateOne.add("51");
-        typesToUpdateOne.add("52");
         typesToUpdateOne.add("62");
 
+        typesToUpdateTwo.add("52");
         typesToUpdateTwo.add("55");
         typesToUpdateTwo.add("56");
         typesToUpdateTwo.add("57");
diff --git a/src/main/resources/mapper/StatisticsMapper.xml b/src/main/resources/mapper/StatisticsMapper.xml
index 1ba9f0c..17e0eb7 100644
--- a/src/main/resources/mapper/StatisticsMapper.xml
+++ b/src/main/resources/mapper/StatisticsMapper.xml
@@ -124,4 +124,18 @@
         </if>
         GROUP BY DATE_FORMAT(create_time, '%Y-%m-%d')
     </select>
+    <select id="getMediuPayCoinday" resultType="com.example.demo.domain.vo.SumCoin">
+        SELECT
+            DATE_FORMAT(create_time, '%Y-%m-%d') AS day,
+        IFNULL(SUM(recharge_coin) / 100, 0) AS rechargeSumCoin,
+        IFNULL(SUM(free_coin) / 100, 0) AS freeSumCoin,
+        IFNULL(SUM(task_coin) / 100, 0) AS taskSumCoin
+        FROM
+            detail_y
+        WHERE
+            DATE(create_time) = #{searchEndTime}
+          AND update_type = #{updateType}
+        GROUP BY
+            DATE_FORMAT(create_time, '%Y-%m-%d')
+    </select>
 </mapper>
\ No newline at end of file
diff --git a/src/main/resources/mapperLink/DouMapper.xml b/src/main/resources/mapperLink/DouMapper.xml
index 474f54a..17f614e 100644
--- a/src/main/resources/mapperLink/DouMapper.xml
+++ b/src/main/resources/mapperLink/DouMapper.xml
@@ -209,8 +209,8 @@
             <if test="type != null and type.length > 0">
                 and type LIKE CONCAT('%', #{type}, '%')
             </if>
-            <if test="ipAddress != null and ipAddress.length > 0">
-                and  fm.ip_address = #{ipAddress}
+            <if test="deptName != null and deptName.length > 0">
+                and  fm.ip_address = #{deptName}
             </if>
             <if test="startTime != null and endTime != null">
                 and FROM_UNIXTIME(fy.`time`) BETWEEN #{startTime} AND #{endTime}