update: 修改用户表, 添加字段

feifan-module-member/feifan-module-member-biz/src/main/java/cn/newfeifan/mall/module/member/controller/admin/user/vo/MemberUserBaseVO.java

@@ -10,6 +10,7 @@ import java.time.LocalDateTime;
 import java.util.List;
 
 import static cn.newfeifan.mall.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY;
+import static cn.newfeifan.mall.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
 
 /**
  * 会员用户 Base VO，提供给添加、修改、详细的子 VO 使用
@@ -62,4 +63,38 @@ public class MemberUserBaseVO {
     @Schema(description = "用户分组编号", example = "1")
     private Long groupId;
 
+    @Schema(description = "直接推荐人id", example = "15893")
+    private Long recommenderdId;
+
+    @Schema(description = "当前身价值")
+    private Long currentMemberWorthValue;
+
+    @Schema(description = "预增加身价值")
+    private Long preAddedMemberWorthValue;
+
+    @Schema(description = "未来身价值，未来身价值=当前身价值+预增加身价值")
+    private Long futureMemberWorthValue;
+
+    @Schema(description = "当前身价级别名称", example = "张三")
+    private String currentMemberWorthLevelName;
+
+    @Schema(description = "当前身价级别id", example = "24146")
+    private Long currentMemberWorthLevelId;
+
+    @Schema(description = "最后签到时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] lastSignInTime;
+
+    @Schema(description = "连续签到天数")
+    private LocalDateTime continuousSignInDays;
+
+    @Schema(description = "当前积分值")
+    private Long currentMemberPoints;
+
+    @Schema(description = "预增加积分值")
+    private Long preAddedMemberWorth;
+
+    @Schema(description = "累计消费金额（只算人民币，单位为分）")
+    private Long cumulativeSpending;
+
 }

feifan-module-member/feifan-module-member-biz/src/main/java/cn/newfeifan/mall/module/member/controller/admin/user/vo/MemberUserPageReqVO.java

@@ -44,5 +44,37 @@ public class MemberUserPageReqVO extends PageParam {
     // TODO 芋艿：注册用户类型；
 
     // TODO 芋艿：登录用户类型；
+    @Schema(description = "直接推荐人id", example = "15893")
+    private Long recommenderdId;
 
+    @Schema(description = "当前身价值")
+    private Long currentMemberWorthValue;
+
+    @Schema(description = "预增加身价值")
+    private Long preAddedMemberWorthValue;
+
+    @Schema(description = "未来身价值，未来身价值=当前身价值+预增加身价值")
+    private Long futureMemberWorthValue;
+
+    @Schema(description = "当前身价级别名称", example = "张三")
+    private String currentMemberWorthLevelName;
+
+    @Schema(description = "当前身价级别id", example = "24146")
+    private Long currentMemberWorthLevelId;
+
+    @Schema(description = "最后签到时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] lastSignInTime;
+
+    @Schema(description = "连续签到天数")
+    private LocalDateTime continuousSignInDays;
+
+    @Schema(description = "当前积分值")
+    private Long currentMemberPoints;
+
+    @Schema(description = "预增加积分值")
+    private Long preAddedMemberWorth;
+
+    @Schema(description = "累计消费金额（只算人民币，单位为分）")
+    private Long cumulativeSpending;
 }

feifan-module-member/feifan-module-member-biz/src/main/java/cn/newfeifan/mall/module/member/controller/admin/user/vo/MemberUserRespVO.java

@@ -4,10 +4,13 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.time.LocalDateTime;
 import java.util.List;
 
+import static cn.newfeifan.mall.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+
 @Schema(description = "管理后台 - 会员用户 Response VO")
 @Data
 @EqualsAndHashCode(callSuper = true)
@@ -49,4 +52,40 @@ public class MemberUserRespVO extends MemberUserBaseVO {
     @Schema(description = "用户经验值", requiredMode  = Schema.RequiredMode.REQUIRED, example = "200")
     private Integer experience;
 
+
+
+
+    @Schema(description = "直接推荐人id", example = "15893")
+    private Long recommenderdId;
+
+    @Schema(description = "当前身价值")
+    private Long currentMemberWorthValue;
+
+    @Schema(description = "预增加身价值")
+    private Long preAddedMemberWorthValue;
+
+    @Schema(description = "未来身价值，未来身价值=当前身价值+预增加身价值")
+    private Long futureMemberWorthValue;
+
+    @Schema(description = "当前身价级别名称", example = "张三")
+    private String currentMemberWorthLevelName;
+
+    @Schema(description = "当前身价级别id", example = "24146")
+    private Long currentMemberWorthLevelId;
+
+    @Schema(description = "最后签到时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] lastSignInTime;
+
+    @Schema(description = "连续签到天数")
+    private LocalDateTime continuousSignInDays;
+
+    @Schema(description = "当前积分值")
+    private Long currentMemberPoints;
+
+    @Schema(description = "预增加积分值")
+    private Long preAddedMemberWorth;
+
+    @Schema(description = "累计消费金额（只算人民币，单位为分）")
+    private Long cumulativeSpending;
 }

feifan-module-member/feifan-module-member-biz/src/main/java/cn/newfeifan/mall/module/member/dal/dataobject/user/MemberUserDO.java

@@ -142,4 +142,51 @@ public class MemberUserDO extends TenantBaseDO {
      */
     private Long groupId;
 
+
+
+    /**
+     * 直接推荐人id
+     */
+    private Long recommenderdId;
+    /**
+     * 当前身价值
+     */
+    private Long currentMemberWorthValue;
+    /**
+     * 预增加身价值
+     */
+    private Long preAddedMemberWorthValue;
+    /**
+     * 未来身价值，未来身价值=当前身价值+预增加身价值
+     */
+    private Long futureMemberWorthValue;
+    /**
+     * 当前身价级别名称
+     */
+    private String currentMemberWorthLevelName;
+    /**
+     * 当前身价级别id
+     */
+    private Long currentMemberWorthLevelId;
+    /**
+     * 最后签到时间
+     */
+    private LocalDateTime lastSignInTime;
+    /**
+     * 连续签到天数
+     */
+    private LocalDateTime continuousSignInDays;
+    /**
+     * 当前积分值
+     */
+    private Long currentMemberPoints;
+    /**
+     * 预增加积分值
+     */
+    private Long preAddedMemberWorth;
+    /**
+     * 累计消费金额（只算人民币，单位为分）
+     */
+    private Long cumulativeSpending;
+
 }

feifan-module-member/feifan-module-member-biz/src/main/java/cn/newfeifan/mall/module/member/dal/mysql/user/MemberUserMapper.java

@@ -47,6 +47,7 @@ public interface MemberUserMapper extends BaseMapperX<MemberUserDO> {
                 .betweenIfPresent(MemberUserDO::getCreateTime, reqVO.getCreateTime())
                 .eqIfPresent(MemberUserDO::getLevelId, reqVO.getLevelId())
                 .eqIfPresent(MemberUserDO::getGroupId, reqVO.getGroupId())
+                .eqIfPresent(MemberUserDO::getCurrentMemberWorthValue, reqVO.getCurrentMemberWorthValue())
                 .apply(StrUtil.isNotEmpty(tagIdSql), tagIdSql)
                 .orderByDesc(MemberUserDO::getId));
     }

feifan-module-sale/feifan-module-sale-biz/src/main/java/cn/newfeifan/mall/sale/controller/admin/merchant/vo/MerchantPageReqVO.java

@@ -58,5 +58,18 @@ public class MerchantPageReqVO extends PageParam {
 
     @Schema(description = "logo地址", example = "https://www.zhongxing.cn")
     private String logoUrl;
+    @Schema(description = "商户负责人姓名", example = "芋艿")
+    private String contactName;
 
+    @Schema(description = "商户负责人手机")
+    private String contactMobile;
+
+    @Schema(description = "服务套餐", example = "8463")
+    private Integer packageId;
+
+    @Schema(description = "店铺数量", example = "11326")
+    private Integer shopCount;
+
+    @Schema(description = "区域id，对应文件系统 src/main/resources/area.csv 中的id一列", example = "22725")
+    private Long areaId;
 }

feifan-module-sale/feifan-module-sale-biz/src/main/java/cn/newfeifan/mall/sale/controller/admin/merchant/vo/MerchantRespVO.java

@@ -73,4 +73,26 @@ public class MerchantRespVO {
     @ExcelProperty("logo地址")
     private String logoUrl;
 
+
+    @Schema(description = "商户负责人姓名", example = "芋艿")
+    @ExcelProperty("商户负责人姓名")
+    private String contactName;
+
+    @Schema(description = "商户负责人手机")
+    @ExcelProperty("商户负责人手机")
+    private String contactMobile;
+
+    @Schema(description = "服务套餐", example = "8463")
+    @ExcelProperty("服务套餐")
+    private Integer packageId;
+
+    @Schema(description = "店铺数量", example = "11326")
+    @ExcelProperty("店铺数量")
+    private Integer shopCount;
+
+    @Schema(description = "区域id，对应文件系统 src/main/resources/area.csv 中的id一列", example = "22725")
+    @ExcelProperty("区域id，对应文件系统 src/main/resources/area.csv 中的id一列")
+    private Long areaId;
+
+
 }

feifan-module-sale/feifan-module-sale-biz/src/main/java/cn/newfeifan/mall/sale/controller/admin/merchant/vo/MerchantSaveReqVO.java

@@ -55,4 +55,18 @@ public class MerchantSaveReqVO {
     @Schema(description = "logo地址", example = "https://www.zhongxing.cn")
     private String logoUrl;
 
+    @Schema(description = "商户负责人姓名", example = "芋艿")
+    private String contactName;
+
+    @Schema(description = "商户负责人手机")
+    private String contactMobile;
+
+    @Schema(description = "服务套餐", example = "8463")
+    private Integer packageId;
+
+    @Schema(description = "店铺数量", example = "11326")
+    private Integer shopCount;
+
+    @Schema(description = "区域id，对应文件系统 src/main/resources/area.csv 中的id一列", example = "22725")
+    private Long areaId;
 }

feifan-module-sale/feifan-module-sale-biz/src/main/java/cn/newfeifan/mall/sale/dal/dataobject/merchant/MerchantDO.java

@@ -81,4 +81,28 @@ public class MerchantDO extends BaseDO {
      */
     private String logoUrl;
 
+
+
+    /**
+     * 商户负责人姓名
+     */
+    private String contactName;
+    /**
+     * 商户负责人手机
+     */
+    private String contactMobile;
+    /**
+     * 服务套餐
+     */
+    private Integer packageId;
+    /**
+     * 店铺数量
+     */
+    private Integer shopCount;
+    /**
+     * 区域id，对应文件系统 src/main/resources/area.csv 中的id一列
+     */
+    private Long areaId;
+
+
 }

feifan-module-sale/feifan-module-sale-biz/src/main/java/cn/newfeifan/mall/sale/dal/mysql/merchant/MerchantMapper.java

@@ -20,7 +20,6 @@ public interface MerchantMapper extends BaseMapperX<MerchantDO> {
                 .likeIfPresent(MerchantDO::getName, reqVO.getName())
                 .eqIfPresent(MerchantDO::getStatus, reqVO.getStatus())
                 .eqIfPresent(MerchantDO::getDescription, reqVO.getDescription())
-                .eqIfPresent(MerchantDO::getContact, reqVO.getContact())
                 .eqIfPresent(MerchantDO::getAddress, reqVO.getAddress())
                 .eqIfPresent(MerchantDO::getContactNumber, reqVO.getContactNumber())
                 .eqIfPresent(MerchantDO::getWebsite, reqVO.getWebsite())
@@ -31,6 +30,12 @@ public interface MerchantMapper extends BaseMapperX<MerchantDO> {
                 .betweenIfPresent(MerchantDO::getExpireTime, reqVO.getExpireTime())
                 .betweenIfPresent(MerchantDO::getCreateTime, reqVO.getCreateTime())
                 .eqIfPresent(MerchantDO::getLogoUrl, reqVO.getLogoUrl())
+                .eqIfPresent(MerchantDO::getContact, reqVO.getContact())
+                .likeIfPresent(MerchantDO::getContactName, reqVO.getContactName())
+                .eqIfPresent(MerchantDO::getContactMobile, reqVO.getContactMobile())
+                .eqIfPresent(MerchantDO::getPackageId, reqVO.getPackageId())
+                .eqIfPresent(MerchantDO::getShopCount, reqVO.getShopCount())
+                .eqIfPresent(MerchantDO::getAreaId, reqVO.getAreaId())
                 .orderByDesc(MerchantDO::getId));
     }
 

feifan-server/src/main/java/cn/newfeifan/mall/server/FeifanServerApplication.java

@@ -13,10 +13,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
  * @author 非繁源码
  */
 @SuppressWarnings("SpringComponentScan") // 忽略 IDEA 无法识别 ${feifan.info.base-package}
-@SpringBootApplication(scanBasePackages = {
-        "${feifan.info.base-package}.server",
-        "${feifan.info.base-package}.module",
-        "${feifan.info.base-package}.sale"})
+@SpringBootApplication(scanBasePackages = {"${feifan.info.base-package}.server","${feifan.info.base-package}.module","${feifan.info.base-package}.sale"})
 public class FeifanServerApplication {
 
     public static void main(String[] args) {