封版

src/main/java/com/gxwebsoft/common/system/controller/WxLoginController.java

@@ -110,6 +110,8 @@ public class WxLoginController extends BaseController {
     String access_token = JwtUtil.buildToken(new JwtSubject(user.getUsername(), user.getTenantId()),
       configProperties.getTokenExpireTime(), configProperties.getTokenKey());
     loginRecordService.saveAsync(user.getUsername(), LoginRecord.TYPE_REGISTER, null, user.getTenantId(), request);
+    // 附加体育中心项目用户信息
+//    user.setBookingUser();
     return success("登录成功", new LoginResult(access_token, user));
   }
 

src/main/java/com/gxwebsoft/common/system/entity/Merchant.java

@@ -1,9 +1,6 @@
 package com.gxwebsoft.common.system.entity;
 
-import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.*;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -33,6 +30,9 @@ public class Merchant implements Serializable {
     @ApiModelProperty(value = "商户名称")
     private String merchantName;
 
+    @ApiModelProperty(value = "商户标识")
+    private String merchantCode;
+
     @ApiModelProperty(value = "商户图标")
     private String image;
 
@@ -93,6 +93,10 @@ public class Merchant implements Serializable {
     @ApiModelProperty(value = "状态")
     private Integer status;
 
+    @ApiModelProperty("是否删除, 0否, 1是")
+    @TableLogic
+    private Integer deleted;
+
     @ApiModelProperty(value = "排序号")
     private Integer sortNumber;
 

src/main/java/com/gxwebsoft/common/system/mapper/xml/MerchantMapper.xml

@@ -13,6 +13,9 @@
             <if test="param.merchantName != null">
                 AND a.merchant_name LIKE CONCAT('%', #{param.merchantName}, '%')
             </if>
+            <if test="param.merchantCode != null">
+              AND a.merchant_code LIKE CONCAT('%', #{param.merchantCode}, '%')
+            </if>
             <if test="param.image != null">
                 AND a.image LIKE CONCAT('%', #{param.image}, '%')
             </if>
@@ -61,6 +64,12 @@
             <if test="param.createTimeEnd != null">
                 AND a.create_time &lt;= #{param.createTimeEnd}
             </if>
+            <if test="param.deleted != null">
+              AND a.deleted = #{param.deleted}
+            </if>
+            <if test="param.deleted == null">
+              AND a.deleted = 0
+            </if>
             <if test="param.keywords != null">
               AND (
               a.merchant_name LIKE CONCAT('%', #{param.keywords}, '%')

src/main/java/com/gxwebsoft/common/system/mapper/xml/UserMapper.xml

@@ -98,6 +98,9 @@
             <if test="param.recommend != null">
               AND a.recommend = #{param.recommend}
             </if>
+            <if test="param.isAdmin != null">
+              AND a.is_admin = #{param.isAdmin}
+            </if>
             <if test="param.deleted != null">
                 AND a.deleted = #{param.deleted}
             </if>

src/main/java/com/gxwebsoft/common/system/param/MerchantParam.java

@@ -1,5 +1,6 @@
 package com.gxwebsoft.common.system.param;
 
+import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.gxwebsoft.common.core.annotation.QueryField;
 import com.gxwebsoft.common.core.annotation.QueryType;
@@ -31,6 +32,9 @@ public class MerchantParam extends BaseParam {
     @ApiModelProperty(value = "商户名称")
     private String merchantName;
 
+    @ApiModelProperty(value = "商户标识")
+    private String merchantCode;
+
     @ApiModelProperty(value = "商户图标")
     private String image;
 
@@ -84,6 +88,10 @@ public class MerchantParam extends BaseParam {
     @QueryField(type = QueryType.EQ)
     private Integer status;
 
+    @ApiModelProperty("是否删除, 0否, 1是")
+    @TableLogic
+    private Integer deleted;
+
     @ApiModelProperty(value = "排序号")
     @QueryField(type = QueryType.EQ)
     private Integer sortNumber;

src/main/java/com/gxwebsoft/common/system/param/UserParam.java

@@ -198,6 +198,10 @@ public class UserParam extends BaseParam {
     @TableField(exist = false)
     private Boolean isStaff;
 
+    @ApiModelProperty(value = "是否管理员")
+    @TableField(exist = false)
+    private Boolean isAdmin;
+
     @ApiModelProperty("最后结算时间")
     @TableField(exist = false)
     private Date settlementTime;