From 6badf1652b5072d6571924dbec2a9542e44c2269 Mon Sep 17 00:00:00 2001
From: wxys233 <1837019522@qq.com>
Date: Sat, 7 Feb 2026 14:42:00 +0800
Subject: [PATCH] =?UTF-8?q?feat(user):=20=E6=B7=BB=E5=8A=A0=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E4=BD=99=E9=A2=9D=E5=AD=97=E6=AE=B5=E6=94=AF=E6=8C=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在 UserEntity 中添加 money 字段并配置为非数据库映射字段
- 更新 UserDao.xml 查询语句，关联 user_money 表并添加余额查询
- 为用户列表分页查询添加余额显示功能
- 配置新的 Maven 仓库源以支持依赖包获取
- 添加 Docker 部署脚本用于镜像构建和推送
---
 deploy.sh                                     | 23 +++++++++++++++++++
 pom.xml                                       |  5 ++++
 .../sqx/modules/app/entity/UserEntity.java    |  3 +++
 src/main/resources/mapper/app/UserDao.xml     |  5 +++-
 4 files changed, 35 insertions(+), 1 deletion(-)
 create mode 100755 deploy.sh

diff --git a/deploy.sh b/deploy.sh
new file mode 100755
index 0000000..94d88b9
--- /dev/null
+++ b/deploy.sh
@@ -0,0 +1,23 @@
+#!/bin/bash
+
+# 设置版本号或标签
+TAG="songshui:sqx-1.0.3"
+IMAGE_NAME="crpi-189p4y6a6tb3b6dl.cn-hangzhou.personal.cr.aliyuncs.com/peng_all"
+
+# 构建 Docker 镜像
+docker build --platform linux/amd64 -t "$TAG" .
+
+# 获取构建后的镜像ID
+IMAGE_ID=$(docker images -q "$TAG")
+
+# 标记镜像
+docker tag "$IMAGE_ID" "$IMAGE_NAME/$TAG"
+
+# 推送到远程仓库
+docker push "$IMAGE_NAME/$TAG"
+
+# 删除镜像
+docker rmi "$IMAGE_NAME/$TAG"
+
+# 打印信息
+echo "Docker image built and pushed with tag: $TAG"
diff --git a/pom.xml b/pom.xml
index a9949d6..b1b3e4a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -481,6 +481,11 @@
     </build>
 
     <repositories>
+        <repository>
+            <id>showye-repository-r3d</id>
+            <name>Showye Repository</name>
+            <url>https://maven.showye.cn/r3d</url>
+        </repository>
         <repository>
             <id>public</id>
             <name>aliyun nexus</name>
diff --git a/src/main/java/com/sqx/modules/app/entity/UserEntity.java b/src/main/java/com/sqx/modules/app/entity/UserEntity.java
index 0f97a8e..d83153c 100644
--- a/src/main/java/com/sqx/modules/app/entity/UserEntity.java
+++ b/src/main/java/com/sqx/modules/app/entity/UserEntity.java
@@ -219,6 +219,9 @@ public class UserEntity implements Serializable {
      */
     private Integer isSafetyMoney;
 
+    @TableField(exist = false)
+    private BigDecimal money;
+
     /**
      * 是否是推广员 1是
      */
diff --git a/src/main/resources/mapper/app/UserDao.xml b/src/main/resources/mapper/app/UserDao.xml
index 9f8ed44..09b83c3 100644
--- a/src/main/resources/mapper/app/UserDao.xml
+++ b/src/main/resources/mapper/app/UserDao.xml
@@ -13,6 +13,7 @@
     <select id="selectUserPage" resultType="com.sqx.modules.app.entity.UserEntity">
         select * from ( SELECT
         u.*,
+        IFNULL(um.money,0) AS money,
         l.laundry_name AS laundryName,
         IF(v.is_vip = 1, 1, 2) AS isVip,
         v.end_time as vipEndTime,
@@ -24,6 +25,8 @@
         ON l.laundry_id = u.laundry_id
         LEFT JOIN user_vip v
         ON u.user_id = v.user_id
+        LEFT JOIN user_money um
+        ON u.user_id = um.user_id
         WHERE 1 = 1
         <if test="isVip==2">
             and (v.is_vip =2 or v.is_vip is null)
@@ -425,4 +428,4 @@
           and latitude is not null
           and laundry_id is not null
     </select>
-</mapper>
\ No newline at end of file
+</mapper>