Merge remote-tracking branch 'origin/master'

feifan-module-mall/feifan-module-product-biz/src/main/java/cn/newfeifan/mall/module/product/controller/admin/comment/vo/ProductCommentCreateReqVO.java

@@ -46,4 +46,6 @@ public class ProductCommentCreateReqVO {
     @Size(max = 9, message = "评论图片地址数组长度不能超过 9 张")
     private List<String> picUrls;
 
+    @Schema(description = "店铺id", example = "20588")
+    private Long shopId;
 }

feifan-module-mall/feifan-module-product-biz/src/main/java/cn/newfeifan/mall/module/product/controller/admin/comment/vo/ProductCommentPageReqVO.java

@@ -44,4 +44,6 @@ public class ProductCommentPageReqVO extends PageParam {
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime[] createTime;
 
+    @Schema(description = "店铺id", example = "20588")
+    private Long shopId;
 }

feifan-module-mall/feifan-module-product-biz/src/main/java/cn/newfeifan/mall/module/product/controller/admin/comment/vo/ProductCommentRespVO.java

@@ -79,4 +79,6 @@ public class ProductCommentRespVO {
     @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
     private LocalDateTime createTime;
 
+    @Schema(description = "店铺id", example = "20588")
+    private Long shopId;
 }

feifan-module-mall/feifan-module-product-biz/src/main/java/cn/newfeifan/mall/module/product/controller/admin/property/vo/property/ProductPropertyPageReqVO.java

@@ -27,4 +27,8 @@ public class ProductPropertyPageReqVO extends PageParam {
     @Schema(description = "创建时间")
     private LocalDateTime[] createTime;
 
+    @Schema(description = "店铺id", example = "20588")
+    private Long shopId;
+
+
 }

feifan-module-mall/feifan-module-product-biz/src/main/java/cn/newfeifan/mall/module/product/controller/admin/property/vo/property/ProductPropertyRespVO.java

@@ -21,4 +21,7 @@ public class ProductPropertyRespVO {
     @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
     private LocalDateTime createTime;
 
+    @Schema(description = "店铺id", example = "20588")
+    private Long shopId;
+
 }

feifan-module-mall/feifan-module-product-biz/src/main/java/cn/newfeifan/mall/module/product/controller/admin/property/vo/property/ProductPropertySaveReqVO.java

@@ -19,4 +19,7 @@ public class ProductPropertySaveReqVO {
     @Schema(description = "备注", example = "颜色")
     private String remark;
 
+    @Schema(description = "店铺id", example = "20588")
+    private Long shopId;
+
 }

feifan-module-mall/feifan-module-product-biz/src/main/java/cn/newfeifan/mall/module/product/controller/admin/property/vo/value/ProductPropertyValuePageReqVO.java

@@ -21,4 +21,6 @@ public class ProductPropertyValuePageReqVO extends PageParam {
     @Schema(description = "状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
     private Integer status;
 
+    @Schema(description = "店铺id", example = "20588")
+    private Long shopId;
 }

feifan-module-mall/feifan-module-product-biz/src/main/java/cn/newfeifan/mall/module/product/controller/admin/property/vo/value/ProductPropertyValueRespVO.java

@@ -28,4 +28,6 @@ public class ProductPropertyValueRespVO {
     @Schema(description = "创建时间")
     private LocalDateTime createTime;
 
+    @Schema(description = "店铺id", example = "20588")
+    private Long shopId;
 }

feifan-module-mall/feifan-module-product-biz/src/main/java/cn/newfeifan/mall/module/product/controller/admin/property/vo/value/ProductPropertyValueSaveReqVO.java

@@ -24,4 +24,6 @@ public class ProductPropertyValueSaveReqVO {
     @Schema(description = "备注", example = "颜色")
     private String remark;
 
+    @Schema(description = "店铺id", example = "20588")
+    private Long shopId;
 }

feifan-module-mall/feifan-module-product-biz/src/main/java/cn/newfeifan/mall/module/product/controller/admin/spu/vo/ProductSkuRespVO.java

@@ -55,5 +55,7 @@ public class ProductSkuRespVO {
     private String mark;
 
 
+    @Schema(description = "店铺id", example = "20588")
+    private Long shopId;
 
 }

feifan-module-mall/feifan-module-product-biz/src/main/java/cn/newfeifan/mall/module/product/controller/admin/spu/vo/ProductSkuSaveReqVO.java

@@ -80,4 +80,6 @@ public class ProductSkuSaveReqVO {
 
     }
 
+    @Schema(description = "店铺id", example = "20588")
+    private Long shopId;
 }

feifan-module-mall/feifan-module-product-biz/src/main/java/cn/newfeifan/mall/module/product/controller/admin/spu/vo/ProductSpuPageReqVO.java

@@ -69,4 +69,6 @@ public class ProductSpuPageReqVO extends PageParam {
     @Schema(description = "备注")
     private String mark;
 
+    @Schema(description = "店铺id", example = "20588")
+    private Long shopId;
 }

feifan-module-mall/feifan-module-product-biz/src/main/java/cn/newfeifan/mall/module/product/controller/admin/spu/vo/ProductSpuRespVO.java

@@ -129,4 +129,6 @@ public class ProductSpuRespVO {
     @Schema(description = "商品类别", example = "1")
     private Integer spuType;
 
+    @Schema(description = "店铺id", example = "20588")
+    private Long shopId;
 }

feifan-module-mall/feifan-module-product-biz/src/main/java/cn/newfeifan/mall/module/product/controller/admin/spu/vo/ProductSpuSaveReqVO.java

@@ -99,4 +99,6 @@ public class ProductSpuSaveReqVO {
     @Schema(description = "商品类别", example = "1")
     private Integer spuType;
 
+    @Schema(description = "店铺id", example = "20588")
+    private Long shopId;
 }

feifan-module-mall/feifan-module-product-biz/src/main/java/cn/newfeifan/mall/module/product/controller/admin/spu/vo/ProductSpuSimpleRespVO.java

@@ -38,4 +38,6 @@ public class ProductSpuSimpleRespVO {
     @Schema(description = "商品浏览量", requiredMode = Schema.RequiredMode.REQUIRED, example = "2000")
     private Integer browseCount;
 
+    @Schema(description = "店铺id", example = "20588")
+    private Long shopId;
 }

feifan-module-mall/feifan-module-product-biz/src/main/java/cn/newfeifan/mall/module/product/dal/dataobject/comment/ProductCommentDO.java

@@ -156,4 +156,7 @@ public class ProductCommentDO extends BaseDO {
      */
     private LocalDateTime replyTime;
 
+
+    private Long shopId;
+
 }

feifan-module-mall/feifan-module-product-biz/src/main/java/cn/newfeifan/mall/module/product/dal/dataobject/property/ProductPropertyDO.java

@@ -48,4 +48,6 @@ public class ProductPropertyDO extends BaseDO {
      */
     private String remark;
 
+    private Long shopId;
+
 }

feifan-module-mall/feifan-module-product-biz/src/main/java/cn/newfeifan/mall/module/product/dal/dataobject/property/ProductPropertyValueDO.java

@@ -52,4 +52,6 @@ public class ProductPropertyValueDO extends BaseDO {
      */
     private String remark;
 
+    private Long shopId;
+
 }

feifan-module-mall/feifan-module-product-biz/src/main/java/cn/newfeifan/mall/module/product/dal/dataobject/sku/ProductSkuDO.java

@@ -104,6 +104,7 @@ public class ProductSkuDO extends BaseDO {
     private String mark;
 
 
+    private Long shopId;
     /**
      * 商品属性
      */

feifan-module-mall/feifan-module-product-biz/src/main/java/cn/newfeifan/mall/module/product/dal/dataobject/spu/ProductSpuDO.java

@@ -178,4 +178,7 @@ public class ProductSpuDO extends BaseDO {
     private Integer spuType;
 
 
+    private Long shopId;
+
+
 }

feifan-module-mall/feifan-module-product-biz/src/main/java/cn/newfeifan/mall/module/product/dal/mysql/comment/ProductCommentMapper.java

@@ -17,6 +17,7 @@ public interface ProductCommentMapper extends BaseMapperX<ProductCommentDO> {
                 .likeIfPresent(ProductCommentDO::getUserNickname, reqVO.getUserNickname())
                 .eqIfPresent(ProductCommentDO::getOrderId, reqVO.getOrderId())
                 .eqIfPresent(ProductCommentDO::getSpuId, reqVO.getSpuId())
+                .eqIfPresent(ProductCommentDO::getShopId, reqVO.getShopId())
                 .eqIfPresent(ProductCommentDO::getScores, reqVO.getScores())
                 .eqIfPresent(ProductCommentDO::getReplyStatus, reqVO.getReplyStatus())
                 .betweenIfPresent(ProductCommentDO::getCreateTime, reqVO.getCreateTime())

feifan-module-mall/feifan-module-product-biz/src/main/java/cn/newfeifan/mall/module/product/dal/mysql/property/ProductPropertyMapper.java

@@ -13,6 +13,7 @@ public interface ProductPropertyMapper extends BaseMapperX<ProductPropertyDO> {
     default PageResult<ProductPropertyDO> selectPage(ProductPropertyPageReqVO reqVO) {
         return selectPage(reqVO, new LambdaQueryWrapperX<ProductPropertyDO>()
                 .likeIfPresent(ProductPropertyDO::getName, reqVO.getName())
+                .eqIfPresent(ProductPropertyDO::getShopId, reqVO.getShopId())
                 .betweenIfPresent(ProductPropertyDO::getCreateTime, reqVO.getCreateTime())
                 .orderByDesc(ProductPropertyDO::getId));
     }

feifan-module-mall/feifan-module-product-biz/src/main/java/cn/newfeifan/mall/module/product/dal/mysql/property/ProductPropertyValueMapper.java

@@ -32,6 +32,7 @@ public interface ProductPropertyValueMapper extends BaseMapperX<ProductPropertyV
     default PageResult<ProductPropertyValueDO> selectPage(ProductPropertyValuePageReqVO reqVO) {
         return selectPage(reqVO, new LambdaQueryWrapperX<ProductPropertyValueDO>()
                 .eqIfPresent(ProductPropertyValueDO::getPropertyId, reqVO.getPropertyId())
+                .eqIfPresent(ProductPropertyValueDO::getShopId, reqVO.getShopId())
                 .likeIfPresent(ProductPropertyValueDO::getName, reqVO.getName())
                 .orderByDesc(ProductPropertyValueDO::getId));
     }

feifan-module-mall/feifan-module-product-biz/src/main/java/cn/newfeifan/mall/module/product/dal/mysql/spu/ProductSpuMapper.java

@@ -28,6 +28,7 @@ public interface ProductSpuMapper extends BaseMapperX<ProductSpuDO> {
         Integer tabType = reqVO.getTabType();
         LambdaQueryWrapperX<ProductSpuDO> queryWrapper = new LambdaQueryWrapperX<ProductSpuDO>()
                 .likeIfPresent(ProductSpuDO::getName, reqVO.getName())
+                .eqIfPresent(ProductSpuDO::getShopId,reqVO.getShopId())
                 .eqIfPresent(ProductSpuDO::getCategoryId, reqVO.getCategoryId())
                 .betweenIfPresent(ProductSpuDO::getCreateTime, reqVO.getCreateTime())
                 .orderByDesc(ProductSpuDO::getSort);

feifan-module-mall/feifan-module-trade-biz/src/main/java/cn/newfeifan/mall/module/trade/controller/admin/aftersale/vo/AfterSaleBaseVO.java

@@ -116,4 +116,6 @@ public class AfterSaleBaseVO {
     @Schema(description = "收货备注", example = "不喜欢")
     private String receiveReason;
 
+    @Schema(description = "店铺id", example = "20588")
+    private Long shopId;
 }

feifan-module-mall/feifan-module-trade-biz/src/main/java/cn/newfeifan/mall/module/trade/controller/admin/aftersale/vo/AfterSaleDetailRespVO.java

@@ -49,4 +49,6 @@ public class AfterSaleDetailRespVO extends AfterSaleBaseVO {
 
     }
 
+    @Schema(description = "店铺id", example = "20588")
+    private Long shopId;
 }

feifan-module-mall/feifan-module-trade-biz/src/main/java/cn/newfeifan/mall/module/trade/controller/admin/aftersale/vo/AfterSalePageReqVO.java

@@ -46,4 +46,6 @@ public class AfterSalePageReqVO extends PageParam {
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime[] createTime;
 
+    @Schema(description = "店铺id", example = "20588")
+    private Long shopId;
 }

feifan-module-mall/feifan-module-trade-biz/src/main/java/cn/newfeifan/mall/module/trade/controller/admin/delivery/vo/express/DeliveryExpressBaseVO.java

@@ -31,4 +31,7 @@ public class DeliveryExpressBaseVO {
     @NotNull(message = "状态不能为空")
     private Integer status;
 
+    @Schema(description = "店铺id", example = "20588")
+    private Long shopId;
+
 }

feifan-module-mall/feifan-module-trade-biz/src/main/java/cn/newfeifan/mall/module/trade/controller/admin/delivery/vo/express/DeliveryExpressExportReqVO.java

@@ -24,5 +24,6 @@ public class DeliveryExpressExportReqVO {
     @Schema(description = "创建时间")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime[] createTime;
-
+    @Schema(description = "店铺id", example = "20588")
+    private Long shopId;
 }

feifan-module-mall/feifan-module-trade-biz/src/main/java/cn/newfeifan/mall/module/trade/controller/admin/delivery/vo/express/DeliveryExpressPageReqVO.java

@@ -27,5 +27,6 @@ public class DeliveryExpressPageReqVO extends PageParam {
     @Schema(description = "创建时间")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime[] createTime;
-
+    @Schema(description = "店铺id", example = "20588")
+    private Long shopId;
 }

feifan-module-mall/feifan-module-trade-biz/src/main/java/cn/newfeifan/mall/module/trade/controller/admin/delivery/vo/expresstemplate/DeliveryExpressTemplatePageReqVO.java

@@ -26,5 +26,6 @@ public class DeliveryExpressTemplatePageReqVO extends PageParam {
     @Schema(description = "创建时间")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime[] createTime;
-
+    @Schema(description = "店铺id", example = "20588")
+    private Long shopId;
 }

feifan-module-mall/feifan-module-trade-biz/src/main/java/cn/newfeifan/mall/module/trade/controller/admin/delivery/vo/pickup/DeliveryPickUpStoreBaseVO.java

@@ -64,5 +64,6 @@ public class DeliveryPickUpStoreBaseVO {
     @NotNull(message = "门店状态不能为空")
     @InEnum(CommonStatusEnum.class)
     private Integer status;
-
+    @Schema(description = "店铺id", example = "20588")
+    private Long shopId;
 }

feifan-module-mall/feifan-module-trade-biz/src/main/java/cn/newfeifan/mall/module/trade/controller/admin/delivery/vo/pickup/DeliveryPickUpStorePageReqVO.java

@@ -36,5 +36,6 @@ public class DeliveryPickUpStorePageReqVO extends PageParam {
     @Schema(description = "创建时间")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime[] createTime;
-
+    @Schema(description = "店铺id", example = "20588")
+    private Long shopId;
 }

feifan-module-mall/feifan-module-trade-biz/src/main/java/cn/newfeifan/mall/module/trade/controller/admin/order/vo/TradeOrderBaseVO.java

@@ -148,4 +148,6 @@ public class TradeOrderBaseVO {
     @Schema(description = "推广人编号", example = "1")
     private Long brokerageUserId;
 
+    @Schema(description = "店铺id", example = "20588")
+    private Long shopId;
 }

feifan-module-mall/feifan-module-trade-biz/src/main/java/cn/newfeifan/mall/module/trade/controller/admin/order/vo/TradeOrderItemBaseVO.java

@@ -64,4 +64,6 @@ public class TradeOrderItemBaseVO {
     @Schema(description = "售后状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
     private Integer afterSaleStatus;
 
+    @Schema(description = "店铺id", example = "20588")
+    private Long shopId;
 }

feifan-module-mall/feifan-module-trade-biz/src/main/java/cn/newfeifan/mall/module/trade/controller/admin/order/vo/TradeOrderPageItemRespVO.java

@@ -32,4 +32,6 @@ public class TradeOrderPageItemRespVO extends TradeOrderBaseVO {
 
     }
 
+    @Schema(description = "店铺id", example = "20588")
+    private Long shopId;
 }

feifan-module-mall/feifan-module-trade-biz/src/main/java/cn/newfeifan/mall/module/trade/controller/admin/order/vo/TradeOrderPageReqVO.java

@@ -61,4 +61,6 @@ public class TradeOrderPageReqVO extends PageParam {
     @InEnum(value = TerminalEnum.class, message = "订单来源 {value}")
     private Integer terminal;
 
+    @Schema(description = "店铺id", example = "20588")
+    private Long shopId;
 }

feifan-module-mall/feifan-module-trade-biz/src/main/java/cn/newfeifan/mall/module/trade/controller/app/order/vo/AppTradeOrderDetailRespVO.java

@@ -144,4 +144,6 @@ public class AppTradeOrderDetailRespVO {
      */
     private List<AppTradeOrderItemRespVO> items;
 
+    @Schema(description = "店铺id", example = "20588")
+    private Long shopId;
 }

feifan-module-mall/feifan-module-trade-biz/src/main/java/cn/newfeifan/mall/module/trade/controller/app/order/vo/AppTradeOrderPageItemRespVO.java

@@ -50,4 +50,6 @@ public class AppTradeOrderPageItemRespVO {
      */
     private List<AppTradeOrderItemRespVO> items;
 
+    @Schema(description = "店铺id", example = "20588")
+    private Long shopId;
 }

feifan-module-mall/feifan-module-trade-biz/src/main/java/cn/newfeifan/mall/module/trade/controller/app/order/vo/AppTradeOrderSettlementReqVO.java

@@ -102,4 +102,6 @@ public class AppTradeOrderSettlementReqVO {
 
     }
 
+    @Schema(description = "店铺id", example = "20588")
+    private Long shopId;
 }

feifan-module-mall/feifan-module-trade-biz/src/main/java/cn/newfeifan/mall/module/trade/controller/app/order/vo/AppTradeOrderSettlementRespVO.java

@@ -122,4 +122,6 @@ public class AppTradeOrderSettlementRespVO {
 
     }
 
+    @Schema(description = "店铺id", example = "20588")
+    private Long shopId;
 }

feifan-module-mall/feifan-module-trade-biz/src/main/java/cn/newfeifan/mall/module/trade/dal/dataobject/aftersale/AfterSaleDO.java

@@ -198,4 +198,8 @@ public class AfterSaleDO extends BaseDO {
      */
     private String receiveReason;
 
+
+
+    private Long shopId;
+
 }

feifan-module-mall/feifan-module-trade-biz/src/main/java/cn/newfeifan/mall/module/trade/dal/dataobject/delivery/DeliveryExpressTemplateDO.java

@@ -40,4 +40,7 @@ public class DeliveryExpressTemplateDO extends BaseDO {
      */
     private Integer sort;
 
+
+    private Long shopId;
+
 }

feifan-module-mall/feifan-module-trade-biz/src/main/java/cn/newfeifan/mall/module/trade/dal/dataobject/delivery/DeliveryPickUpStoreDO.java

@@ -81,4 +81,5 @@ public class DeliveryPickUpStoreDO extends BaseDO {
      */
     private Integer status;
 
+    private Long shopId;
 }

feifan-module-mall/feifan-module-trade-biz/src/main/java/cn/newfeifan/mall/module/trade/dal/dataobject/order/TradeOrderDO.java

@@ -330,4 +330,7 @@ public class TradeOrderDO extends BaseDO {
      */
     private Long combinationRecordId;
 
+
+    private Long shopId;
+
 }

feifan-module-mall/feifan-module-trade-biz/src/main/java/cn/newfeifan/mall/module/trade/dal/mysql/aftersale/AfterSaleMapper.java

@@ -19,6 +19,7 @@ public interface AfterSaleMapper extends BaseMapperX<AfterSaleDO> {
                 .likeIfPresent(AfterSaleDO::getNo, reqVO.getNo())
                 .eqIfPresent(AfterSaleDO::getStatus, reqVO.getStatus())
                 .eqIfPresent(AfterSaleDO::getType, reqVO.getType())
+                .eqIfPresent(AfterSaleDO::getShopId,reqVO.getShopId())
                 .eqIfPresent(AfterSaleDO::getWay, reqVO.getWay())
                 .likeIfPresent(AfterSaleDO::getOrderNo, reqVO.getOrderNo())
                 .likeIfPresent(AfterSaleDO::getSpuName, reqVO.getSpuName())

feifan-module-mall/feifan-module-trade-biz/src/main/java/cn/newfeifan/mall/module/trade/dal/mysql/delivery/DeliveryExpressTemplateMapper.java

@@ -15,12 +15,13 @@ public interface DeliveryExpressTemplateMapper extends BaseMapperX<DeliveryExpre
         return selectPage(reqVO, new LambdaQueryWrapperX<DeliveryExpressTemplateDO>()
                 .likeIfPresent(DeliveryExpressTemplateDO::getName, reqVO.getName())
                 .eqIfPresent(DeliveryExpressTemplateDO::getChargeMode, reqVO.getChargeMode())
+                .eqIfPresent(DeliveryExpressTemplateDO::getShopId, reqVO.getShopId())
                 .betweenIfPresent(DeliveryExpressTemplateDO::getCreateTime, reqVO.getCreateTime())
                 .orderByAsc(DeliveryExpressTemplateDO::getSort));
     }
 
     default DeliveryExpressTemplateDO selectByName(String name) {
-        return selectOne(DeliveryExpressTemplateDO::getName,name);
+        return selectOne(DeliveryExpressTemplateDO::getName, name);
     }
 
 }

feifan-module-mall/feifan-module-trade-biz/src/main/java/cn/newfeifan/mall/module/trade/dal/mysql/delivery/DeliveryPickUpStoreMapper.java

@@ -18,6 +18,7 @@ public interface DeliveryPickUpStoreMapper extends BaseMapperX<DeliveryPickUpSto
                 .eqIfPresent(DeliveryPickUpStoreDO::getPhone, reqVO.getPhone())
                 .eqIfPresent(DeliveryPickUpStoreDO::getAreaId, reqVO.getAreaId())
                 .eqIfPresent(DeliveryPickUpStoreDO::getStatus, reqVO.getStatus())
+                .eqIfPresent(DeliveryPickUpStoreDO::getShopId, reqVO.getShopId())
                 .betweenIfPresent(DeliveryPickUpStoreDO::getCreateTime, reqVO.getCreateTime())
                 .orderByDesc(DeliveryPickUpStoreDO::getId));
     }

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

@@ -18,6 +18,10 @@ import static cn.newfeifan.mall.framework.common.util.date.DateUtils.FORMAT_YEAR
 @ToString(callSuper = true)
 public class MemberUserPageReqVO extends PageParam {
 
+
+    @Schema(description = "用户Id", example = "1")
+    private Long id;
+
     @Schema(description = "手机号", example = "15601691300")
     private String mobile;
 
@@ -44,5 +48,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

@@ -41,12 +41,14 @@ public interface MemberUserMapper extends BaseMapperX<MemberUserDO> {
         }
         // 分页查询
         return selectPage(reqVO, new LambdaQueryWrapperX<MemberUserDO>()
+                .eqIfPresent(MemberUserDO::getId, reqVO.getId())
                 .likeIfPresent(MemberUserDO::getMobile, reqVO.getMobile())
                 .betweenIfPresent(MemberUserDO::getLoginDate, reqVO.getLoginDate())
                 .likeIfPresent(MemberUserDO::getNickname, reqVO.getNickname())
                 .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-module-system/feifan-module-system-biz/src/main/java/cn/newfeifan/mall/module/system/controller/admin/user/UserController.java

@@ -54,7 +54,7 @@ public class UserController {
         return success(id);
     }
 
-    @PutMapping("update")
+    @PutMapping("/update")
     @Operation(summary = "修改用户")
     @PreAuthorize("@ss.hasPermission('system:user:update')")
     public CommonResult<Boolean> updateUser(@Valid @RequestBody UserSaveReqVO reqVO) {

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

@@ -35,4 +35,7 @@ public class UserPageReqVO extends PageParam {
     @Schema(description = "部门编号，同时筛选子部门", example = "1024")
     private Long deptId;
 
+    @Schema(description = "所在地", example = "26117")
+    private Long areaId;
+
 }

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

@@ -71,5 +71,8 @@ public class UserRespVO{
 
     @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED, example = "时间戳格式")
     private LocalDateTime createTime;
+    @Schema(description = "所在地", example = "26117")
+    @ExcelProperty("所在地")
+    private Long areaId;
 
 }

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

@@ -51,6 +51,9 @@ public class UserSaveReqVO {
     @Schema(description = "用户头像", example = "https://www.zhongxing.cn/xxx.png")
     private String avatar;
 
+    @Schema(description = "所在地", example = "26117")
+    private Long areaId;
+
     // ========== 仅【创建】时，需要传递的字段 ==========
 
     @Schema(description = "密码", requiredMode = Schema.RequiredMode.REQUIRED, example = "123456")

feifan-module-system/feifan-module-system-biz/src/main/java/cn/newfeifan/mall/module/system/dal/dataobject/user/AdminUserDO.java

@@ -93,4 +93,13 @@ public class AdminUserDO extends TenantBaseDO {
      */
     private LocalDateTime loginDate;
 
+
+    /**
+     * 所在地
+     */
+    private Long areaId;
+
+
+
+
 }

feifan-module-system/feifan-module-system-biz/src/main/java/cn/newfeifan/mall/module/system/dal/mysql/user/AdminUserMapper.java

@@ -30,6 +30,7 @@ public interface AdminUserMapper extends BaseMapperX<AdminUserDO> {
                 .likeIfPresent(AdminUserDO::getUsername, reqVO.getUsername())
                 .likeIfPresent(AdminUserDO::getMobile, reqVO.getMobile())
                 .eqIfPresent(AdminUserDO::getStatus, reqVO.getStatus())
+                .eqIfPresent(AdminUserDO::getAreaId, reqVO.getAreaId())
                 .betweenIfPresent(AdminUserDO::getCreateTime, reqVO.getCreateTime())
                 .inIfPresent(AdminUserDO::getDeptId, deptIds)
                 .orderByDesc(AdminUserDO::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) {