diff --git a/src/main/java/com/gxwebsoft/booking/controller/UserCardController.java b/src/main/java/com/gxwebsoft/booking/controller/UserCardController.java index 486e61d..58cadab 100644 --- a/src/main/java/com/gxwebsoft/booking/controller/UserCardController.java +++ b/src/main/java/com/gxwebsoft/booking/controller/UserCardController.java @@ -22,7 +22,7 @@ import java.util.List; * 会员卡控制器 * * @author 科技小王子 - * @since 2024-05-25 17:20:15 + * @since 2024-05-27 19:58:58 */ @Api(tags = "会员卡管理") @RestController diff --git a/src/main/java/com/gxwebsoft/booking/entity/Integral.java b/src/main/java/com/gxwebsoft/booking/entity/Integral.java index affba20..2ef3873 100644 --- a/src/main/java/com/gxwebsoft/booking/entity/Integral.java +++ b/src/main/java/com/gxwebsoft/booking/entity/Integral.java @@ -1,6 +1,8 @@ package com.gxwebsoft.booking.entity; import java.math.BigDecimal; + +import cn.hutool.core.util.DesensitizedUtil; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; @@ -35,6 +37,9 @@ public class Integral implements Serializable { @ApiModelProperty(value = "手机号码") private String phone; + @ApiModelProperty(value = "手机号码") + private String mobile; + @ApiModelProperty(value = "获得积分") private BigDecimal integral; @@ -50,4 +55,9 @@ public class Integral implements Serializable { @ApiModelProperty(value = "签到时间") private Long createTime; + public String getMobile(){ + return DesensitizedUtil.mobilePhone(this.phone); + } + + } diff --git a/src/main/java/com/gxwebsoft/booking/entity/UserCard.java b/src/main/java/com/gxwebsoft/booking/entity/UserCard.java index a5d9dd6..c265c76 100644 --- a/src/main/java/com/gxwebsoft/booking/entity/UserCard.java +++ b/src/main/java/com/gxwebsoft/booking/entity/UserCard.java @@ -4,7 +4,6 @@ import java.math.BigDecimal; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableField; import java.io.Serializable; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -15,7 +14,7 @@ import lombok.EqualsAndHashCode; * 会员卡 * * @author 科技小王子 - * @since 2024-05-25 17:20:15 + * @since 2024-05-27 19:58:57 */ @Data @EqualsAndHashCode(callSuper = false) @@ -141,10 +140,18 @@ public class UserCard implements Serializable { private Integer updateTime; @ApiModelProperty(value = "身份证号码") - @TableField("IDCard") - private String idcard; + private String idCard; @ApiModelProperty(value = "备注") private String remark; + @ApiModelProperty(value = "备注") + private String comments; + + @ApiModelProperty(value = "排序号") + private Integer sortNumber; + + @ApiModelProperty(value = "租户id") + private Integer tenantId; + } diff --git a/src/main/java/com/gxwebsoft/booking/mapper/UserCardMapper.java b/src/main/java/com/gxwebsoft/booking/mapper/UserCardMapper.java index 6662128..adac643 100644 --- a/src/main/java/com/gxwebsoft/booking/mapper/UserCardMapper.java +++ b/src/main/java/com/gxwebsoft/booking/mapper/UserCardMapper.java @@ -12,7 +12,7 @@ import java.util.List; * 会员卡Mapper * * @author 科技小王子 - * @since 2024-05-25 17:20:15 + * @since 2024-05-27 19:58:57 */ public interface UserCardMapper extends BaseMapper { diff --git a/src/main/java/com/gxwebsoft/booking/mapper/xml/IntegralMapper.xml b/src/main/java/com/gxwebsoft/booking/mapper/xml/IntegralMapper.xml index 88b64ad..80aef5d 100644 --- a/src/main/java/com/gxwebsoft/booking/mapper/xml/IntegralMapper.xml +++ b/src/main/java/com/gxwebsoft/booking/mapper/xml/IntegralMapper.xml @@ -35,7 +35,9 @@ AND a.create_time <= #{param.createTimeEnd} - AND (a.comments LIKE CONCAT('%', #{param.keywords}, '%') + AND (a.username LIKE CONCAT('%', #{param.keywords}, '%') + OR a.phone LIKE CONCAT('%', #{param.keywords}, '%') + OR a.user_id = #{param.keywords} ) diff --git a/src/main/java/com/gxwebsoft/booking/mapper/xml/UserCardMapper.xml b/src/main/java/com/gxwebsoft/booking/mapper/xml/UserCardMapper.xml index 8307550..498acdf 100644 --- a/src/main/java/com/gxwebsoft/booking/mapper/xml/UserCardMapper.xml +++ b/src/main/java/com/gxwebsoft/booking/mapper/xml/UserCardMapper.xml @@ -124,12 +124,18 @@ AND a.create_time <= #{param.createTimeEnd} - - AND a.IDCard LIKE CONCAT('%', #{param.idcard}, '%') + + AND a.id_card LIKE CONCAT('%', #{param.idCard}, '%') AND a.remark LIKE CONCAT('%', #{param.remark}, '%') + + AND a.comments LIKE CONCAT('%', #{param.comments}, '%') + + + AND a.sort_number = #{param.sortNumber} + AND (a.comments LIKE CONCAT('%', #{param.keywords}, '%') ) diff --git a/src/main/java/com/gxwebsoft/booking/param/UserCardParam.java b/src/main/java/com/gxwebsoft/booking/param/UserCardParam.java index 52da1e3..3415198 100644 --- a/src/main/java/com/gxwebsoft/booking/param/UserCardParam.java +++ b/src/main/java/com/gxwebsoft/booking/param/UserCardParam.java @@ -14,7 +14,7 @@ import lombok.EqualsAndHashCode; * 会员卡查询参数 * * @author 科技小王子 - * @since 2024-05-25 17:20:15 + * @since 2024-05-27 19:58:57 */ @Data @EqualsAndHashCode(callSuper = false) @@ -157,9 +157,16 @@ public class UserCardParam extends BaseParam { private Integer useTime; @ApiModelProperty(value = "身份证号码") - private String idcard; + private String idCard; @ApiModelProperty(value = "备注") private String remark; + @ApiModelProperty(value = "备注") + private String comments; + + @ApiModelProperty(value = "排序号") + @QueryField(type = QueryType.EQ) + private Integer sortNumber; + } diff --git a/src/main/java/com/gxwebsoft/booking/service/UserCardService.java b/src/main/java/com/gxwebsoft/booking/service/UserCardService.java index 7fd4cd7..7f52a6f 100644 --- a/src/main/java/com/gxwebsoft/booking/service/UserCardService.java +++ b/src/main/java/com/gxwebsoft/booking/service/UserCardService.java @@ -11,7 +11,7 @@ import java.util.List; * 会员卡Service * * @author 科技小王子 - * @since 2024-05-25 17:20:15 + * @since 2024-05-27 19:58:57 */ public interface UserCardService extends IService { diff --git a/src/main/java/com/gxwebsoft/booking/service/impl/UserCardServiceImpl.java b/src/main/java/com/gxwebsoft/booking/service/impl/UserCardServiceImpl.java index abc0d09..aff3151 100644 --- a/src/main/java/com/gxwebsoft/booking/service/impl/UserCardServiceImpl.java +++ b/src/main/java/com/gxwebsoft/booking/service/impl/UserCardServiceImpl.java @@ -15,7 +15,7 @@ import java.util.List; * 会员卡Service实现 * * @author 科技小王子 - * @since 2024-05-25 17:20:15 + * @since 2024-05-27 19:58:57 */ @Service public class UserCardServiceImpl extends ServiceImpl implements UserCardService { diff --git a/src/test/java/com/gxwebsoft/generator/BookingGenerator.java b/src/test/java/com/gxwebsoft/generator/BookingGenerator.java index 39f9739..0f7e29c 100644 --- a/src/test/java/com/gxwebsoft/generator/BookingGenerator.java +++ b/src/test/java/com/gxwebsoft/generator/BookingGenerator.java @@ -59,7 +59,7 @@ public class BookingGenerator { // "booking_emergency", // "booking_user_coupon", // "booking_user_invoice", -// "booking_user_card", + "booking_user_card", }; // 需要去除的表前缀 private static final String[] TABLE_PREFIX = new String[]{