新增：VIP卡的上架下架功能、及是否有效属性

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);

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));
     // 生成二维码

src/main/java/com/gxwebsoft/think/controller/SchedulingController.java

@@ -140,4 +140,4 @@ public class SchedulingController extends BaseController {
         }
     }
 
-}
+}

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;

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}, '%')
               )

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;
+
 }

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/