From e2d518d26d50d579b464f14ce257ab5f9a378486 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=BF=A0=E6=9E=97?= <170083662@qq.com>
Date: Mon, 21 Apr 2025 21:49:42 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9AVIP=E5=8D=A1?=
 =?UTF-8?q?=E7=9A=84=E4=B8=8A=E6=9E=B6=E4=B8=8B=E6=9E=B6=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=E3=80=81=E5=8F=8A=E6=98=AF=E5=90=A6=E6=9C=89=E6=95=88=E5=B1=9E?=
 =?UTF-8?q?=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/common/core/utils/MyQrCodeUtil.java                   | 2 +-
 .../java/com/gxwebsoft/common/core/utils/MyQrCodeUtil.java    | 2 +-
 .../com/gxwebsoft/think/controller/SchedulingController.java  | 2 +-
 src/main/java/com/gxwebsoft/think/entity/ThinkVip.java        | 3 +++
 .../java/com/gxwebsoft/think/mapper/xml/ThinkVipMapper.xml    | 3 +++
 src/main/java/com/gxwebsoft/think/param/ThinkVipParam.java    | 4 ++++
 src/main/resources/application.yml                            | 4 ++--
 7 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/modules/common/core/utils/MyQrCodeUtil.java b/modules/common/core/utils/MyQrCodeUtil.java
index 23fbbf0..db2077f 100644
--- a/modules/common/core/utils/MyQrCodeUtil.java
+++ b/modules/common/core/utils/MyQrCodeUtil.java
@@ -51,7 +51,7 @@ public class MyQrCodeUtil {
     // 保存路径
 //    String filePath = "/Users/gxwebsoft/Documents/uploads/" + "file/qrcode/" + userId + ".jpg";
     String filePath = "/www/wwwroot/file.ws/" + "file/qrcode/" + userId + ".jpg";
-    String qrcodeUrl = "https://file.gxwebsoft.com/qrcode/" + userId + ".jpg" + "?v=" + DateUtil.current();
+    String qrcodeUrl = "https://file.websoft.top/qrcode/" + userId + ".jpg" + "?v=" + DateUtil.current();
     // 生成二维码
     System.out.println("config = " + config);
     System.out.println("con = " + content);
diff --git a/src/main/java/com/gxwebsoft/common/core/utils/MyQrCodeUtil.java b/src/main/java/com/gxwebsoft/common/core/utils/MyQrCodeUtil.java
index 420452c..9651cce 100644
--- a/src/main/java/com/gxwebsoft/common/core/utils/MyQrCodeUtil.java
+++ b/src/main/java/com/gxwebsoft/common/core/utils/MyQrCodeUtil.java
@@ -61,7 +61,7 @@ public class MyQrCodeUtil {
    */
   public static String createQrCode(String type,Integer id, String content) throws IOException {
     String filePath = "/www/wwwroot/file.ws/file/qrcode/".concat(type).concat("/");
-    String qrcodeUrl = "https://file.gxwebsoft.com/qrcode/".concat(type).concat("/");
+    String qrcodeUrl = "https://file.websoft.top/qrcode/".concat(type).concat("/");
     // 将URL转为BufferedImage
     BufferedImage bufferedImage = ImageIO.read(new URL(logoUrl));
     // 生成二维码
diff --git a/src/main/java/com/gxwebsoft/think/controller/SchedulingController.java b/src/main/java/com/gxwebsoft/think/controller/SchedulingController.java
index 04a637c..404cfbd 100644
--- a/src/main/java/com/gxwebsoft/think/controller/SchedulingController.java
+++ b/src/main/java/com/gxwebsoft/think/controller/SchedulingController.java
@@ -140,4 +140,4 @@ public class SchedulingController extends BaseController {
         }
     }
 
-}
\ No newline at end of file
+}
diff --git a/src/main/java/com/gxwebsoft/think/entity/ThinkVip.java b/src/main/java/com/gxwebsoft/think/entity/ThinkVip.java
index ccd1317..02c921e 100644
--- a/src/main/java/com/gxwebsoft/think/entity/ThinkVip.java
+++ b/src/main/java/com/gxwebsoft/think/entity/ThinkVip.java
@@ -97,6 +97,9 @@ public class ThinkVip implements Serializable {
     @ApiModelProperty(value = "是否有效：1是，0否")
     private Integer isUse;
 
+    @ApiModelProperty(value = "是否销售：1是，0否")
+    private Integer isSale;
+
     @ApiModelProperty(value = "可用场馆")
     @TableField(exist = false)
     private String siteNames;
diff --git a/src/main/java/com/gxwebsoft/think/mapper/xml/ThinkVipMapper.xml b/src/main/java/com/gxwebsoft/think/mapper/xml/ThinkVipMapper.xml
index 230ae92..b80b10a 100644
--- a/src/main/java/com/gxwebsoft/think/mapper/xml/ThinkVipMapper.xml
+++ b/src/main/java/com/gxwebsoft/think/mapper/xml/ThinkVipMapper.xml
@@ -77,6 +77,9 @@
             <if test="param.isUse != null">
                 AND a.is_use = #{param.isUse}
             </if>
+            <if test="param.isSale != null">
+              AND a.is_sale = #{param.isSale}
+            </if>
             <if test="param.keywords != null">
               AND (a.name LIKE CONCAT('%', #{param.keywords}, '%')
               )
diff --git a/src/main/java/com/gxwebsoft/think/param/ThinkVipParam.java b/src/main/java/com/gxwebsoft/think/param/ThinkVipParam.java
index f681def..df29f7e 100644
--- a/src/main/java/com/gxwebsoft/think/param/ThinkVipParam.java
+++ b/src/main/java/com/gxwebsoft/think/param/ThinkVipParam.java
@@ -97,4 +97,8 @@ public class ThinkVipParam extends BaseParam {
     @QueryField(type = QueryType.EQ)
     private Integer isUse;
 
+    @ApiModelProperty(value = "是否销售：1是，0否")
+    @QueryField(type = QueryType.EQ)
+    private Integer isSale;
+
 }
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 3d9818f..2aca9fe 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -90,9 +90,9 @@ config:
   swagger-version: 1.0
   token-key: WLgNsWJ8rPjRtnjzX/Gx2RGS80Kwnm/ZeLbvIL+NrBs=
   # 主服务器
-  server-url: https://server.gxwebsoft.com/api
+  server-url: https://server.websoft.top/api
   # 文件服务器
-  file-server: https://file.gxwebsoft.com
+  file-server: https://file.websoft.top
   upload-path: /Users/gxwebsoft/Documents/uploads/
   local-upload-path: /Users/gxwebsoft/Documents/uploads/