瀏覽代碼

clode 实体类迁移导包修正

wxd 1 月之前
父節點
當前提交
b9c622d6a5
共有 100 個文件被更改,包括 44 次插入5031 次删除
  1. 0 18
      alien-entity/src/main/java/shop/alien/entity/store/dto/GroupRes.java
  2. 0 72
      alien-entity/src/main/java/shop/alien/entity/store/dto/LifeAppealManageDto.java
  3. 0 79
      alien-entity/src/main/java/shop/alien/entity/store/dto/LifeDiscountCouponDto.java
  4. 0 67
      alien-entity/src/main/java/shop/alien/entity/store/dto/LifeDiscountCouponStoreFriendDto.java
  5. 0 34
      alien-entity/src/main/java/shop/alien/entity/store/dto/LifeDiscountCouponUserDto.java
  6. 0 109
      alien-entity/src/main/java/shop/alien/entity/store/dto/LifeUserViolationDto.java
  7. 0 28
      alien-entity/src/main/java/shop/alien/entity/store/dto/NearMeDto.java
  8. 0 189
      alien-entity/src/main/java/shop/alien/entity/store/dto/StoreActivityDto.java
  9. 0 123
      alien-entity/src/main/java/shop/alien/entity/store/dto/StoreActivityRuleDto.java
  10. 0 75
      alien-entity/src/main/java/shop/alien/entity/store/dto/StoreEvaluationDto.java
  11. 0 151
      alien-entity/src/main/java/shop/alien/entity/store/dto/StoreInfoDto.java
  12. 0 20
      alien-entity/src/main/java/shop/alien/entity/store/dto/SystemLoginDto.java
  13. 0 48
      alien-entity/src/main/java/shop/alien/entity/store/excelVo/LifeAppealManageExcelVo.java
  14. 0 65
      alien-entity/src/main/java/shop/alien/entity/store/excelVo/LifeUserOrderExcelVo.java
  15. 0 70
      alien-entity/src/main/java/shop/alien/entity/store/excelVo/LifeUserViolationExcelVO.java
  16. 0 50
      alien-entity/src/main/java/shop/alien/entity/store/excelVo/StoreActivityExcelVo.java
  17. 0 46
      alien-entity/src/main/java/shop/alien/entity/store/excelVo/StoreCouponStatusVo.java
  18. 0 75
      alien-entity/src/main/java/shop/alien/entity/store/excelVo/StoreInfoExcelVo.java
  19. 0 48
      alien-entity/src/main/java/shop/alien/entity/store/excelVo/StoreInfoExpiredRecordsExcelVo.java
  20. 0 53
      alien-entity/src/main/java/shop/alien/entity/store/excelVo/StoreStaffConfigExcelVo.java
  21. 0 37
      alien-entity/src/main/java/shop/alien/entity/store/excelVo/StoreUserExcelVo.java
  22. 0 77
      alien-entity/src/main/java/shop/alien/entity/store/vo/EssentialModuleInformationVo.java
  23. 0 24
      alien-entity/src/main/java/shop/alien/entity/store/vo/ExpertGoodsTypeVo.java
  24. 0 15
      alien-entity/src/main/java/shop/alien/entity/store/vo/LifeActivityVo.java
  25. 0 33
      alien-entity/src/main/java/shop/alien/entity/store/vo/LifeAppealManageVo.java
  26. 0 32
      alien-entity/src/main/java/shop/alien/entity/store/vo/LifeBlacklistVo.java
  27. 0 35
      alien-entity/src/main/java/shop/alien/entity/store/vo/LifeBrandedCardVo.java
  28. 0 21
      alien-entity/src/main/java/shop/alien/entity/store/vo/LifeClassManageVo.java
  29. 0 574
      alien-entity/src/main/java/shop/alien/entity/store/vo/LifeCouponVo.java
  30. 0 52
      alien-entity/src/main/java/shop/alien/entity/store/vo/LifeDiscountCouponStoreFriendVo.java
  31. 0 34
      alien-entity/src/main/java/shop/alien/entity/store/vo/LifeDiscountCouponUserVo.java
  32. 0 115
      alien-entity/src/main/java/shop/alien/entity/store/vo/LifeDiscountCouponVo.java
  33. 0 53
      alien-entity/src/main/java/shop/alien/entity/store/vo/LifeFansVo.java
  34. 0 48
      alien-entity/src/main/java/shop/alien/entity/store/vo/LifeMessageVo.java
  35. 0 28
      alien-entity/src/main/java/shop/alien/entity/store/vo/LifeNoticeVo.java
  36. 0 58
      alien-entity/src/main/java/shop/alien/entity/store/vo/LifePinglunVo.java
  37. 0 74
      alien-entity/src/main/java/shop/alien/entity/store/vo/LifePromotionPackageVo.java
  38. 0 24
      alien-entity/src/main/java/shop/alien/entity/store/vo/LifeReverseGroupBuyingStoreVo.java
  39. 0 32
      alien-entity/src/main/java/shop/alien/entity/store/vo/LifeReverseGroupBuyingUserVo.java
  40. 0 60
      alien-entity/src/main/java/shop/alien/entity/store/vo/LifeStoreVo.java
  41. 0 20
      alien-entity/src/main/java/shop/alien/entity/store/vo/LifeTuanGouParamVo.java
  42. 0 57
      alien-entity/src/main/java/shop/alien/entity/store/vo/LifeUserDongTaiVo.java
  43. 0 46
      alien-entity/src/main/java/shop/alien/entity/store/vo/LifeUserDynamicsVo.java
  44. 0 63
      alien-entity/src/main/java/shop/alien/entity/store/vo/LifeUserExpertOrderVo.java
  45. 0 100
      alien-entity/src/main/java/shop/alien/entity/store/vo/LifeUserExpertVo.java
  46. 0 67
      alien-entity/src/main/java/shop/alien/entity/store/vo/LifeUserExpertWorksVo.java
  47. 0 82
      alien-entity/src/main/java/shop/alien/entity/store/vo/LifeUserOrderVo.java
  48. 0 25
      alien-entity/src/main/java/shop/alien/entity/store/vo/LifeUserViolationVo.java
  49. 0 62
      alien-entity/src/main/java/shop/alien/entity/store/vo/LifeUserVo.java
  50. 0 122
      alien-entity/src/main/java/shop/alien/entity/store/vo/ManagementInfoVo.java
  51. 0 41
      alien-entity/src/main/java/shop/alien/entity/store/vo/ScreeningOfEightMajorCategoriesVO.java
  52. 0 199
      alien-entity/src/main/java/shop/alien/entity/store/vo/StoreActivityVo.java
  53. 0 38
      alien-entity/src/main/java/shop/alien/entity/store/vo/StoreCashOutRecordVo.java
  54. 0 73
      alien-entity/src/main/java/shop/alien/entity/store/vo/StoreClockInVo.java
  55. 0 22
      alien-entity/src/main/java/shop/alien/entity/store/vo/StoreCommentAppealLogVo.java
  56. 0 61
      alien-entity/src/main/java/shop/alien/entity/store/vo/StoreCommentAppealVo.java
  57. 0 52
      alien-entity/src/main/java/shop/alien/entity/store/vo/StoreCommentVo.java
  58. 0 47
      alien-entity/src/main/java/shop/alien/entity/store/vo/StoreCommitPercentVo.java
  59. 0 64
      alien-entity/src/main/java/shop/alien/entity/store/vo/StoreDictionaryVo.java
  60. 0 19
      alien-entity/src/main/java/shop/alien/entity/store/vo/StoreDynamicDiscountInviteLogVo.java
  61. 0 40
      alien-entity/src/main/java/shop/alien/entity/store/vo/StoreDynamicDiscountVo.java
  62. 0 25
      alien-entity/src/main/java/shop/alien/entity/store/vo/StoreGroupPackageVO.java
  63. 0 31
      alien-entity/src/main/java/shop/alien/entity/store/vo/StoreImgTypeVo.java
  64. 0 21
      alien-entity/src/main/java/shop/alien/entity/store/vo/StoreImgVo.java
  65. 0 59
      alien-entity/src/main/java/shop/alien/entity/store/vo/StoreIncomeDetailsRecordVo.java
  66. 0 165
      alien-entity/src/main/java/shop/alien/entity/store/vo/StoreInfoVo.java
  67. 0 61
      alien-entity/src/main/java/shop/alien/entity/store/vo/StoreMainInfoVo.java
  68. 0 98
      alien-entity/src/main/java/shop/alien/entity/store/vo/StoreMembershipCardOrderVo.java
  69. 0 79
      alien-entity/src/main/java/shop/alien/entity/store/vo/StoreMembershipCardVo.java
  70. 0 29
      alien-entity/src/main/java/shop/alien/entity/store/vo/StoreMenuVo.java
  71. 0 54
      alien-entity/src/main/java/shop/alien/entity/store/vo/StorePersonalCustomizedVo.java
  72. 0 65
      alien-entity/src/main/java/shop/alien/entity/store/vo/StoreSalesDetailsVo.java
  73. 0 33
      alien-entity/src/main/java/shop/alien/entity/store/vo/StoreUserVo.java
  74. 0 42
      alien-entity/src/main/java/shop/alien/entity/store/vo/StoreVipLogVo.java
  75. 0 23
      alien-entity/src/main/java/shop/alien/entity/store/vo/SystemLoginVo.java
  76. 0 34
      alien-entity/src/main/java/shop/alien/entity/store/vo/WebAuditVo.java
  77. 0 22
      alien-entity/src/main/java/shop/alien/entity/store/vo/WebsocketVo.java
  78. 1 1
      alien-store/src/main/java/shop/alien/store/controller/AliController.java
  79. 2 2
      alien-store/src/main/java/shop/alien/store/controller/EssentialModuleInformationController.java
  80. 1 1
      alien-store/src/main/java/shop/alien/store/controller/GaoDeController.java
  81. 2 2
      alien-store/src/main/java/shop/alien/store/controller/LifeActivityController.java
  82. 2 2
      alien-store/src/main/java/shop/alien/store/controller/LifeAppealManageController.java
  83. 2 2
      alien-store/src/main/java/shop/alien/store/controller/LifeBlacklistController.java
  84. 2 2
      alien-store/src/main/java/shop/alien/store/controller/LifeBrandedCardController.java
  85. 2 2
      alien-store/src/main/java/shop/alien/store/controller/LifeBrowseRecordController.java
  86. 2 2
      alien-store/src/main/java/shop/alien/store/controller/LifeClassManageController.java
  87. 2 2
      alien-store/src/main/java/shop/alien/store/controller/LifeCollectController.java
  88. 2 2
      alien-store/src/main/java/shop/alien/store/controller/LifeCommentController.java
  89. 2 2
      alien-store/src/main/java/shop/alien/store/controller/LifeCouponController.java
  90. 2 2
      alien-store/src/main/java/shop/alien/store/controller/LifeDictController.java
  91. 2 2
      alien-store/src/main/java/shop/alien/store/controller/LifeDiscountCouponController.java
  92. 2 2
      alien-store/src/main/java/shop/alien/store/controller/LifeDiscountCouponStoreFriendController.java
  93. 1 1
      alien-store/src/main/java/shop/alien/store/controller/LifeFansController.java
  94. 3 3
      alien-store/src/main/java/shop/alien/store/controller/LifeGroupPackageController.java
  95. 1 1
      alien-store/src/main/java/shop/alien/store/controller/LifeLogController.java
  96. 2 2
      alien-store/src/main/java/shop/alien/store/controller/LifeMessageController.java
  97. 2 2
      alien-store/src/main/java/shop/alien/store/controller/LifeNoticeController.java
  98. 2 2
      alien-store/src/main/java/shop/alien/store/controller/LifePromotionPackageController.java
  99. 3 3
      alien-store/src/main/java/shop/alien/store/controller/LifeReverseGroupBuyingController.java
  100. 2 2
      alien-store/src/main/java/shop/alien/store/controller/LifeStoreController.java

+ 0 - 18
alien-entity/src/main/java/shop/alien/entity/store/dto/GroupRes.java

@@ -1,18 +0,0 @@
-package shop.alien.entity.store.dto;
-
-
-import io.swagger.annotations.ApiModel;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@ApiModel(value="GroupRes对象", description="分组对象")
-public class GroupRes {
-
-    String label;
-
-    int count;
-}

+ 0 - 72
alien-entity/src/main/java/shop/alien/entity/store/dto/LifeAppealManageDto.java

@@ -1,72 +0,0 @@
-package shop.alien.entity.store.dto;
-
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.Date;
-
-/**
- * 申诉管理
- */
-@Data
-@JsonInclude
-@TableName("life_appeal_manage")
-public class LifeAppealManageDto {
-
-    private String id;
-
-    private String storeName;
-
-    private String storeId;
-
-    private String storeContact;
-
-    private String storePhone;
-
-    private String storeType;
-
-    @TableField(value = "appeal_time", fill = FieldFill.INSERT)
-    private Date appealTime;
-
-    private String customerReport;
-
-    private String appealReason;
-
-    @ApiModelProperty(value = "审批状态:1:已同意,2:已驳回,3:待处理")
-    private String appealType;
-
-    private String appealImage;
-
-    private String isRead;
-
-    private String huifuId;
-
-    @ApiModelProperty(value = "删除标记, 0:未删除, 1:已删除")
-    @TableField("delete_flag")
-    @TableLogic
-    private Integer deleteFlag;
-
-    @ApiModelProperty(value = "创建时间")
-    @TableField(value = "created_time", fill = FieldFill.INSERT)
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    private Date createdTime;
-
-    @ApiModelProperty(value = "创建人ID")
-    @TableField("created_user_id")
-    private Integer createdUserId;
-
-    @ApiModelProperty(value = "修改时间")
-    @TableField(value = "updated_time", fill = FieldFill.UPDATE)
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    private Date updatedTime;
-
-    @ApiModelProperty(value = "修改人ID")
-    @TableField("updated_user_id")
-    private Integer updatedUserId;
-}

+ 0 - 79
alien-entity/src/main/java/shop/alien/entity/store/dto/LifeDiscountCouponDto.java

@@ -1,79 +0,0 @@
-package shop.alien.entity.store.dto;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-import java.math.BigDecimal;
-import java.time.LocalDate;
-import java.util.List;
-
-/**
- * <p>
- * 优惠券表DTO
- * </p>
- *
- * @author ssk
- * @since 2025-02-07
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@ApiModel(value="LifeDiscountCoupon对象", description="优惠券表")
-public class LifeDiscountCouponDto {
-
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "优惠券id")
-    private String couponId;
-
-    @ApiModelProperty(value = "商铺id")
-    private String storeId;
-
-    @ApiModelProperty(value = "券名称")
-    private String name;
-
-    @ApiModelProperty(value = "面值")
-    private BigDecimal nominalValue;
-
-    @ApiModelProperty(value = "有效期(天)")
-    private Integer expirationDate;
-
-    @ApiModelProperty(value = "开始日期")
-    private LocalDate startDate;
-
-    @ApiModelProperty(value = "结束日期")
-    private LocalDate endDate;
-
-    @ApiModelProperty(value = "库存(优惠券数量)")
-    private Integer singleQty;
-
-    @ApiModelProperty(value = "补充说明")
-    private String supplementaryInstruction;
-
-    @ApiModelProperty(value = "领取状态:0:关闭领取,1:开启领取")
-    private Integer getStatus;
-
-    @ApiModelProperty(value = "限制领取数量")
-    private Integer restrictedQuantity;
-
-    @ApiModelProperty(value = "最低消费")
-    private BigDecimal minimumSpendingAmount;
-
-    @ApiModelProperty(value = "类型   1-优惠券  2-红包")
-    private Integer type;
-
-    @ApiModelProperty(value = "收藏可领(0:否,1:是)")
-    private Integer attentionCanReceived;
-
-    @ApiModelProperty(value = "周中禁用规则")
-    private List<String> weeklyDisabledList;
-
-    @ApiModelProperty(value = "节假日禁用规则")
-    private List<String> holidayDisabledList;
-
-    @ApiModelProperty(value = "优惠券领取规则  每日一领:day,每周一领:week,每月一领:month,每年一领:year")
-    private String claimRule;
-}

+ 0 - 67
alien-entity/src/main/java/shop/alien/entity/store/dto/LifeDiscountCouponStoreFriendDto.java

@@ -1,67 +0,0 @@
-package shop.alien.entity.store.dto;
-
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-import java.io.Serializable;
-import java.time.LocalDate;
-import java.util.List;
-
-/**
- * <p>
- * 优惠券商户发放好友优惠券关系表	
- * </p>
- *
- * @author ssk
- * @since 2025-02-19
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@ApiModel(value="LifeDiscountCouponStoreFriend对象", description="优惠券商户发放好友优惠券关系表	")
-public class LifeDiscountCouponStoreFriendDto extends Model<LifeDiscountCouponStoreFriendDto> {
-
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "主键")
-    private Integer id;
-
-    @ApiModelProperty(value = "店铺用户id")
-    private Integer storeUserId;
-
-    @ApiModelProperty(value = "券id")
-    private Integer couponId;
-
-    @ApiModelProperty(value = "好友店铺id")
-    private Integer friendStoreUserId;
-
-    @ApiModelProperty(value = "设置发放好友店铺可用优惠券列表")
-    private List<LifeDiscountCouponStoreFriendDto> couponIds;
-
-    @ApiModelProperty(value = "有效期(天)")
-    private Integer expirationDate;
-
-    @ApiModelProperty(value = "开始日期")
-    private LocalDate startDate;
-
-    @ApiModelProperty(value = "结束日期")
-    private LocalDate endDate;
-
-    @ApiModelProperty(value = "库存(优惠券数量)")
-    private Integer singleQty;
-
-    @ApiModelProperty(value = "订单id")
-    private Integer orderId;
-
-
-
-    @Override
-    protected Serializable pkVal() {
-        return this.id;
-    }
-
-}

+ 0 - 34
alien-entity/src/main/java/shop/alien/entity/store/dto/LifeDiscountCouponUserDto.java

@@ -1,34 +0,0 @@
-package shop.alien.entity.store.dto;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-/**
- * <p>
- * 优惠券用户表
- * </p>
- *
- * @author ssk
- * @since 2025-02-08
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@ApiModel(value="LifeDiscountCouponUser对象", description="优惠券用户表")
-public class LifeDiscountCouponUserDto{
-
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "用户id")
-    private Integer userId;
-
-    @ApiModelProperty(value = "券id")
-    private Integer couponId;
-
-    @ApiModelProperty(value = "领取数量")
-    private Integer receiveQuantity;
-
-}

+ 0 - 109
alien-entity/src/main/java/shop/alien/entity/store/dto/LifeUserViolationDto.java

@@ -1,109 +0,0 @@
-package shop.alien.entity.store.dto;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-import java.util.Date;
-import java.util.List;
-
-/**
- * <p>
- * 用户举报
- * </p>
- *
- * @author ssk
- * @since 2025-04-29
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@ApiModel(value="LifeDiscountCouponUser对象", description="优惠券用户表")
-public class LifeUserViolationDto {
-
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "主键")
-    private Integer id;
-
-    @ApiModelProperty(value = "被举报用户类型")
-    private String reportedUserType;
-
-    @ApiModelProperty(value = "被举报用户ID")
-    private String reportedUserId;
-
-    @ApiModelProperty(value = "举报用户类型")
-    private String reportingUserType;
-
-    @ApiModelProperty(value = "举报用户ID")
-    private String reportingUserId;
-
-    @ApiModelProperty(value = "举报内容分类")
-    private String reportContextType;
-
-    @ApiModelProperty(value = "1:用户违规,2:色情低俗,3:违法违规,4:谩骂嘲讽、煽动对立,5:涉嫌诈骗,6:人身攻击,7:种族歧视,8:政治敏感,9:虚假、不实内容,违反公德秩序,10:危害人身安全,11:网络暴力,12:其他原因")
-    private String violationType;
-
-    @ApiModelProperty(value = "其他原因具体内容")
-    private String otherReasonContent;
-
-    @ApiModelProperty(value = "举报凭证图片")
-    private String reportEvidenceImg;
-
-    @ApiModelProperty(value = "处理状态(0:未处理,1:违规,2:未违规)")
-    private String processingStatus;
-
-    @ApiModelProperty(value = "处理时间")
-    private Date processingTime;
-
-    @ApiModelProperty(value = "删除标记, 0:未删除, 1:已删除")
-    private Integer deleteFlag;
-
-    @ApiModelProperty(value = "创建时间")
-    private Date createdTime;
-
-    @ApiModelProperty(value = "创建人ID")
-    private Integer createdUserId;
-
-    @ApiModelProperty(value = "更新时间")
-    private Date updatedTime;
-
-    @ApiModelProperty(value = "修改人ID")
-    private Integer updatedUserId;
-
-    @ApiModelProperty(value = "评论ID")
-    private String commentId;
-
-    @ApiModelProperty(value = "动态ID")
-    private String  dynamicsId;
-
-    @ApiModelProperty(value = "昵称")
-    private String nickname;
-
-    @ApiModelProperty(value = "联系方式")
-    private String phone;
-
-
-    @ApiModelProperty(value = "被举报人账号")
-    private String account;
-
-
-    @ApiModelProperty(value = "图片")
-    private String image;
-
-
-    @ApiModelProperty(value = "举报结果")
-    private String reportResult;
-
-
-    @ApiModelProperty(value = "图片List")
-    private List<String> imageList;
-
-
-    @ApiModelProperty(value = "举报内容")
-    private String LifeNotice;
-
-
-
-}

+ 0 - 28
alien-entity/src/main/java/shop/alien/entity/store/dto/NearMeDto.java

@@ -1,28 +0,0 @@
-package shop.alien.entity.store.dto;
-
-import com.fasterxml.jackson.annotation.JsonInclude;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-
-/**
- * 二期-门店信息
- *
- * @author ssk
- * @since 2024-12-05
- */
-@Data
-@AllArgsConstructor
-@JsonInclude
-@ApiModel(value = "NearMeDto对象", description = "我附近的商家")
-public class NearMeDto {
-
-    @ApiModelProperty(value = "内容")
-    private String conent;
-
-    @ApiModelProperty(value = "距离/km")
-    private Double distance;
-
-
-}

+ 0 - 189
alien-entity/src/main/java/shop/alien/entity/store/dto/StoreActivityDto.java

@@ -1,189 +0,0 @@
-
-package shop.alien.entity.store.dto;
-
-import com.baomidou.mybatisplus.annotation.*;
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-import shop.alien.entity.store.StoreActivityRuleDetail;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-
-/**
- * <p>
- * 活动主表
- * </p>
- *
- * @author ssk
- * @since 2025-05-14
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-public class StoreActivityDto extends Model<StoreActivityDto> {
-
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "主键ID")
-    private Long id;
-
-    @ApiModelProperty(value = "活动编号")
-    private String activityNo;
-
-    @ApiModelProperty(value = "活动标题")
-    private String activityTitle;
-
-    @ApiModelProperty(value = "活动类型(1:邀请好友 2:签到领红包)")
-    private Integer activityType;
-
-    @ApiModelProperty(value = "活动图片(JSON数组)")
-    private List<HashMap<String, Object>> contractImage;
-
-    @ApiModelProperty(value = "活动人群类型(0:全部用户 1:自定义)")
-    private Integer activityCrowdType;
-
-    @ApiModelProperty(value = "具体规则说明")
-    private String specificRules;
-
-    @ApiModelProperty(value = "活动开始时间")
-    private Date activityStartTime;
-
-    @ApiModelProperty(value = "活动结束时间")
-    private Date activityEndTime;
-
-    @ApiModelProperty(value = "是否永久有效")
-    private Boolean isPermanent;
-
-    @ApiModelProperty(value = "状态(0:禁用 1:启用)")
-    private Integer status;
-
-    @ApiModelProperty(value = "审批意见")
-    private String approvalOpinion;
-
-    @ApiModelProperty(value = "规则类型(1:邀请好友规则 2:签到规则 3:任务规则)")
-    private Integer ruleType;
-
-    @ApiModelProperty(value = "邀请好友限时选择类型")
-    private Integer timeLimitRedio;
-
-    @ApiModelProperty(value = "邀请好友限时(小时)")
-    private Integer timeLimit;
-
-    @ApiModelProperty(value = "人数邀请限制选择框类型")
-    private Integer limitationPeopleRedio;
-
-    @ApiModelProperty(value = "人数邀请限制(0:无限制)")
-    private Integer limitationPeople;
-
-    @ApiModelProperty(value = "限领次数")
-    private Integer claimsNumber;
-
-    @ApiModelProperty(value = "折扣类型(1:优惠券 2:折扣券)")
-    private Integer discountType;
-
-    @ApiModelProperty(value = "折扣分数")
-    private BigDecimal discountGrade;
-
-    @ApiModelProperty(value = "折扣分数选择框类型")
-    private BigDecimal discountGradeRedio;
-
-    @ApiModelProperty(value = "折扣金额")
-    private BigDecimal discountMoney;
-
-    @ApiModelProperty(value = "折扣金额选择框类型")
-    private BigDecimal discountMoneyRedio;
-
-    @ApiModelProperty(value = "指定商家ID列表(空则无指定商家,所有商家)")
-    private List<Integer> storeIds;
-
-    @ApiModelProperty(value = "指定活动人群(空则无指定活动人群,所有人)")
-    private List<Integer> userIds;
-
-    @ApiModelProperty(value = "是否适用于堂食")
-    private Boolean isDineIn;
-
-    @ApiModelProperty(value = "是否适用于外卖")
-    private Boolean isTakeOut;
-
-    @ApiModelProperty(value = "折扣有效天数选择框")
-    private Integer effectiveDaysRedio;
-
-    @ApiModelProperty(value = "折扣有效天数")
-    private Integer effectiveDays;
-
-    @ApiModelProperty(value = "发放类型(1:红包)")
-    private Integer sendType;
-
-    @ApiModelProperty(value = "每日最小金额")
-    private BigDecimal dailyMinAmount;
-
-    @ApiModelProperty(value = "每日最大金额")
-    private BigDecimal dailyMaxAmount;
-
-    @ApiModelProperty(value = "每日领取次数")
-    private Integer dailyCollectionFrequency;
-
-    @ApiModelProperty(value = "保留天数")
-    private Integer retentionDays;
-
-    @ApiModelProperty(value = "任务类型(1:浏览团购 2:购买团购 3:邀请好友)")
-    private Integer taskType;
-
-    @ApiModelProperty(value = "任务详情")
-    private String taskDetail;
-
-    @ApiModelProperty(value = "浏览时长(分钟)")
-    private Integer browseTime;
-
-    @ApiModelProperty(value = "最小金额")
-    private BigDecimal minAmount;
-
-    @ApiModelProperty(value = "最大金额")
-    private BigDecimal maxAmount;
-
-    @ApiModelProperty(value = "活动起止时间")
-    private List<String> activityDate;
-
-    @ApiModelProperty(value = "删除状态")
-    @TableLogic
-    private Integer deleteFlag;
-
-    @ApiModelProperty(value = "创建时间")
-    @TableField(value = "created_time", fill = FieldFill.INSERT)
-    private Date createdTime;
-
-    @ApiModelProperty(value = "更新时间")
-    @TableField(value = "updated_time", fill = FieldFill.INSERT_UPDATE)
-    private Date updatedTime;
-
-    @ApiModelProperty(value = "创建人ID")
-    @TableField(value = "created_user_id", fill = FieldFill.INSERT)
-    private Integer createdUserId;
-
-    @ApiModelProperty(value = "修改人ID")
-    @TableField(value = "updated_user_id", fill = FieldFill.INSERT_UPDATE)
-    private Integer updatedUserId;
-
-    @ApiModelProperty(value = "活动时间(处理过)")
-    private String activityTime;
-
-    @ApiModelProperty(value = "连续签到奖励")
-    private List<StoreActivityRuleDetail> ruleTableData;
-
-    @ApiModelProperty(value = "连续签到奖励")
-    private List<StoreActivityRuleDetail> taskRuleTableData;
-
-    @Override
-    protected Serializable pkVal() {
-        return this.id;
-    }
-
-}

+ 0 - 123
alien-entity/src/main/java/shop/alien/entity/store/dto/StoreActivityRuleDto.java

@@ -1,123 +0,0 @@
-package shop.alien.entity.store.dto;
-
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.Date;
-
-/**
- * <p>
- * 活动规则表
- * </p>
- *
- * @author ssk
- * @since 2025-05-14
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-public class StoreActivityRuleDto extends Model<StoreActivityRuleDto> {
-
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "主键ID")
-    private Long id;
-
-    @ApiModelProperty(value = "活动ID")
-    private Long activityId;
-
-    @ApiModelProperty(value = "规则类型(1:邀请好友规则 2:签到规则 3:任务规则)")
-    private Integer ruleType;
-
-    @ApiModelProperty(value = "邀请好友限时(小时)")
-    private Integer timeLimit;
-
-    @ApiModelProperty(value = "人数邀请限制(0:无限制)")
-    private Integer limitationPeople;
-
-    @ApiModelProperty(value = "限领次数")
-    private Integer claimsNumber;
-
-    @ApiModelProperty(value = "折扣类型(1:优惠券 2:折扣券)")
-    private Integer discountType;
-
-    @ApiModelProperty(value = "折扣分数")
-    private BigDecimal discountGrade;
-
-    @ApiModelProperty(value = "折扣金额")
-    private BigDecimal discountMoney;
-
-    @ApiModelProperty(value = "指定商家ID列表(空则无指定商家,所有商家)")
-    private String storeIds;
-
-    @ApiModelProperty(value = "指定活动人群(空则无指定活动人群,所有人)")
-    private String userIds;
-
-    @ApiModelProperty(value = "是否适用于堂食")
-    private Boolean isDineIn;
-
-    @ApiModelProperty(value = "是否适用于外卖")
-    private Boolean isTakeOut;
-
-    @ApiModelProperty(value = "折扣有效天数")
-    private Integer effectiveDays;
-
-    @ApiModelProperty(value = "发放类型(1:红包)")
-    private Integer sendType;
-
-    @ApiModelProperty(value = "每日最小金额")
-    private BigDecimal dailyMinAmount;
-
-    @ApiModelProperty(value = "每日最大金额")
-    private BigDecimal dailyMaxAmount;
-
-    @ApiModelProperty(value = "每日领取次数")
-    private Integer dailyCollectionFrequency;
-
-    @ApiModelProperty(value = "保留天数")
-    private Integer retentionDays;
-
-    @ApiModelProperty(value = "任务类型(1:浏览团购 2:购买团购 3:邀请好友)")
-    private Integer taskType;
-
-    @ApiModelProperty(value = "任务详情")
-    private String taskDetail;
-
-    @ApiModelProperty(value = "浏览时长(分钟)")
-    private Integer browseTime;
-
-    @ApiModelProperty(value = "最小金额")
-    private BigDecimal minAmount;
-
-    @ApiModelProperty(value = "最大金额")
-    private BigDecimal maxAmount;
-
-    @ApiModelProperty(value = "删除状态")
-    @TableLogic
-    private Integer deleteFlag;
-
-    @ApiModelProperty(value = "创建时间")
-    private Date createdTime;
-
-    @ApiModelProperty(value = "更新时间")
-    private Date updatedTime;
-
-    @ApiModelProperty(value = "创建人ID")
-    private Integer createdUserId;
-
-    @ApiModelProperty(value = "修改人ID")
-    private Integer updatedUserId;
-
-
-    @Override
-    protected Serializable pkVal() {
-        return this.id;
-    }
-
-}

+ 0 - 75
alien-entity/src/main/java/shop/alien/entity/store/dto/StoreEvaluationDto.java

@@ -1,75 +0,0 @@
-package shop.alien.entity.store.dto;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import shop.alien.entity.store.StoreEvaluation;
-
-import java.util.List;
-
-
-/**
- * @Author: fcw
- * @CreateTime: 2025-04-24
- * @Description: 用户评价
- */
-@Data
-@ApiModel(value = "StoreEvaluationDto对象", description = "用户评价Dto")
-public class StoreEvaluationDto {
-
-    @ApiModelProperty(value = "主键")
-    private Integer id;
-
-    @ApiModelProperty(value = "订单ID")
-    private String userOrderId;
-
-    @ApiModelProperty(value = "订单评分")
-    private Double score;
-
-    @ApiModelProperty(value = "其他评分")
-    private List<String> otherScoreList;
-
-    @ApiModelProperty(value = "评价tags")
-    private List<String> evaluationTagsList;
-
-    @ApiModelProperty(value = "评价内容")
-    private String evaluationContent;
-
-    @ApiModelProperty(value = "评价图片")
-    private List<String> evaluationImageList;
-
-    @ApiModelProperty(value = "是否匿名")
-    private String isAnonymous;
-
-    @ApiModelProperty(value = "店铺ID")
-    private String storeId;
-
-    @ApiModelProperty(value = "用户ID")
-    private String userId;
-
-    @ApiModelProperty(value = "子评论")
-    private List<StoreEvaluation> subEva;
-
-    @ApiModelProperty(value = "子评论数量")
-    private int subEvaCount;
-
-
-    @ApiModelProperty(value = "type")
-    private String type;
-
-    @ApiModelProperty(value = "用户昵称")
-    private String userName;
-
-    @ApiModelProperty(value = "用户头像")
-    private String userImage;
-
-    @ApiModelProperty(value = "phoneId")
-    private String phoneId;
-
-    @ApiModelProperty(value = "点赞数量")
-    private int likes;
-
-    @ApiModelProperty(value = "是否点赞 true点赞了  false 没有")
-    private boolean islike;
-
-}

+ 0 - 151
alien-entity/src/main/java/shop/alien/entity/store/dto/StoreInfoDto.java

@@ -1,151 +0,0 @@
-package shop.alien.entity.store.dto;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.Date;
-import java.util.List;
-
-/**
- * 二期-门店信息
- *
- * @author ssk
- * @since 2024-12-05
- */
-@Data
-@JsonInclude
-@ApiModel(value = "StoreInfoDto对象", description = "门店信息")
-public class StoreInfoDto {
-
-    @ApiModelProperty(value = "主键")
-    private Integer id;
-
-    @ApiModelProperty(value = "门店名称")
-    private String storeName;
-
-    @ApiModelProperty(value = "联系人姓名")
-    private String storeContact;
-
-    @ApiModelProperty(value = "联系人电话")
-    private String storePhone;
-
-    @ApiModelProperty(value = "联系人密码")
-    private String password;
-
-    @ApiModelProperty(value = "营业状态(0:正常营业, 1:暂停营业, 2:筹建中, 99:永久关门)")
-    private Integer businessStatus;
-
-    @ApiModelProperty(value = "门店电话")
-    private String storeTel;
-
-    @ApiModelProperty(value = "容纳人数")
-    private Integer storeCapacity;
-
-    @ApiModelProperty(value = "门店面积(1:小于20平米, 2:20~50平米, 3:50~100平米, 4:100~300平米, 5:500~1000平米, 6:大于1000平米)")
-    private Integer storeArea;
-
-    @ApiModelProperty(value = "门店地址")
-    private String storeAddress;
-
-    @ApiModelProperty(value = "删除标记, 0:未删除, 1:已删除")
-    private Integer deleteFlag;
-
-    @ApiModelProperty(value = "创建时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    private Date createdTime;
-
-    @ApiModelProperty(value = "创建人ID")
-    @TableField("created_user_id")
-    private Integer createdUserId;
-
-    @ApiModelProperty(value = "修改时间")
-    @JsonFormat(pattern = "yyyy-MM-dd h:m:s a", timezone = "GMT+8")
-    private Date updatedTime;
-
-    @ApiModelProperty(value = "修改人ID")
-    private Integer updatedUserId;
-
-    @ApiModelProperty(value = "门店简介")
-    private String storeBlurb;
-
-    @ApiModelProperty(value = "门店类型(1:中餐, 2:烧烤, 3:饮品, 4:甜点, 5:火锅, 6:宵夜, 7:西餐, 8:轻食, 9:水果)")
-    private List<String> storeTypeList;
-
-    @ApiModelProperty(value = "是否连锁, 0:否, 1:是")
-    private Integer isChain;
-
-    @ApiModelProperty(value = "门店状态")
-    private Integer storeStatus;
-
-    @ApiModelProperty(value = "到期时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    private Date expirationTime;
-
-    @ApiModelProperty(value = "门店坐标")
-    private String storePosition;
-
-    @ApiModelProperty(value = "门店坐标经度")
-    private String storePositionLongitude;
-
-    @ApiModelProperty(value = "门店坐标纬度")
-    private String storePositionLatitude;
-
-    @ApiModelProperty(value = "门店密码")
-    private String storePass;
-
-    @ApiModelProperty(value = "身份证")
-    private String idCard;
-
-    @ApiModelProperty(value = "经营板块名字")
-    private String businessSectionName;
-
-    @ApiModelProperty(value = "经营类型英文值")
-    private String businessTypeValue;
-
-    @ApiModelProperty(value = "经营种类集合")
-    private List<String> businessTypesList;
-
-    @ApiModelProperty(value = "经营板块id(词典表 键为 business_section)")
-    private Integer businessSection;
-
-    @ApiModelProperty(value = "经营种类ids")
-    private List<String> businessTypes;
-
-    @ApiModelProperty(value = "经营种类名称s")
-    private String businessTypesName;
-
-    @ApiModelProperty(value = "用户账号")
-    private String userAccount;
-
-    @ApiModelProperty(value = "营业执照图片地址")
-    private List<String> businessLicenseAddress;
-
-    @ApiModelProperty(value = "合同图片地址")
-    private List<String> contractImageList;
-
-    @ApiModelProperty(value = "查询经纬度时查询地点存储")
-    private String queryAddress;
-
-    @ApiModelProperty(value = "行政区域省名称")
-    private String administrativeRegionProvinceName;
-
-    @ApiModelProperty(value = "行政区域省adcode")
-    private String administrativeRegionProvinceAdcode;
-
-    @ApiModelProperty(value = "行政区域市名称")
-    private String administrativeRegionCityName;
-
-    @ApiModelProperty(value = "行政区域市adcode")
-    private String administrativeRegionCityAdcode;
-
-    @ApiModelProperty(value = "行政区域区名称")
-    private String administrativeRegionDistrictName;
-
-    @ApiModelProperty(value = "行政区域区adcode")
-    private String administrativeRegionDistrictAdcode;
-
-}

+ 0 - 20
alien-entity/src/main/java/shop/alien/entity/store/dto/SystemLoginDto.java

@@ -1,20 +0,0 @@
-package shop.alien.entity.store.dto;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@ApiModel(value="SystemLogin对象", description="web登录信息")
-public class SystemLoginDto {
-
-    @ApiModelProperty(value = "用户名")
-    public String username;
-    @ApiModelProperty(value = "密码")
-    public String password;
-
-}

+ 0 - 48
alien-entity/src/main/java/shop/alien/entity/store/excelVo/LifeAppealManageExcelVo.java

@@ -1,48 +0,0 @@
-package shop.alien.entity.store.excelVo;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-/**
- * @Author: fcw
- * @CreateTime: 2025-04-28
- * @Description: 申诉管理导出
- */
-@Data
-@JsonInclude
-@ApiModel(value = "LifeAppealManage表Excel导出对象", description = "申诉管理")
-public class LifeAppealManageExcelVo {
-
-    @ExcelHeader("序号")
-    @ApiModelProperty(value = "主键")
-    private Integer id;
-
-    @ExcelHeader("店铺名称")
-    @TableField("store_name")
-    private String storeName;
-
-    @ExcelHeader("顾客联系电话")
-    @TableField("store_phone")
-    private String storePhone;
-
-    @ExcelHeader("顾客评论")
-    @TableField("customer_report")
-    private String customerReport;
-
-    @ExcelHeader("申诉理由")
-    private String appealReason;
-
-    @ExcelHeader("申诉凭证")
-    @ExcelImage
-    private String appealImage;
-
-    @ExcelHeader("申诉时间")
-    private String appealTime;
-
-    @ExcelHeader("申诉状态")
-    private String appealType;
-
-}

+ 0 - 65
alien-entity/src/main/java/shop/alien/entity/store/excelVo/LifeUserOrderExcelVo.java

@@ -1,65 +0,0 @@
-package shop.alien.entity.store.excelVo;
-
-import com.fasterxml.jackson.annotation.JsonInclude;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import shop.alien.store.util.ExcelHeader;
-import shop.alien.store.util.ExcelImage;
-
-/**
- * @Author: fcw
- * @CreateTime: 2025-05-21
- * @Description: 用户订单Excel导出
- */
-@Data
-@JsonInclude
-@ApiModel(value = "LifeUserOrder表Excel导出对象", description = "LifeUserOrder")
-public class LifeUserOrderExcelVo {
-
-    @ExcelHeader("序号")
-    @ApiModelProperty(value = "序号")
-    private Integer serialNumber;
-
-    @ExcelHeader("订单编号")
-    @ApiModelProperty(value = "订单编号")
-    private String orderNo;
-
-    @ExcelHeader("店铺ID")
-    @ApiModelProperty(value = "店铺ID")
-    private String storeId;
-
-    @ExcelHeader("团购名称")
-    @ApiModelProperty(value = "团购名称")
-    private String couponName;
-
-    @ExcelHeader("图片")
-    @ExcelImage
-    @ApiModelProperty(value = "图片")
-    private String image;
-
-    @ExcelHeader("价格")
-    @ApiModelProperty(value = "价格")
-    private String price;
-
-    @ExcelHeader("联系人")
-    @ApiModelProperty(value = "联系人")
-    private String storeContact;
-
-    @ExcelHeader("手机号")
-    @ApiModelProperty(value = "手机号")
-    private String phone;
-
-    @ExcelHeader("付款时间")
-    @ApiModelProperty(value = "付款时间")
-    private String payTime;
-
-    @ExcelHeader("完成时间")
-    @ApiModelProperty(value = "完成时间")
-    private String finishTime;
-
-    @ExcelHeader("订单状态")
-    @ApiModelProperty(value = "订单状态")
-    private String orderStatus;
-
-}

+ 0 - 70
alien-entity/src/main/java/shop/alien/entity/store/excelVo/LifeUserViolationExcelVO.java

@@ -1,70 +0,0 @@
-package shop.alien.entity.store.excelVo;
-
-
-import com.fasterxml.jackson.annotation.JsonInclude;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import shop.alien.store.util.ExcelHeader;
-import shop.alien.store.util.ExcelImage;
-
-/**
- * @Author: fcw
- * @CreateTime: 2025-04-10
- * @Description: 套餐状态
- */
-@Data
-@JsonInclude
-@ApiModel(value = "LifeUserViolation表Excel导出对象", description = "LifeUserViolation")
-public class LifeUserViolationExcelVO {
-
-    @ExcelHeader("序号")
-    @ApiModelProperty(value = "序号")
-    private Integer id;
-
-    @ExcelHeader("用户昵称")
-    @ApiModelProperty(value = "用户昵称")
-    private String nickname;
-
-
-
-    @ExcelHeader("用户联系电话")
-    @ApiModelProperty(value = "用户联系电话")
-    private String phone;
-
-
-    @ExcelHeader("被举报人账号")
-    @ApiModelProperty(value = "被举报人账号")
-    private String reportedAcc;
-
-
-    @ExcelHeader("举报内容")
-    @ApiModelProperty(value = "举报内容")
-    private String reportContextType;
-
-
-    @ExcelHeader("举报理由")
-    @ApiModelProperty(value = "举报理由")
-    private String violationType;
-
-
-
-    @ExcelHeader("凭证")
-    @ApiModelProperty(value = "凭证")
-    @ExcelImage
-    private String reportEvidenceImg;
-
-
-
-    @ExcelHeader("状态")
-    @ApiModelProperty(value = "状态")
-    private String processingStatus;
-
-    @ExcelHeader("举报时间")
-    @ApiModelProperty(value = "举报时间")
-    private String createdTime;
-
-    @ExcelHeader("处理时间")
-    @ApiModelProperty(value = "举报时间")
-    private String processingTime;
-}

+ 0 - 50
alien-entity/src/main/java/shop/alien/entity/store/excelVo/StoreActivityExcelVo.java

@@ -1,50 +0,0 @@
-package shop.alien.entity.store.excelVo;
-
-import com.fasterxml.jackson.annotation.JsonInclude;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import shop.alien.store.util.ExcelHeader;
-import shop.alien.store.util.ExcelImage;
-
-/**
- * @author YinDP
- * @since 2025-4-2
- */
-@Data
-@JsonInclude
-@ApiModel(value = "StoreInfo表Excel导出对象", description = "门店信息")
-public class StoreActivityExcelVo {
-
-    @ExcelHeader("序号")
-    @ApiModelProperty(value = "序号")
-    private Integer serialNumber;
-
-    @ExcelHeader("名称")
-    @ApiModelProperty(value = "主键")
-    private String activityTitle;
-
-    @ExcelImage()
-    @ExcelHeader(value = "图片")
-    @ApiModelProperty(value = "图片")
-    private String contractImage;
-
-    @ExcelHeader(value = "创建时间")
-    @ApiModelProperty(value = "创建时间")
-    private String createdTime;
-
-    @ExcelHeader(value = "活动时间")
-    @ApiModelProperty(value = "活动时间")
-    private String activityTime;
-
-    @ExcelHeader(value = "状态")
-    @ApiModelProperty(value = "状态")
-    private String status;
-
-    @ExcelHeader(value = "备注")
-    @ApiModelProperty(value = "备注")
-    private String approvalOpinion;
-
-
-
-}

+ 0 - 46
alien-entity/src/main/java/shop/alien/entity/store/excelVo/StoreCouponStatusVo.java

@@ -1,46 +0,0 @@
-package shop.alien.entity.store.excelVo;
-
-import com.fasterxml.jackson.annotation.JsonInclude;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import shop.alien.store.util.ExcelHeader;
-
-/**
- * @Author: fcw
- * @CreateTime: 2025-04-10
- * @Description: 套餐状态
- */
-@Data
-@JsonInclude
-@ApiModel(value = "StoreCoupon表Excel导出对象", description = "套餐状态")
-public class StoreCouponStatusVo {
-
-    @ExcelHeader("序号")
-    @ApiModelProperty(value = "主键")
-    private String id;
-
-    @ExcelHeader("门店名称")
-    @ApiModelProperty(value = "门店名称")
-    private String storeName;
-
-    @ExcelHeader("套餐名称")
-    @ApiModelProperty(value = "套餐名称")
-    private String couponName;
-
-    @ExcelHeader("套餐状态")
-    @ApiModelProperty(value = "套餐状态")
-    private String couponState;
-
-    @ExcelHeader("套餐时间")
-    @ApiModelProperty(value = "套餐时间")
-    private String couponTime;
-
-    @ExcelHeader("剩余天数")
-    @ApiModelProperty(value = "剩余天数")
-    private String daysToExpire;
-
-    @ExcelHeader("到期状态")
-    @ApiModelProperty(value = "到期状态")
-    private String expiredState;
-}

+ 0 - 75
alien-entity/src/main/java/shop/alien/entity/store/excelVo/StoreInfoExcelVo.java

@@ -1,75 +0,0 @@
-package shop.alien.entity.store.excelVo;
-
-import com.fasterxml.jackson.annotation.JsonInclude;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import shop.alien.store.util.ExcelHeader;
-import shop.alien.store.util.ExcelImage;
-
-/**
- * @author YinDP
- * @since 2025-4-2
- */
-@Data
-@JsonInclude
-@ApiModel(value = "StoreInfo表Excel导出对象", description = "门店信息")
-public class StoreInfoExcelVo {
-
-    @ExcelHeader("序号")
-    @ApiModelProperty(value = "序号")
-    private Integer serialNumber;
-
-    @ExcelHeader("商铺ID")
-    @ApiModelProperty(value = "主键")
-    private Integer id;
-
-    @ExcelHeader("联系人")
-    @ApiModelProperty(value = "联系人")
-    private String storeContact;
-
-    @ExcelHeader("联系电话")
-    @ApiModelProperty(value = "联系人电话")
-    private String storePhone;
-
-    @ExcelHeader("店铺名称")
-    @ApiModelProperty(value = "门店名称")
-    private String storeName;
-
-    @ExcelHeader("经营板块")
-    @ApiModelProperty(value = "经营板块名称")
-    private String businessSectionName;
-
-    @ExcelHeader("经营种类")
-    @ApiModelProperty(value = "经营种类")
-    private String businessTypesName;
-
-    @ExcelHeader(value = "详细地址")
-    @ApiModelProperty(value = "详细地址")
-    private String storeAddress;
-
-    @ExcelHeader(value = "创建时间")
-    @ApiModelProperty(value = "创建时间")
-    private String createdTime;
-
-    @ExcelHeader(value = "审核状态")
-    @ApiModelProperty(value = "店铺申请审核状态(0:待审核,1:审核通过,2:审核失败)")
-    private String storeApplicationStatus;
-
-    @ExcelHeader(value = "门店状态")
-    @ApiModelProperty(value = "门店状态, 见字典表 storeStatus")
-    private String storeStatus;
-
-    @ExcelImage()
-    @ExcelHeader(value = "营业执照")
-    @ApiModelProperty(value = "营业执照")
-    private String businessLicense;
-
-    @ExcelImage()
-    @ExcelHeader(value = "合同图片")
-    @ApiModelProperty(value = "合同图片")
-    private String contractImage;
-
-
-
-}

+ 0 - 48
alien-entity/src/main/java/shop/alien/entity/store/excelVo/StoreInfoExpiredRecordsExcelVo.java

@@ -1,48 +0,0 @@
-
-package shop.alien.entity.store.excelVo;
-
-import com.fasterxml.jackson.annotation.JsonInclude;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import shop.alien.store.util.ExcelHeader;
-
-/**
- * @author YinDP
- * @since 2025-4-2
- */
-@Data
-@JsonInclude
-@ApiModel(value = "StoreInfo表Excel导出对象", description = "门店信息")
-public class StoreInfoExpiredRecordsExcelVo {
-
-    @ExcelHeader("序号")
-    @ApiModelProperty(value = "序号")
-    private Integer serialNumber;
-
-    @ApiModelProperty(value = "主键")
-    @ExcelHeader("商铺ID")
-    private Integer id;
-
-    @ApiModelProperty(value = "门店名称")
-    @ExcelHeader("店铺名称")
-    private String storeName;
-
-    @ApiModelProperty(value = "经营板块名称")
-    @ExcelHeader("经营板块")
-    private String businessSectionName;
-
-    @ApiModelProperty(value = "到期时间")
-    @ExcelHeader("到期时间")
-    private String expirationTime;
-
-    @ApiModelProperty(value = "剩余天数")
-    @ExcelHeader("剩余天数")
-    private Long daysToExpire;
-
-    @ApiModelProperty(value = "状态")
-    @ExcelHeader("状态")
-    private String expiredState;
-
-
-}

+ 0 - 53
alien-entity/src/main/java/shop/alien/entity/store/excelVo/StoreStaffConfigExcelVo.java

@@ -1,53 +0,0 @@
-package shop.alien.entity.store.excelVo;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import shop.alien.store.util.ExcelHeader;
-import shop.alien.store.util.ExcelImage;
-
-/**
- * @Author: fcw
- * @CreateTime: 2025-04-15
- * @Description: 人员管理导出
- */
-@Data
-@JsonInclude
-@ApiModel(value = "StoreStaffConfig表Excel导出对象", description = "人员管理")
-public class StoreStaffConfigExcelVo {
-
-    @ExcelHeader("序号")
-    @ApiModelProperty(value = "主键")
-    private Integer id;
-
-    @ExcelHeader("所属店铺")
-    @TableField("store_name")
-    private String storeName;
-
-    @ExcelHeader("姓名/昵称")
-    @TableField("name")
-    private String name;
-
-    @ExcelHeader("职位")
-    @TableField("staff_position")
-    private String staffPosition;
-
-    @ExcelHeader("头像")
-    @ExcelImage
-    private String staffImage;
-
-    @ExcelHeader("擅长")
-    private String proficientProjects;
-
-    @ExcelHeader("标签")
-    private String tag;
-
-    @ExcelHeader("简介")
-    private String personalIntroduction;
-
-    @ExcelHeader("状态")
-    @TableField("status")
-    private String status;
-}

+ 0 - 37
alien-entity/src/main/java/shop/alien/entity/store/excelVo/StoreUserExcelVo.java

@@ -1,37 +0,0 @@
-package shop.alien.entity.store.excelVo;
-
-import com.fasterxml.jackson.annotation.JsonInclude;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import shop.alien.store.util.ExcelHeader;
-
-/**
- * @author YinDP
- * @since 2025-4-2
- */
-@Data
-@JsonInclude
-@ApiModel(value = "StoreUser表Excel导出对象", description = "商家端账号信息")
-public class StoreUserExcelVo {
-
-    @ExcelHeader("序号")
-    @ApiModelProperty(value = "序号")
-    private Integer serialNumber;
-
-    @ApiModelProperty(value = "主键")
-    @ExcelHeader(value = "账号ID")
-    private Integer id;
-
-    @ApiModelProperty(value = "手机号码")
-    @ExcelHeader(value = "手机号码")
-    private String phone;
-
-    @ApiModelProperty(value = "创建时间")
-    @ExcelHeader(value = "创建时间")
-    private String createdTime;
-
-    @ApiModelProperty(value = "状态")
-    @ExcelHeader(value = "状态")
-    private String status;
-}

+ 0 - 77
alien-entity/src/main/java/shop/alien/entity/store/vo/EssentialModuleInformationVo.java

@@ -1,77 +0,0 @@
-package shop.alien.entity.store.vo;
-
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-import java.io.Serializable;
-import java.util.Date;
-import java.util.List;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author ssk
- * @since 2025-03-20
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@ApiModel(value="EssentialModuleInformation对象", description="")
-public class EssentialModuleInformationVo extends Model<EssentialModuleInformationVo> {
-
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "主键")
-    private Integer id;
-
-    @ApiModelProperty(value = "数据键")
-    private String informationKey;
-
-    @ApiModelProperty(value = "数据值")
-    private String informationValue;
-
-    @ApiModelProperty(value = "展示值")
-    private String label;
-
-    @ApiModelProperty(value = "数据类型")
-    private String dataType;
-
-    @ApiModelProperty(value = "参数类型")
-    private String paramType;
-
-    @ApiModelProperty(value = "上级数据id")
-    private Integer parentId;
-
-    @ApiModelProperty(value = "删除标记, 0:未删除, 1:已删除")
-    @TableLogic
-    private Integer deleteFlag;
-
-    @ApiModelProperty(value = "创建时间")
-    private Date createdTime;
-
-    @ApiModelProperty(value = "创建人ID")
-    private Integer createdUserId;
-
-    @ApiModelProperty(value = "修改时间")
-    private Date updatedTime;
-
-    @ApiModelProperty(value = "修改人ID")
-    private Integer updatedUserId;
-
-    @ApiModelProperty(value = "修改人ID")
-    private List<EssentialModuleInformationVo> children;
-
-
-    @Override
-    protected Serializable pkVal() {
-        return this.id;
-    }
-
-}

+ 0 - 24
alien-entity/src/main/java/shop/alien/entity/store/vo/ExpertGoodsTypeVo.java

@@ -1,24 +0,0 @@
-package shop.alien.entity.store.vo;
-
-import lombok.Data;
-
-/**
- * 达人带货返回类
- *
- * @author ssk
- * @version 1.0
- * @date 2025/2/20 17:27
- */
-@Data
-public class ExpertGoodsTypeVo {
-
-    private String storeType;
-
-    private Integer typeCount;
-
-    private String storeTypeStr;
-
-    private String amount;
-
-    private String percent;
-}

+ 0 - 15
alien-entity/src/main/java/shop/alien/entity/store/vo/LifeActivityVo.java

@@ -1,15 +0,0 @@
-package shop.alien.entity.store.vo;
-
-import com.fasterxml.jackson.annotation.JsonInclude;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import shop.alien.store.entity.LifeActivity;
-
-@Data
-@JsonInclude
-public class LifeActivityVo extends LifeActivity {
-
-    @ApiModelProperty(value = "是否点赞  0-未点赞 1-已点赞")
-    private String isLike;
-
-}

+ 0 - 33
alien-entity/src/main/java/shop/alien/entity/store/vo/LifeAppealManageVo.java

@@ -1,33 +0,0 @@
-package shop.alien.entity.store.vo;
-
-import com.fasterxml.jackson.annotation.JsonInclude;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import shop.alien.store.entity.LifeAppealManage;
-
-/**
- * 申诉管理列表返回类
- *
- * @author ssk
- * @version 1.0
- * @date 2024/12/31 13:20
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@JsonInclude
-public class LifeAppealManageVo extends LifeAppealManage {
-
-    @ApiModelProperty(value = "申诉状态字符串")
-    private String appealTypeStr;
-
-    @ApiModelProperty(value = "业务类型")
-    private Integer businessType;
-
-    @ApiModelProperty(value = "业务类型名称")
-    private String businessTypeName;
-
-    @ApiModelProperty(value = "业务状态名称")
-    private String appealTypeName;
-
-}

+ 0 - 32
alien-entity/src/main/java/shop/alien/entity/store/vo/LifeBlacklistVo.java

@@ -1,32 +0,0 @@
-package shop.alien.entity.store.vo;
-
-import com.fasterxml.jackson.annotation.JsonInclude;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
-import shop.alien.store.entity.LifeBlacklist;
-
-/**
- * @Author: fcw
- * @CreateTime: 2025-05-08
- * @Description: 拉黑
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@JsonInclude
-@NoArgsConstructor
-@ApiModel(value = "LifeBlacklistVo对象", description = "拉黑")
-public class LifeBlacklistVo extends LifeBlacklist {
-
-    @ApiModelProperty(value = "名称")
-    private String name;
-
-    @ApiModelProperty(value = "用户头像")
-    private String userImage;
-
-    @ApiModelProperty(value = "用户头像")
-    private String phoneId;
-
-}

+ 0 - 35
alien-entity/src/main/java/shop/alien/entity/store/vo/LifeBrandedCardVo.java

@@ -1,35 +0,0 @@
-package shop.alien.entity.store.vo;
-
-import com.fasterxml.jackson.annotation.JsonInclude;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
-import shop.alien.store.entity.LifeBrandedCard;
-
-import java.util.List;
-
-/**
- * 联名卡
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@JsonInclude
-@NoArgsConstructor
-@ApiModel(value = "LifeBrandedCardVo对象", description = "联名卡")
-public class LifeBrandedCardVo extends LifeBrandedCard {
-
-    @ApiModelProperty(value = "图片明细地址")
-    private List<String> detailsImages;
-
-    @ApiModelProperty(value = "联名卡商家名称")
-    public List<String> storeNameList;
-
-    @ApiModelProperty(value = "联名卡套餐名称")
-    public List<String> couponNameList;
-
-    @ApiModelProperty(value = "联名卡图片地址")
-    public List<String> imageUrlList;
-
-}

+ 0 - 21
alien-entity/src/main/java/shop/alien/entity/store/vo/LifeClassManageVo.java

@@ -1,21 +0,0 @@
-package shop.alien.entity.store.vo;
-
-import com.fasterxml.jackson.annotation.JsonInclude;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
-import shop.alien.store.entity.LifeClassManage;
-
-@Data
-@EqualsAndHashCode(callSuper = false)
-@JsonInclude
-@NoArgsConstructor
-@ApiModel(value = "LifeClassManageVo", description = "课程")
-public class LifeClassManageVo extends LifeClassManage {
-
-    @ApiModelProperty(value = "大名称")
-    private String classBigTypeName;
-
-}

+ 0 - 574
alien-entity/src/main/java/shop/alien/entity/store/vo/LifeCouponVo.java

@@ -1,574 +0,0 @@
-package shop.alien.entity.store.vo;
-
-import com.baomidou.mybatisplus.annotation.*;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
-import shop.alien.store.entity.LifeCoupon;
-import shop.alien.store.entity.StoreGroupInfo;
-
-import java.util.Date;
-import java.util.List;
-
-@Data
-@EqualsAndHashCode(callSuper = false)
-@JsonInclude
-@NoArgsConstructor
-@ApiModel(value = "LifeCouponVo对象", description = "套餐")
-public class LifeCouponVo extends LifeCoupon {
-
-
-    @TableId(value = "id", type = IdType.AUTO)
-    private String id;
-
-    @ApiModelProperty(value = "券id")
-    @TableField("coupon_code")
-    private String couponCode;
-
-    @ApiModelProperty(value = "券名称")
-    private String name;
-
-    @ApiModelProperty(value = "商家id")
-    private String storeId;
-
-    @ApiModelProperty(value = "价格")
-    private String price;
-
-    @ApiModelProperty(value = "折扣价")
-    private String offprice;
-
-    @ApiModelProperty(value = "有效期")
-    private Integer expirationDate;
-
-    @ApiModelProperty(value = "开始日期")
-    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
-    private Date startDate;
-
-    @ApiModelProperty(value = "结束日期")
-    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
-    private Date endDate;
-
-    @ApiModelProperty(value = "不可用时间")
-    private String unusedDate;
-
-    @ApiModelProperty(value = "优惠券数量")
-    private Integer singleQty;
-
-    @ApiModelProperty(value = "限制购买数")
-    private Integer buyLimit;
-
-    @ApiModelProperty(value = "票数量")
-    private Integer stockQty;
-
-    @ApiModelProperty(value = "使用规则")
-    private String useRule;
-
-    @ApiModelProperty(value = "可用人数(最低)")
-    private String minUsePeoples;
-
-    @ApiModelProperty(value = "可用人数(最多)")
-    private String maxUsePeoples;
-
-    @ApiModelProperty(value = "饮食偏好(字典--DietaryPreferences)")
-    private String dietaryPreferences;
-
-    @ApiModelProperty(value = "烹饪方式(字典--CookingMethods)")
-    private String cookingMethods;
-
-    @ApiModelProperty(value = "受用场景")
-    private String applicableRule;
-
-    @ApiModelProperty(value = "状态:-1.待审核  -2.已驳回  0.待使用(已通过), 1.进行中, 2.已暂停, 3.已结束")
-    private Integer status;
-
-    @ApiModelProperty(value = "券图片地址")
-    private String imagePath;
-
-    @ApiModelProperty(value = "商家服务")
-    private String storeService;
-
-    @ApiModelProperty(value = "发票信息")
-    private String fapiaoInfo;
-
-    @ApiModelProperty(value = "类型   1-代金券  2-团购(套餐)")
-    private Integer type;
-
-    @ApiModelProperty(value = "审批评论")
-    private String approvalComments;
-
-    @ApiModelProperty(value = "是否开启保价(1-开启 0-未开启)")
-    private Integer openPriceProtection;
-
-    @ApiModelProperty(value = "价格低于某值")
-    private Integer priceBelow;
-
-    @ApiModelProperty(value = "补偿优惠券面额")
-    private String couponComp;
-
-    @ApiModelProperty(value = "补偿优惠券有效期")
-    private Integer couponCompDate;
-
-    @ApiModelProperty(value = "打分")
-    private Integer rateScore;
-
-    @ApiModelProperty(value = "优惠tag")
-    private String discountTag;
-
-    @TableField(exist = false)
-    private List<String> tempDiscountTag;
-
-    @ApiModelProperty(value = "优惠tag名称")
-    private String discountTagName;
-
-    @ApiModelProperty(value = "删除标记, 0:未删除, 1:已删除")
-    @TableField("delete_flag")
-    @TableLogic
-    private Integer deleteFlag;
-
-    private Integer statusDeleteFlag;
-
-    @ApiModelProperty(value = "创建时间")
-    @TableField(value = "created_time", fill = FieldFill.INSERT)
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    private Date createdTime;
-
-    @ApiModelProperty(value = "创建人ID")
-    @TableField("created_user_id")
-    private Integer createdUserId;
-
-    @ApiModelProperty(value = "修改时间")
-    @TableField(value = "updated_time", fill = FieldFill.UPDATE)
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    private Date updatedTime;
-
-    @ApiModelProperty(value = "修改人ID")
-    @TableField("updated_user_id")
-    private Integer updatedUserId;
-
-    @ApiModelProperty(value = "商家类型")
-    @TableField("store_type")
-    private String storeType;
-
-    @ApiModelProperty(value = "开始售卖时间类型")
-    @TableField("sale_time_str_type")
-    private String saleTimeStrType;
-
-    @ApiModelProperty(value = "结束售卖时间类型")
-    @TableField("sale_time_end_type")
-    private String saleTimeEndType;
-
-    @ApiModelProperty(value = "每人限购CODE")
-    @TableField("purchase_limit_code")
-    private String purchaseLimitCode;
-
-    @ApiModelProperty(value = "原价")
-    @TableField("original_price")
-    private String originalPrice;
-
-    @ApiModelProperty(value = "优惠价")
-    @TableField("discounted_price")
-    private String discountedPrice;
-
-    @ApiModelProperty(value = "经营种类")
-    @TableField("business_types")
-    private String businessTypes;
-
-    @ApiModelProperty(value = "住房类型")
-    @TableField("housing_type")
-    private String housingType;
-
-    @ApiModelProperty(value = "房间类型")
-    @TableField("room_type")
-    private String roomType;
-
-    @ApiModelProperty(value = "房间类型code")
-    @TableField("room_type_code")
-    private String roomTypeCode;
-
-    @ApiModelProperty(value = "厨房(详情里面)")
-    @TableField("kitchen_xq")
-    private String kitchenXq;
-
-    @ApiModelProperty(value = "卫生间(详情里面)")
-    @TableField("bathroom_xq")
-    private String bathroomXq;
-
-    @ApiModelProperty(value = "客厅")
-    @TableField("living_room")
-    private String livingRoom;
-
-    @ApiModelProperty(value = "房源位置")
-    @TableField("location_of_the_property")
-    private String locationOfTheProperty;
-
-    @ApiModelProperty(value = "总面积")
-    @TableField("total_area")
-    private String totalArea;
-
-    @ApiModelProperty(value = "娱乐设施code")
-    @TableField("entertainment_facilities_code")
-    private String entertainmentFacilitiesCode;
-
-    @ApiModelProperty(value = "娱乐设施")
-    @TableField("entertainment_facilities")
-    private String entertainmentFacilities;
-
-    @ApiModelProperty(value = "便利设施code")
-    @TableField("convenience_facilities_code")
-    private String convenienceFacilitiesCode;
-
-    @ApiModelProperty(value = "便利设施")
-    @TableField("convenience_facilities")
-    private String convenienceFacilities;
-
-    @ApiModelProperty(value = "浴室配套code")
-    @TableField("bathroom_facilities_code")
-    private String bathroomFacilitiesCode;
-
-    @ApiModelProperty(value = "浴室配套")
-    @TableField("bathroom_facilities")
-    private String bathroomFacilities;
-
-    @ApiModelProperty(value = "洗漱用品code")
-    @TableField("bath_products_code")
-    private String bathProductsCode;
-
-    @ApiModelProperty(value = "洗浴用品")
-    @TableField("bath_products")
-    private String bathProducts;
-
-    @ApiModelProperty(value = "服务code")
-    @TableField("service_code")
-    private String serviceCode;
-
-    @ApiModelProperty(value = "服务")
-    @TableField("service")
-    private String service;
-
-    @ApiModelProperty(value = "安全code")
-    @TableField("safety_code")
-    private String safetyCode;
-
-    @ApiModelProperty(value = "安全")
-    @TableField("safety")
-    private String safety;
-
-    @ApiModelProperty(value = "预订须知")
-    @TableField("reservation_instructions")
-    private String reservationInstructions;
-
-    @ApiModelProperty(value = "开始时间")
-    @TableField("in_time")
-    private String inTime;
-
-    @ApiModelProperty(value = "结束时间")
-    @TableField("out_time")
-    private String outTime;
-
-    @ApiModelProperty(value = "是否需要押金")
-    @TableField("deposit_flag")
-    private String depositFlag;
-
-    @ApiModelProperty(value = "押金金额")
-    @TableField("deposit_amount")
-    private String depositAmount;
-
-    @ApiModelProperty(value = "是否可以携带儿童")
-    @TableField("children_flag")
-    private String childrenFlag;
-
-    @ApiModelProperty(value = "携带儿童说明")
-    @TableField("children_description")
-    private String childrenDescription;
-
-    @ApiModelProperty(value = "是否可以携带宠物")
-    @TableField("pet_flag")
-    private String petFlag;
-
-    @ApiModelProperty(value = "是否允许加床")
-    @TableField("extra_bed_flag")
-    private String extraBedFlag;
-
-    @ApiModelProperty(value = "床单价")
-    @TableField("bed_price")
-    private String bedPrice;
-
-    @ApiModelProperty(value = "发票信息")
-    @TableField("invoice_info")
-    private String invoiceInfo;
-
-    @ApiModelProperty(value = "发票说明")
-    @TableField("invoice_instructions")
-    private String invoiceInstructions;
-
-    @ApiModelProperty(value = "取消政策类型")
-    @TableField("cancellation_policy_type")
-    private String cancellationPolicyType;
-
-    @ApiModelProperty(value = "取消政策")
-    @TableField("cancellation_policy")
-    private String cancellationPolicy;
-
-    @ApiModelProperty(value = "取消说明")
-    @TableField("Cancellation_instructions")
-    private String cancellationInstructions;
-
-    @ApiModelProperty(value = "是否保价")
-    @TableField("insured_price")
-    private String insuredPrice;
-
-    @ApiModelProperty(value = "有效期类型")
-    @TableField("validity_period_type")
-    private String validityPeriodType;
-
-    @ApiModelProperty(value = "包厢类型code")
-    @TableField("box_type_code")
-    private String boxTypeCode;
-
-    @ApiModelProperty(value = "包箱类型")
-    @TableField("box_type")
-    private String boxType;
-
-    @ApiModelProperty(value = "饮食小吃code")
-    @TableField("snacks_code")
-    private String snacksCode;
-
-    @ApiModelProperty(value = "饮品小食")
-    @TableField("snacks")
-    private String snacks;
-
-    @ApiModelProperty(value = "可用时长")
-    @TableField("available_duration")
-    private String availableDuration;
-
-    @ApiModelProperty(value = "核销方式类型")
-    @TableField("write_off_type")
-    private String writeOffType;
-
-    @ApiModelProperty(value = "核销方式")
-    @TableField("write_off")
-    private String writeOff;
-
-    @ApiModelProperty(value = "退款规则类型")
-    @TableField("refund_rules_type")
-    private String refundRulesType;
-
-    @ApiModelProperty(value = "退款规则")
-    @TableField("refund_rules")
-    private String refundRules;
-
-    @ApiModelProperty(value = "退款说明")
-    @TableField("refund_instructions")
-    private String refundInstructions;
-
-    @ApiModelProperty(value = "修改规则code")
-    @TableField("edit_rules_code")
-    private String editRulesCode;
-
-    @ApiModelProperty(value = "修改规则")
-    @TableField("edit_rules")
-    private String editRules;
-
-    @ApiModelProperty(value = "修改说明")
-    @TableField("edit_instructions")
-    private String editInstructions;
-
-    @ApiModelProperty(value = "汤池code")
-    @TableField("tangchi_code")
-    private String tangchiCode;
-
-    @ApiModelProperty(value = "汤池")
-    @TableField("tangchi")
-    private String tangchi;
-
-    @ApiModelProperty(value = "汗蒸code")
-    @TableField("sweat_sauna_code")
-    private String sweatSaunaCode;
-
-    @ApiModelProperty(value = "汗蒸")
-    @TableField("sweat_sauna")
-    private String sweatSauna;
-
-    @ApiModelProperty(value = "图文详情")
-    @TableField("pictures_and_text")
-    private String picturesAndText;
-
-    @ApiModelProperty(value = "补充说明")
-    @TableField("supplement")
-    private String supplement;
-
-    @ApiModelProperty(value = "不可用时期类型")
-    @TableField("unavailable_date_type")
-    private String unavailableDateType;
-
-    @ApiModelProperty(value = "预约规则")
-    @TableField("reservation_rules")
-    private String reservationRules;
-
-    @ApiModelProperty(value = "适用人数")
-    @TableField("applicable_num")
-    private String applicableNum;
-
-    @ApiModelProperty(value = "其他规则")
-    @TableField("other_rules")
-    private String otherRules;
-
-    @ApiModelProperty(value = "售卖类型")
-    @TableField("sales_type")
-    private String salesType;
-
-    @ApiModelProperty(value = "按摩手法code")
-    @TableField("massage_technique_code")
-    private String massageTechniqueCode;
-
-    @ApiModelProperty(value = "按摩手法")
-    @TableField("massage_technique")
-    private String massageTechnique;
-
-    @ApiModelProperty(value = "按摩部位code")
-    @TableField("massage_area_code")
-    private String massageAreaCode;
-
-    @ApiModelProperty(value = "按摩部位")
-    @TableField("massage_area")
-    private String massageArea;
-
-    @ApiModelProperty(value = "按摩工具code")
-    @TableField("massage_tools_code")
-    private String massageToolsCode;
-
-    @ApiModelProperty(value = "按摩工具")
-    @TableField("massage_tools")
-    private String massageTools;
-
-    @ApiModelProperty(value = "热敷工具code")
-    @TableField("compress_tools_code")
-    private String compressToolsCode;
-
-    @ApiModelProperty(value = "热敷工具")
-    @TableField("compress_tools")
-    private String compressTools;
-
-    @ApiModelProperty(value = "上课形式code")
-    @TableField("class_format_code")
-    private String classFormatCode;
-
-    @ApiModelProperty(value = "上课形式")
-    @TableField("class_format")
-    private String classFormat;
-
-    @ApiModelProperty(value = "课程时长code")
-    @TableField("class_duration_code")
-    private String classDurationCode;
-
-    @ApiModelProperty(value = "课程时长")
-    @TableField("class_duration")
-    private String classDuration;
-
-    @ApiModelProperty(value = "课时数code")
-    @TableField("class_num_code")
-    private String classNumCode;
-
-    @ApiModelProperty(value = "课时数")
-    @TableField("class_num")
-    private String classNum;
-
-    @ApiModelProperty(value = "适用部位code")
-    @TableField("applicable_parts_code")
-    private String applicablePartsCode;
-
-    @ApiModelProperty(value = "适用部位")
-    @TableField("applicable_parts")
-    private String applicableParts;
-
-    @ApiModelProperty(value = "卫生code")
-    @TableField("hygiene_code")
-    private String hygieneCode;
-
-    @ApiModelProperty(value = "卫生")
-    @TableField("hygiene")
-    private String hygiene;
-
-    @ApiModelProperty(value = "基础code")
-    @TableField("foundation_code")
-    private String foundationCode;
-
-    @ApiModelProperty(value = "基础")
-    @TableField("foundation")
-    private String foundation;
-
-    @ApiModelProperty(value = "卫浴code")
-    @TableField("bathroom_code")
-    private String bathroomCode;
-
-    @ApiModelProperty(value = "卫浴")
-    @TableField("bathroom")
-    private String bathroom;
-
-    @ApiModelProperty(value = "厨房code")
-    @TableField("kitchen_code")
-    private String kitchenCode;
-
-    @ApiModelProperty(value = "厨房")
-    @TableField("kitchen")
-    private String kitchen;
-
-    @ApiModelProperty(value = "优惠券有效期类型")
-    @TableField("validity_period_yh_type")
-    private String validityPeriodYhType;
-
-    @ApiModelProperty(value = "课程有效期code")
-    @TableField("course_validity_period_code")
-    private String courseValidityPeriodCode;
-
-    @ApiModelProperty(value = "课程有效期")
-    @TableField("course_validity_period")
-    private String courseValidityPeriod;
-
-    @ApiModelProperty(value = "图片")
-    @TableField("uploaded_picList")
-    private String uploadedPiclist;
-
-    @ApiModelProperty(value = "有效期时间段")
-    @TableField("validity_period")
-    private String validityPeriod;
-
-    @ApiModelProperty(value = "商家名称")
-    private String storeName;
-
-    @ApiModelProperty(value = "商家手机号")
-    private String phone;
-
-    @ApiModelProperty(value = "状态")
-    private String statusName;
-
-    @ApiModelProperty(value = "商家地址")
-    private String storeAddress;
-
-    @ApiModelProperty(value = "电话")
-    private String phoneId;
-
-    @ApiModelProperty(value = "是否关注我")
-    private String isFollowMe;
-
-    @ApiModelProperty(value = "接收人id('store_' 或 'user_' + 手机号)")
-    private String receiverId;
-
-    private String expiredState;
-
-    private String couponName;
-
-    private String couponState;
-
-    private String couponTime;
-
-    private String daysToExpire;
-
-    private String imgs;
-    @ApiModelProperty(value = "团购子表")
-    private List<StoreGroupInfo> storeGroupInfos;
-}

+ 0 - 52
alien-entity/src/main/java/shop/alien/entity/store/vo/LifeDiscountCouponStoreFriendVo.java

@@ -1,52 +0,0 @@
-package shop.alien.entity.store.vo;
-
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-import java.io.Serializable;
-import java.util.List;
-
-/**
- * <p>
- * 优惠券商户发放好友优惠券关系表	
- * </p>
- *
- * @author ssk
- * @since 2025-02-19
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@ApiModel(value="LifeDiscountCouponStoreFriend对象", description="优惠券商户发放好友优惠券关系表	")
-public class LifeDiscountCouponStoreFriendVo extends Model<LifeDiscountCouponStoreFriendVo> {
-
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "主键")
-    private Integer id;
-
-    @ApiModelProperty(value = "店铺用户id")
-    private Integer storeUserId;
-
-    @ApiModelProperty(value = "券id")
-    private Integer couponId;
-
-    @ApiModelProperty(value = "好友店铺姓名")
-    private String friendStoreUserName;
-
-    @ApiModelProperty(value = "好友店铺id")
-    private Integer friendStoreUserId;
-
-    @ApiModelProperty(value = "好友店铺可用优惠券列表")
-    private List<LifeDiscountCouponVo> friendStoreCouponList;
-
-    @Override
-    protected Serializable pkVal() {
-        return this.id;
-    }
-
-}

+ 0 - 34
alien-entity/src/main/java/shop/alien/entity/store/vo/LifeDiscountCouponUserVo.java

@@ -1,34 +0,0 @@
-package shop.alien.entity.store.vo;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-/**
- * <p>
- * 优惠券用户表
- * </p>
- *
- * @author ssk
- * @since 2025-02-08
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@ApiModel(value="LifeDiscountCouponUser对象", description="优惠券用户表")
-public class LifeDiscountCouponUserVo {
-
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "用户id")
-    private Integer userId;
-
-    @ApiModelProperty(value = "券id")
-    private Integer couponId;
-
-    @ApiModelProperty(value = "领取数量")
-    private Integer receiveQuantity;
-
-}

+ 0 - 115
alien-entity/src/main/java/shop/alien/entity/store/vo/LifeDiscountCouponVo.java

@@ -1,115 +0,0 @@
-package shop.alien.entity.store.vo;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-import java.math.BigDecimal;
-import java.time.LocalDate;
-import java.util.List;
-
-/**
- * <p>
- * 优惠券表DTO
- * </p>
- *
- * @author ssk
- * @since 2025-02-07
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@ApiModel(value="LifeDiscountCoupon对象", description="优惠券表")
-public class LifeDiscountCouponVo {
-
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "用户券id")
-    private Integer userCouponId;
-
-    @ApiModelProperty(value = "商铺id")
-    private String storeId;
-
-    @ApiModelProperty(value = "用户id")
-    private String userId;
-
-    @ApiModelProperty(value = "券id")
-    private Integer couponId;
-
-    @ApiModelProperty(value = "是否可领")
-    private boolean canReceived;
-
-    @ApiModelProperty(value = "已领取数量")
-    private Integer quantityClaimed;
-
-    @ApiModelProperty(value = "券名称")
-    private String name;
-
-    @ApiModelProperty(value = "面值")
-    private BigDecimal nominalValue;
-
-    @ApiModelProperty(value = "有效期(天)")
-    private Integer expirationDate;
-
-    @ApiModelProperty(value = "开始日期")
-    private LocalDate startDate;
-
-    @ApiModelProperty(value = "结束日期")
-    private LocalDate endDate;
-
-    @ApiModelProperty(value = "库存(优惠券数量)")
-    private Integer singleQty;
-
-    @ApiModelProperty(value = "补充说明")
-    private String supplementaryInstruction;
-
-    @ApiModelProperty(value = "领取状态:0:关闭领取,1:开启领取")
-    private Integer getStatus;
-
-    @ApiModelProperty(value = "限制领取数量")
-    private Integer restrictedQuantity;
-
-    @ApiModelProperty(value = "最低消费")
-    private BigDecimal minimumSpendingAmount;
-
-    @ApiModelProperty(value = "类型   1-优惠券  2-红包")
-    private Integer type;
-
-    @ApiModelProperty(value = "状态(0:进行中,1:已结束,2:未开始,3:活动暂停)")
-    private Integer status;
-
-    @ApiModelProperty(value = "收藏可领(0:否,1:是)")
-    private Integer attentionCanReceived;
-
-    @ApiModelProperty(value = "是否可用")
-    private boolean disabledStatus;
-
-    @ApiModelProperty(value = "禁用规则简介")
-    private String forbiddenRule;
-
-    @ApiModelProperty(value = "周中禁用规则")
-    private List<String> weeklyDisabledList;
-
-    @ApiModelProperty(value = "节假日禁用规则")
-    private List<String> holidayDisabledList;
-
-    @ApiModelProperty(value = "优惠券领取规则  每日一领:day,每周一领:week,每月一领:month,每年一领:year")
-    private String claimRule;
-
-    @ApiModelProperty(value = "店铺名称")
-    private String storeName;
-
-    @ApiModelProperty(value = "发布状态")
-    private Integer releaseType;
-
-    @ApiModelProperty(value = "赠送券id")
-    private String giveCouponId;
-
-    @ApiModelProperty(value = "到达使用时间")
-    private Integer reachUseTimeFlag;
-
-    @ApiModelProperty(value = "经营板块id(词典表 键为 business_section)")
-    private Integer businessSection;
-}

+ 0 - 53
alien-entity/src/main/java/shop/alien/entity/store/vo/LifeFansVo.java

@@ -1,53 +0,0 @@
-package shop.alien.entity.store.vo;
-
-import com.fasterxml.jackson.annotation.JsonInclude;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@JsonInclude
-@NoArgsConstructor
-@ApiModel(value = "LifeFansVo对象", description = "关注相关")
-public class LifeFansVo {
-
-    @ApiModelProperty(value = "用户id")
-    public String id;
-
-    @ApiModelProperty(value = "名称")
-    public String name;
-
-    @ApiModelProperty(value = "简介")
-    public String blurb;
-
-    @ApiModelProperty(value = "头像")
-    public String image;
-
-    @ApiModelProperty(value = "唯一标识")
-    public String phoneId;
-
-    @ApiModelProperty(value = "对方是否关注我 0-未关注 1-已关注")
-    public String isFollowMe;
-
-    @ApiModelProperty(value = "我是否关注对方 0-未关注 1-已关注")
-    public String isFollowThis;
-
-    @ApiModelProperty(value = "粉丝数量")
-    public String fansNum;
-
-    @ApiModelProperty(value = "关注数量")
-    public String followNum;
-
-    @ApiModelProperty(value = "好友数量")
-    public String friendNum;
-
-    @ApiModelProperty(value = "动态数量")
-    public String dynamicsNum;
-
-    @ApiModelProperty(value = "是否拉黑")
-    public String isBlocked;
-
-    @ApiModelProperty(value = "拉黑id")
-    public String blackListid;
-}

+ 0 - 48
alien-entity/src/main/java/shop/alien/entity/store/vo/LifeMessageVo.java

@@ -1,48 +0,0 @@
-package shop.alien.entity.store.vo;
-
-import com.fasterxml.jackson.annotation.JsonInclude;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import shop.alien.store.entity.LifeMessage;
-
-@Data
-@JsonInclude
-@NoArgsConstructor
-@ApiModel(value = "LifeMessageVo对象", description = "消息通知")
-public class LifeMessageVo extends LifeMessage {
-
-    @ApiModelProperty(value = "名称")
-    private String userName;
-
-    @ApiModelProperty(value = "头像")
-    private String userImage;
-
-    @ApiModelProperty(value = "商户头像")
-    private String storeImg;
-
-    @ApiModelProperty(value = "唯一标识")
-    private String phoneId;
-//
-//    @ApiModelProperty(value = "消息列表")
-//    private List<LifeMessage> messageList;
-
-    @ApiModelProperty(value = "未读消息数量")
-    private Long notReadCount;
-
-    @ApiModelProperty(value = "我是否关注对方 0-未关注 1-已关注")
-    private String isFollowThis;
-
-    @ApiModelProperty(value = "对方是否关注我 0-未关注 1-已关注")
-    private String isFollowMe;
-
-    @ApiModelProperty(value = "是否是商户 0-不是商户 1-是商户")
-    private String isMerchant;
-
-    @ApiModelProperty(value = "接收方图片展示")
-    private String receiverImg;
-
-    @ApiModelProperty(value = "发送方图片展示")
-    private String senderImg;
-}

+ 0 - 28
alien-entity/src/main/java/shop/alien/entity/store/vo/LifeNoticeVo.java

@@ -1,28 +0,0 @@
-package shop.alien.entity.store.vo;
-
-import com.fasterxml.jackson.annotation.JsonInclude;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import shop.alien.store.entity.LifeNotice;
-
-@Data
-@NoArgsConstructor
-@JsonInclude
-@ApiModel(value = "LifeNoticeVo对象", description = "公告通知")
-public class LifeNoticeVo extends LifeNotice {
-
-    @ApiModelProperty(value = "用户名")
-    private String userName;
-
-    @ApiModelProperty(value = "用户头像")
-    private String userImage;
-
-    @ApiModelProperty(value = "系统通知数量")
-    private Long systemNum;
-
-    @ApiModelProperty(value = "订单提醒数量")
-    private Long orderNum;
-
-}

+ 0 - 58
alien-entity/src/main/java/shop/alien/entity/store/vo/LifePinglunVo.java

@@ -1,58 +0,0 @@
-package shop.alien.entity.store.vo;
-
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.Date;
-
-@Data
-@JsonInclude
-public class LifePinglunVo {
-    private String id;
-
-    private String storeId;
-    private String userId;
-    private String userName;
-    private String storeName;
-    private String gudingPinglun;
-    private String shoudaPinglun;
-    private String pinglunLevel;
-    private Date pinglunTime;
-    private String huifuId;
-    private String pinglunType;
-    private int pinglunDianzan;
-    private String pinglunLeibie;
-    private String dongtaiShequId;
-    private String imagePath;
-    private String headImage;
-    private String dianzanStatus;
-    private String userAdress;
-
-    @ApiModelProperty(value = "删除标记, 0:未删除, 1:已删除")
-    @TableField("delete_flag")
-    @TableLogic
-    private Integer deleteFlag;
-
-    @ApiModelProperty(value = "创建时间")
-    @TableField(value = "created_time", fill = FieldFill.INSERT)
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    private Date createdTime;
-
-    @ApiModelProperty(value = "创建人ID")
-    @TableField("created_user_id")
-    private Integer createdUserId;
-
-    @ApiModelProperty(value = "修改时间")
-    @TableField(value = "updated_time", fill = FieldFill.UPDATE)
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    private Date updatedTime;
-
-    @ApiModelProperty(value = "修改人ID")
-    @TableField("updated_user_id")
-    private Integer updatedUserId;
-}

+ 0 - 74
alien-entity/src/main/java/shop/alien/entity/store/vo/LifePromotionPackageVo.java

@@ -1,74 +0,0 @@
-package shop.alien.entity.store.vo;
-
-import com.baomidou.mybatisplus.annotation.*;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-@Data
-@JsonInclude
-public class LifePromotionPackageVo {
-
-    @TableId(value = "id", type = IdType.AUTO)
-    private Integer id;
-
-    @ApiModelProperty(value = "达人id(life_user_expert 表 id)")
-    @TableField("expert_id")
-    private Integer expertId;
-
-    @ApiModelProperty(value = "套餐名称")
-    @TableField("name")
-    private String name;
-
-    @ApiModelProperty(value = "商户ID")
-    private Integer storeId;
-
-    @ApiModelProperty(value = "商户用户ID")
-    private String storeUserId;
-
-    @ApiModelProperty(value = "支付金额")
-    private BigDecimal payPrice;
-
-    @ApiModelProperty(value = "订单编号")
-    private String orderNo;
-
-
-    @ApiModelProperty(value = "播放量")
-    private String playCount;
-
-    @ApiModelProperty(value = "gmv")
-    private String gmv;
-
-    @ApiModelProperty(value = "价格")
-    private String price;
-
-    @ApiModelProperty(value = "已售数量")
-    private String soldCount;
-
-    @ApiModelProperty(value = "删除标记, 0:未删除, 1:已删除")
-    @TableField("delete_flag")
-    @TableLogic
-    private Integer deleteFlag;
-
-    @ApiModelProperty(value = "创建时间")
-    @TableField(value = "created_time", fill = FieldFill.INSERT)
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    private Date createdTime;
-
-    @ApiModelProperty(value = "创建人ID")
-    @TableField("created_user_id")
-    private Integer createdUserId;
-
-    @ApiModelProperty(value = "修改时间")
-    @TableField(value = "updated_time", fill = FieldFill.UPDATE)
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    private Date updatedTime;
-
-    @ApiModelProperty(value = "修改人ID")
-    @TableField("updated_user_id")
-    private Integer updatedUserId;
-}

+ 0 - 24
alien-entity/src/main/java/shop/alien/entity/store/vo/LifeReverseGroupBuyingStoreVo.java

@@ -1,24 +0,0 @@
-package shop.alien.entity.store.vo;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-/**
- * 反向团购商家列表类
- *
- * @author ssk
- * @version 1.0
- * @date 2025/3/6 15:01
- */
-@Data
-public class LifeReverseGroupBuyingStoreVo extends LifeReverseGroupBuyingUserVo {
-
-    @ApiModelProperty("用户名")
-    private String userName;
-
-    @ApiModelProperty("用户头像")
-    private String userImgUrl;
-
-    @ApiModelProperty("参与的商家数")
-    private Integer joinStoreCount;
-}

+ 0 - 32
alien-entity/src/main/java/shop/alien/entity/store/vo/LifeReverseGroupBuyingUserVo.java

@@ -1,32 +0,0 @@
-package shop.alien.entity.store.vo;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import shop.alien.store.entity.LifeReverseGroupBuying;
-
-/**
- * 反向团购用户列表类
- *
- * @author ssk
- * @version 1.0
- * @date 2025/3/5 10:39
- */
-@Data
-public class LifeReverseGroupBuyingUserVo extends LifeReverseGroupBuying {
-
-    @ApiModelProperty("团购金额Str")
-    private String groupMoneyStr;
-
-    @ApiModelProperty("团购类型str, 地方美食...")
-    private String groupTypeStr;
-
-    @ApiModelProperty("状态, 0:待审核, 1:未通过, 2:已通过, 3:待接单, 4:未接单(已截止), 5:待使用, 6:已完成, 7:已退款")
-    private String statusStr;
-
-    @ApiModelProperty("字典内容, 字典表hotelLabel, restaurantLabel")
-    private String dictDetail;
-
-    @ApiModelProperty("订单号")
-    private String orderNo;
-
-}

+ 0 - 60
alien-entity/src/main/java/shop/alien/entity/store/vo/LifeStoreVo.java

@@ -1,60 +0,0 @@
-package shop.alien.entity.store.vo;
-
-import com.baomidou.mybatisplus.annotation.*;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.Date;
-
-@Data
-@JsonInclude
-@TableName("life_store")
-public class LifeStoreVo {
-    @TableId(type = IdType.UUID)
-    private String id;
-    private String storeName;
-    private String storeContact;
-    private String storePhone;
-    private String storeType;
-    private String storeState;
-    private String storePassword;
-    @TableField(value = "store_expire_date", fill = FieldFill.INSERT)
-    private Date storeExpireDate;
-    private String storeProv;
-    private String storeCity;
-    private String storeArea;
-    private String storeDetailAddress;
-    private String storeDocument;
-    private String remark;
-    private String isChain;
-    private String lunbotu;
-    private String isShoucang;
-    private String isGuanzhu;
-    private double distance;
-    private String touxiangImage;
-
-    @ApiModelProperty(value = "删除标记, 0:未删除, 1:已删除")
-    @TableField("delete_flag")
-    @TableLogic
-    private Integer deleteFlag;
-
-    @ApiModelProperty(value = "创建时间")
-    @TableField(value = "created_time", fill = FieldFill.INSERT)
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    private Date createdTime;
-
-    @ApiModelProperty(value = "创建人ID")
-    @TableField("created_user_id")
-    private Integer createdUserId;
-
-    @ApiModelProperty(value = "修改时间")
-    @TableField(value = "updated_time", fill = FieldFill.UPDATE)
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    private Date updatedTime;
-
-    @ApiModelProperty(value = "修改人ID")
-    @TableField("updated_user_id")
-    private Integer updatedUserId;
-}

+ 0 - 20
alien-entity/src/main/java/shop/alien/entity/store/vo/LifeTuanGouParamVo.java

@@ -1,20 +0,0 @@
-package shop.alien.entity.store.vo;
-
-import com.fasterxml.jackson.annotation.JsonInclude;
-import lombok.Data;
-import shop.alien.store.entity.LifeCoupon;
-import shop.alien.store.entity.LifeGroupPackage;
-
-import java.util.List;
-
-/**
- * 团购请求参数
- */
-@Data
-@JsonInclude
-public class LifeTuanGouParamVo {
-
-    LifeCoupon tuangou;
-
-    List<LifeGroupPackage> tuangouPackageList;
-}

+ 0 - 57
alien-entity/src/main/java/shop/alien/entity/store/vo/LifeUserDongTaiVo.java

@@ -1,57 +0,0 @@
-package shop.alien.entity.store.vo;
-
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.Date;
-import java.util.Map;
-
-@Data
-@JsonInclude
-public class LifeUserDongTaiVo {
-    private String id;
-    private String createId;
-    private String context;
-    private String imagePath;
-    private String address;
-    private int liulanCount;
-    private int dianzanCount;
-    private String type;
-    private Map pingluns;
-    private String guanzhuType;
-    private String storeName;
-    private int pinglunCount;
-    private String shangjiaImage;
-    private String dianzanStatus;
-    private String userHeadImage;
-    private String userName;
-    private String phoneId;
-
-    @ApiModelProperty(value = "删除标记, 0:未删除, 1:已删除")
-    @TableField("delete_flag")
-    @TableLogic
-    private Integer deleteFlag;
-
-    @ApiModelProperty(value = "创建时间")
-    @TableField(value = "created_time", fill = FieldFill.INSERT)
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    private Date createdTime;
-
-    @ApiModelProperty(value = "创建人ID")
-    @TableField("created_user_id")
-    private Integer createdUserId;
-
-    @ApiModelProperty(value = "修改时间")
-    @TableField(value = "updated_time", fill = FieldFill.UPDATE)
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    private Date updatedTime;
-
-    @ApiModelProperty(value = "修改人ID")
-    @TableField("updated_user_id")
-    private Integer updatedUserId;
-}

+ 0 - 46
alien-entity/src/main/java/shop/alien/entity/store/vo/LifeUserDynamicsVo.java

@@ -1,46 +0,0 @@
-package shop.alien.entity.store.vo;
-
-import com.fasterxml.jackson.annotation.JsonInclude;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import shop.alien.store.entity.LifeUserDynamics;
-
-@Data
-@JsonInclude
-@NoArgsConstructor
-@ApiModel(value = "LifeUserDynamicsVo对象", description = "动态列表")
-public class LifeUserDynamicsVo extends LifeUserDynamics {
-
-    @ApiModelProperty(value = "商家或用户id")
-    private String storeUserId;
-
-    @ApiModelProperty(value = "名称")
-    private String userName;
-
-    @ApiModelProperty(value = "头像")
-    private String userImage;
-
-    @ApiModelProperty(value = "对方是否关注我 0-未关注 1-已关注")
-    private String isFollowMe;
-
-    @ApiModelProperty(value = "我是否关注对方 0-未关注 1-已关注")
-    private String isFollowThis;
-
-    @ApiModelProperty(value = "0-未点赞 1-已点赞")
-    private String isLike;
-
-    @ApiModelProperty(value = "评论数量")
-    private long commentCount;
-
-    @ApiModelProperty(value = "商家或用户id")
-    private String storeOrUserId;
-
-    @ApiModelProperty(value = "图片")
-    private String imagePath;
-
-    @ApiModelProperty(value = "内容")
-    private String context;
-
-}

+ 0 - 63
alien-entity/src/main/java/shop/alien/entity/store/vo/LifeUserExpertOrderVo.java

@@ -1,63 +0,0 @@
-package shop.alien.entity.store.vo;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-import shop.alien.store.entity.LifeUserExpertOrder;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@ApiModel(value="LifeUserExpertOrderVo", description="达人订单vo")
-public class LifeUserExpertOrderVo extends LifeUserExpertOrder {
-
-    @ApiModelProperty(value = "达人ID")
-    private Integer expertId;
-
-    @ApiModelProperty(value = "商家名称")
-    private String storeName;
-
-    @ApiModelProperty(value = "商家头像")
-    private String storeImg;
-
-    @ApiModelProperty(value = "实际播放量")
-    private Integer actualPlayCount;
-
-    @ApiModelProperty(value = "状态名称")
-    private String statusName;
-
-    @ApiModelProperty(value = "已售数量")
-    private String soldCount;
-
-    @ApiModelProperty(value = "实际GMV")
-    @TableField("actual_gmv")
-    private BigDecimal actualGmv;
-
-    @ApiModelProperty(value = "开始时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    private Date earliestCreatedTime;
-
-    @ApiModelProperty(value = "到账总金额")
-    private BigDecimal accountMoney;
-
-    @ApiModelProperty(value = "待履约收益")
-    private Integer pendingPerformanceIncome;
-
-    @ApiModelProperty(value = "订单完成数")
-    private Integer completedOrdersNumber;
-
-    @ApiModelProperty(value = "未完成订单数")
-    private Integer incompleteOrdersNumber;
-
-    @ApiModelProperty(value = "进店浏览数")
-    private Integer storeVisitViewCount;
-
-
-}

+ 0 - 100
alien-entity/src/main/java/shop/alien/entity/store/vo/LifeUserExpertVo.java

@@ -1,100 +0,0 @@
-package shop.alien.entity.store.vo;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-import shop.alien.store.entity.LifeUserExpert;
-
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@ApiModel(value="LifeUserExpertVo对象", description="用户达人vo")
-public class LifeUserExpertVo extends LifeUserExpert {
-
-    @ApiModelProperty(value = "达人姓名")
-    private String userName;
-
-    @ApiModelProperty(value = "达人ID")
-    private Integer userId;
-
-    @ApiModelProperty(value = "达人头像")
-    private String userImage;
-
-    @ApiModelProperty(value = "达人分类")
-    private String homePageType;
-
-    @ApiModelProperty(value = "真实姓名")
-    private String realName;
-
-    @ApiModelProperty(value = "身份证号码")
-    private String idCard;
-
-    @ApiModelProperty(value = "手机号")
-    private String userPhone;
-
-    @ApiModelProperty(value = "粉丝数量")
-    private Integer fansNum;
-
-    @ApiModelProperty(value = "作品数量")
-    private Integer worksNum;
-
-    @ApiModelProperty(value = "播放数量")
-    private Integer playNum;
-
-    @ApiModelProperty(value = "点赞数量")
-    private Integer likeNum;
-
-    @ApiModelProperty(value = "平均播放量")
-    private Integer averagePlayNum;
-
-    @ApiModelProperty(value = "平均点赞量")
-    private Integer averageLikeNum;
-
-    @ApiModelProperty(value = "平均评论量")
-    private Integer averageCommentCount;
-
-    @ApiModelProperty(value = "平均分享量")
-    private Integer averageShareCount;
-
-    @ApiModelProperty(value = "总推广金额")
-    private Integer orderMoney;
-
-    @ApiModelProperty(value = "已打款金额")
-    private Integer accountMoney;
-
-    @ApiModelProperty(value = "待打款金额")
-    private Integer pendMoney;
-
-    @ApiModelProperty(value = "省")
-    private String province;
-
-    @ApiModelProperty(value = "市")
-    private String city;
-
-    @ApiModelProperty(value = "区")
-    private String district;
-
-    @ApiModelProperty(value = "生日")
-    private Date userBrithday;
-
-    @ApiModelProperty(value = "性别")
-    private String userSex;
-
-    @ApiModelProperty(value = "省占比")
-    private List<Map<String, String>> provincePercentageList;
-
-    @ApiModelProperty(value = "市占比")
-    private List<Map<String, String>> cityPercentageList;
-
-    @ApiModelProperty(value = "年龄占比")
-    private List<Map<String, String>> agePercentageList;
-
-    @ApiModelProperty(value = "性别占比")
-    private List<Map<String, String>> sexPercentageList;
-}

+ 0 - 67
alien-entity/src/main/java/shop/alien/entity/store/vo/LifeUserExpertWorksVo.java

@@ -1,67 +0,0 @@
-package shop.alien.entity.store.vo;
-
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-import java.util.Date;
-
-/**
- * @Author: fcw
- * @CreateTime: 2025-03-10
- * @Description: 达人作品表
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@ApiModel(value="LifeUserExpertWorksVo对象", description="用户达人作品vo")
-public class LifeUserExpertWorksVo {
-
-    @ApiModelProperty(value = "达人id(life_user_expert 表 id)")
-    private Integer expertId;
-
-    @ApiModelProperty(value = "订单id(life_user_expert_order 表 id)")
-    private Integer orderId;
-
-    @ApiModelProperty(value = "作品地址")
-    private String worksUrl;
-
-    @ApiModelProperty(value = "简介")
-    private String introduction;
-
-    @ApiModelProperty(value = "播放量")
-    private Integer playCount;
-
-    @ApiModelProperty(value = "点赞量")
-    private Integer likeCount;
-
-    @ApiModelProperty(value = "评论量")
-    private Integer commentCount;
-
-    @ApiModelProperty(value = "分享量")
-    private Integer shareCount;
-
-    @ApiModelProperty(value = "订单金额")
-    private Integer orderMoney;
-
-    @ApiModelProperty(value = "到账金额")
-    private Integer actualGmv;
-
-    @ApiModelProperty(value = "删除标记, 0:未删除, 1:已删除")
-    @TableField("delete_flag")
-    @TableLogic
-    private Integer deleteFlag;
-
-    @ApiModelProperty(value = "创建时间")
-    @TableField(value = "created_time", fill = FieldFill.INSERT)
-    private Date createdTime;
-
-    @ApiModelProperty(value = "修改时间")
-    @TableField(value = "updated_time", fill = FieldFill.INSERT_UPDATE)
-    private Date updatedTime;
-}

+ 0 - 82
alien-entity/src/main/java/shop/alien/entity/store/vo/LifeUserOrderVo.java

@@ -1,82 +0,0 @@
-package shop.alien.entity.store.vo;
-
-import com.baomidou.mybatisplus.annotation.*;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-/**
- * 用户订单
- */
-@Data
-@JsonInclude
-public class LifeUserOrderVo {
-
-    @TableId(value = "id", type = IdType.AUTO)
-    private String id;
-
-    private String userId;
-
-    private String storeId;
-
-    private String quanId;
-
-    private String quanCode;
-
-    private String orderNo;
-
-    private Integer status;
-
-    private Integer purchaseQuantity;
-
-    private Integer couponId;
-
-    private String userPhone;
-
-    private String type;
-
-    private BigDecimal totalFinalPrice;
-
-    private String couponName;
-
-    private String price;
-
-    private String finalPrice;
-
-    private Date buyTime;
-
-    private Date payTime;
-
-    private String payMethod;
-
-    private Date usedTime;
-
-    private Date refundTime;
-
-    @ApiModelProperty(value = "删除标记, 0:未删除, 1:已删除")
-    @TableField("delete_flag")
-    @TableLogic
-    private Integer deleteFlag;
-
-    @ApiModelProperty(value = "创建时间")
-    @TableField(value = "created_time", fill = FieldFill.INSERT)
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    private Date createdTime;
-
-    @ApiModelProperty(value = "创建人ID")
-    @TableField("created_user_id")
-    private Integer createdUserId;
-
-    @ApiModelProperty(value = "修改时间")
-    @TableField(value = "updated_time", fill = FieldFill.UPDATE)
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    private Date updatedTime;
-
-    @ApiModelProperty(value = "修改人ID")
-    @TableField("updated_user_id")
-    private Integer updatedUserId;
-}

+ 0 - 25
alien-entity/src/main/java/shop/alien/entity/store/vo/LifeUserViolationVo.java

@@ -1,25 +0,0 @@
-package shop.alien.entity.store.vo;
-
-import io.swagger.annotations.ApiModel;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-import shop.alien.store.entity.LifeUserViolation;
-
-/**
- * @Author: fcw
- * @CreateTime: 2025-05-08
- * @Description: 举报
- */
-
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@ApiModel(value="LifeUserViolationVo对象", description="举报vo")
-public class LifeUserViolationVo extends LifeUserViolation {
-
-    private String reportObject;
-
-    //举报结果通知
-    private String reportResultNotification;
-}

+ 0 - 62
alien-entity/src/main/java/shop/alien/entity/store/vo/LifeUserVo.java

@@ -1,62 +0,0 @@
-package shop.alien.entity.store.vo;
-
-import com.fasterxml.jackson.annotation.JsonInclude;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import shop.alien.store.entity.LifeUser;
-
-@Data
-@JsonInclude
-public class LifeUserVo extends LifeUser {
-
-    private String isGuanzhu;
-
-    private String token;
-
-    private String badNum;
-
-    private Integer fansCount;
-
-    private Integer likesNumber;
-
-    private Integer expertId;
-
-    private Integer expertCode;
-
-    private Integer consumeNum;
-
-    private double consumePrice;
-
-    @ApiModelProperty(value = "前端查询集合Label")
-    private String Label;
-
-    @ApiModelProperty(value = "前端查询集合Value")
-    private Integer value;
-
-    @ApiModelProperty(value = "分页页数")
-    private int page;
-
-    @ApiModelProperty(value = "分页条数")
-    private int size;
-
-    @ApiModelProperty(value = "用户id")
-    private String userId;
-
-    @ApiModelProperty(value = "搜索名称")
-    private String searchName;
-
-    @ApiModelProperty(value = "唯一标识")
-    private String phoneId;
-
-    @ApiModelProperty(value = "我是否关注对方 0-未关注 1-已关注")
-    private String isFollowThis;
-
-    @ApiModelProperty(value = "商家或用户名称")
-    private String storeUserName;
-
-    @ApiModelProperty(value = "头像图片")
-    private String imgUrl;
-
-    @ApiModelProperty(value = "简介")
-    private String blurb;
-}

+ 0 - 122
alien-entity/src/main/java/shop/alien/entity/store/vo/ManagementInfoVo.java

@@ -1,122 +0,0 @@
-package shop.alien.entity.store.vo;
-
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.Date;
-
-@Data
-public class ManagementInfoVo {
-
-    @ApiModelProperty(value = "商铺id")
-    private Integer storeId;
-    @ApiModelProperty(value = "商铺名称")
-    private String storeName;
-    @ApiModelProperty(value = "店铺套餐数量")
-    private Integer mealCouponCount;
-    @ApiModelProperty(value = "套餐购买数量")
-    private Integer mealOrderCount;
-    @ApiModelProperty(value = "套餐购买金额")
-    private Double mealOrderAmount;
-    @ApiModelProperty(value = "用户核验套餐数量")
-    private Integer mealIncomeCount;
-    @ApiModelProperty(value = "用户核验套餐购买金额")
-    private Double mealIncomeMoney;
-    @ApiModelProperty(value = "店铺代金券数量")
-    private Integer couponCouponCount;
-    @ApiModelProperty(value = "代金券购买数量")
-    private Integer couponOrderCount;
-    @ApiModelProperty(value = "代金券购买金额")
-    private Double couponOrderAmount;
-    @ApiModelProperty(value = "用户核验代金券数量")
-    private Integer couponIncomeCount;
-    @ApiModelProperty(value = "用户核验代金券金额")
-    private Double couponIncomeMoney;
-    @ApiModelProperty(value = "结算金额")
-    private Double cashoutMoney;
-    @ApiModelProperty(value = "冻结金额")
-    private Double accountFrozen;
-    @ApiModelProperty(value = "统计-核销金额")
-    private Double incomeMoney;
-    @ApiModelProperty(value = "统计-已付款金额")
-    private Double amountPaid;
-    @ApiModelProperty(value = "统计-总交易金额")
-    private Double totalTransactionAmount;
-    @ApiModelProperty(value = "统计-交易笔数")
-    private Double transactionNumber;
-    @ApiModelProperty(value = "统计-总订单金额")
-    private Double allOrderAmount;
-    @ApiModelProperty(value = "统计-总核销金额")
-    private Double allWrittenOffAmount;
-    @ApiModelProperty(value = "统计-总提现金额")
-    private Double totalWithdrawalAmount;
-    @ApiModelProperty(value = "详情-用户id")
-    private String userId;
-    @ApiModelProperty(value = "详情-用户姓名")
-    private String userName;
-    @ApiModelProperty(value = "详情-订单类型")
-    private Integer type;
-    @ApiModelProperty(value = "详情-订单类型名称")
-    private String typeName;
-    @ApiModelProperty(value = "详情-商品名称")
-    private String name;
-    @ApiModelProperty(value = "详情-购买数量")
-    private Integer buyCount;
-    @ApiModelProperty(value = "详情-购买金额")
-    private Double buyAmount;
-    @ApiModelProperty(value = "详情-购买时间")
-    private Date buyTime;
-    @ApiModelProperty(value = "详情-核销时间")
-    private Date usedTime;
-    @ApiModelProperty(value = "详情-退款时间")
-    private Date refundTime;
-    @ApiModelProperty(value = "详情-订单状态")
-    private Integer status;
-    @ApiModelProperty(value = "详情-订单状态名称")
-    private String statusName;
-    @ApiModelProperty(value = "详情-交易用户数")
-    private Integer userCount;
-    @ApiModelProperty(value = "详情-交易笔数")
-    private Integer orderTransactionNumber;
-    @ApiModelProperty(value = "详情-核验金额")
-    private Double verificationAmount;
-    @ApiModelProperty(value = "提现申请-申请类型")
-    private Integer cashOutType;
-    @ApiModelProperty(value = "提现申请-申请类型名称")
-    private String cashOutTypeName;
-    @ApiModelProperty(value = "提现申请-提现金额")
-    private Double money;
-    @ApiModelProperty(value = "提现申请-发起时间")
-    private Date createdTime;
-    @ApiModelProperty(value = "提现申请-到账时间")
-    private Date paymentDate;
-    @ApiModelProperty(value = "提现申请-记录id")
-    private Integer cashId;
-    @ApiModelProperty(value = "提现申请-商铺联系方式")
-    private String storePhone;
-    @ApiModelProperty(value = "数据可视化-利润")
-    private String profit;
-    @ApiModelProperty(value = "数据可视化-订单量")
-    private String count;
-    @ApiModelProperty(value = "数据可视化-分类title")
-    private String hourNum;
-    @ApiModelProperty(value = "数据可视化-行序号")
-    private String rowNum;
-    @ApiModelProperty(value = "数据可视化-营业收入")
-    private String operationRevenue;
-    @ApiModelProperty(value = "数据可视化-店铺所得利润")
-    private String storeProfit;
-    @ApiModelProperty(value = "数据可视化-平台净利润")
-    private String platformProfit;
-    @ApiModelProperty(value = "数据可视化-订单编号")
-    private String orderNo;
-    @ApiModelProperty(value = "数据可视化-订单名称")
-    private String orderName;
-    @ApiModelProperty(value = "数据可视化-下单时间")
-    private String orderTime;
-    @ApiModelProperty(value = "数据可视化-付款时间")
-    private String buyTimeStr;
-    @ApiModelProperty(value = "数据可视化-订单金额")
-    private String finalPrice;
-}

+ 0 - 41
alien-entity/src/main/java/shop/alien/entity/store/vo/ScreeningOfEightMajorCategoriesVO.java

@@ -1,41 +0,0 @@
-package shop.alien.entity.store.vo;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@Data
-public class ScreeningOfEightMajorCategoriesVO {
-
-    @ApiModelProperty(value = "筛选ID,多个ID用逗号分隔")
-    private String screeningId;
-
-    @ApiModelProperty(value = "经度")
-    private Double lon;
-
-    @ApiModelProperty(value = "纬度")
-    private Double lat;
-
-    @ApiModelProperty(value = "距离范围")
-    private Double distance;
-
-    @ApiModelProperty(value = "是否启用距离筛选")
-    private Boolean flag;
-
-    @ApiModelProperty(value = "营业时间自定义开始")
-    private String startTime;
-
-    @ApiModelProperty(value = "营业时间自定义结束")
-    private String endTime;
-
-    @ApiModelProperty(value = "价格开始")
-    private Double priceStr;
-
-    @ApiModelProperty(value = "价格结束")
-    private Double priceEnd;
-
-    @ApiModelProperty(value = "页码")
-    private Integer pageNum;
-
-    @ApiModelProperty(value = "页容")
-    private Integer pageSize;
-}

+ 0 - 199
alien-entity/src/main/java/shop/alien/entity/store/vo/StoreActivityVo.java

@@ -1,199 +0,0 @@
-
-package shop.alien.entity.store.vo;
-
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-import shop.alien.store.entity.StoreActivityRuleDetail;
-import shop.alien.store.entity.vo.LifeUserVo;
-import shop.alien.store.entity.vo.StoreInfoVo;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.Date;
-import java.util.List;
-
-/**
- * <p>
- * 活动主表
- * </p>
- *
- * @author ssk
- * @since 2025-05-14
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-public class StoreActivityVo extends Model<StoreActivityVo> {
-
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "主键ID")
-    private Long id;
-
-    @ApiModelProperty(value = "活动编号")
-    private String activityNo;
-
-    @ApiModelProperty(value = "活动标题")
-    private String activityTitle;
-
-    @ApiModelProperty(value = "活动类型(1:邀请好友 2:签到领红包)")
-    private Integer activityType;
-
-    @ApiModelProperty(value = "活动图片(JSON数组)")
-    private String contractImage;
-
-    @ApiModelProperty(value = "活动人群类型选择框")
-    private Integer activityCrowdRedio;
-
-    @ApiModelProperty(value = "活动人群类型(0:全部用户 1:自定义)")
-    private Integer activityCrowdType;
-
-    @ApiModelProperty(value = "具体规则说明")
-    private String specificRules;
-
-    @ApiModelProperty(value = "活动开始时间")
-    private Date activityStartTime;
-
-    @ApiModelProperty(value = "活动结束时间")
-    private Date activityEndTime;
-
-    @ApiModelProperty(value = "是否永久有效")
-    private Boolean isPermanent;
-
-    @ApiModelProperty(value = "状态(0:禁用 1:启用)")
-    private Integer status;
-
-    @ApiModelProperty(value = "审批意见")
-    private String approvalOpinion;
-
-    @ApiModelProperty(value = "规则类型(1:邀请好友规则 2:签到规则 3:任务规则)")
-    private Integer ruleType;
-
-    @ApiModelProperty(value = "邀请好友限时选择类型")
-    private Integer timeLimitRedio;
-
-    @ApiModelProperty(value = "邀请好友限时(小时)")
-    private Integer timeLimit;
-
-    @ApiModelProperty(value = "人数邀请限制选择框类型")
-    private Integer limitationPeopleRedio;
-
-    @ApiModelProperty(value = "人数邀请限制(0:无限制)")
-    private Integer limitationPeople;
-
-    @ApiModelProperty(value = "限领次数")
-    private Integer claimsNumber;
-
-    @ApiModelProperty(value = "折扣类型(1:优惠券 2:折扣券)")
-    private Integer discountType;
-
-    @ApiModelProperty(value = "折扣分数")
-    private BigDecimal discountGrade;
-
-    @ApiModelProperty(value = "折扣分数选择框类型")
-    private BigDecimal discountGradeRedio;
-
-    @ApiModelProperty(value = "折扣金额")
-    private BigDecimal discountMoney;
-
-    @ApiModelProperty(value = "折扣金额选择框类型")
-    private BigDecimal discountMoneyRedio;
-
-    @ApiModelProperty(value = "指定商家ID列表(空则无指定商家,所有商家)")
-    private List<Integer> storeIds;
-
-    @ApiModelProperty(value = "指定活动人群(空则无指定活动人群,所有人)")
-    private List<Integer> userIds;
-
-    @ApiModelProperty(value = "是否适用于堂食")
-    private Boolean isDineIn;
-
-    @ApiModelProperty(value = "是否适用于外卖")
-    private Boolean isTakeOut;
-
-    @ApiModelProperty(value = "折扣有效天数选择框")
-    private Integer effectiveDaysRedio;
-
-    @ApiModelProperty(value = "折扣有效天数")
-    private Integer effectiveDays;
-
-    @ApiModelProperty(value = "发放类型(1:红包)")
-    private Integer sendType;
-
-    @ApiModelProperty(value = "每日最小金额")
-    private BigDecimal dailyMinAmount;
-
-    @ApiModelProperty(value = "每日最大金额")
-    private BigDecimal dailyMaxAmount;
-
-    @ApiModelProperty(value = "每日领取次数")
-    private Integer dailyCollectionFrequency;
-
-    @ApiModelProperty(value = "保留天数")
-    private Integer retentionDays;
-
-    @ApiModelProperty(value = "任务类型(1:浏览团购 2:购买团购 3:邀请好友)")
-    private Integer taskType;
-
-    @ApiModelProperty(value = "任务详情")
-    private String taskDetail;
-
-    @ApiModelProperty(value = "浏览时长(分钟)")
-    private Integer browseTime;
-
-    @ApiModelProperty(value = "最小金额")
-    private BigDecimal minAmount;
-
-    @ApiModelProperty(value = "最大金额")
-    private BigDecimal maxAmount;
-
-    @ApiModelProperty(value = "活动起止时间")
-    private List<String> activityDate;
-
-    @ApiModelProperty(value = "删除状态")
-    @TableLogic
-    private Integer deleteFlag;
-
-    @ApiModelProperty(value = "创建时间")
-    @TableField(value = "created_time", fill = FieldFill.INSERT)
-    private Date createdTime;
-
-    @ApiModelProperty(value = "更新时间")
-    @TableField(value = "updated_time", fill = FieldFill.INSERT_UPDATE)
-    private Date updatedTime;
-
-    @ApiModelProperty(value = "创建人ID")
-    @TableField(value = "created_user_id", fill = FieldFill.INSERT)
-    private Integer createdUserId;
-
-    @ApiModelProperty(value = "修改人ID")
-    @TableField(value = "updated_user_id", fill = FieldFill.INSERT_UPDATE)
-    private Integer updatedUserId;
-
-    @ApiModelProperty(value = "活动时间(处理过)")
-    private String activityTime;
-
-    @ApiModelProperty(value = "用户选项")
-    private List<LifeUserVo> userOptions;
-
-    @ApiModelProperty(value = "店铺选项")
-    private List<StoreInfoVo> storeOptions;
-
-    @ApiModelProperty(value = "连续签到奖励")
-    private List<StoreActivityRuleDetail> ruleTableData;
-
-    @ApiModelProperty(value = "连续签到奖励")
-    private List<StoreActivityRuleDetail> taskRuleTableData;
-
-    @Override
-    protected Serializable pkVal() {
-        return this.id;
-    }
-
-}

+ 0 - 38
alien-entity/src/main/java/shop/alien/entity/store/vo/StoreCashOutRecordVo.java

@@ -1,38 +0,0 @@
-package shop.alien.entity.store.vo;
-
-import com.alibaba.fastjson2.JSONArray;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-import shop.alien.store.entity.StoreCashOutRecord;
-
-import java.math.BigDecimal;
-import java.util.List;
-
-/**
- * 商户提现记录返回类
- *
- * @author ssk
- * @version 1.0
- * @date 2025/1/2 16:23
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@ApiModel(value = "StoreCashOutRecordVo", description = "提现记录")
-public class StoreCashOutRecordVo extends StoreCashOutRecord {
-
-    @ApiModelProperty(value = "提现总金额")
-    private BigDecimal cashOutAllMoney;
-
-    @ApiModelProperty(value = "提现条数")
-    private Integer cashOutNum;
-
-    @ApiModelProperty(value = "提现记录")
-    private List<StoreCashOutRecord> cashOutRecordList;
-
-    @ApiModelProperty(value = "收益记录")
-    private JSONArray incomeList;
-}

+ 0 - 73
alien-entity/src/main/java/shop/alien/entity/store/vo/StoreClockInVo.java

@@ -1,73 +0,0 @@
-package shop.alien.entity.store.vo;
-
-import com.fasterxml.jackson.annotation.JsonInclude;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import shop.alien.store.entity.StoreClockIn;
-
-@Data
-@JsonInclude
-public class StoreClockInVo extends StoreClockIn {
-
-    @ApiModelProperty(value = "用户姓名")
-    private String userName;
-
-    @ApiModelProperty(value = "商家姓名")
-    private String storeName;
-
-    @ApiModelProperty(value = "商家位置")
-    private String storePosition;
-
-    @ApiModelProperty(value = "打卡图片")
-    private String clockImg;
-
-    @ApiModelProperty(value = "商家头像")
-    private String storeImg;
-
-    @ApiModelProperty(value = "用户头像")
-    private String userImg;
-
-    @ApiModelProperty(value = "对方是否关注我 0-未关注 1-已关注")
-    private String isFollowMe;
-
-    @ApiModelProperty(value = "我是否关注对方 0-未关注 1-已关注")
-    private String isFollowThis;
-
-    @ApiModelProperty(value = "0-未点赞 1-已点赞")
-    private String isLike;
-
-    @ApiModelProperty(value = "0-未收藏 1-已收藏")
-    private String isCollect;
-
-    @ApiModelProperty(value = "评论数量")
-    private int commentCount;
-
-    @ApiModelProperty(value = "商家评分")
-    private double score;
-
-    @ApiModelProperty(value = "人均价格")
-    private int perCapitaPrice;
-
-    @ApiModelProperty(value = "区域")
-    private String region;
-
-    @ApiModelProperty(value = "商家类型")
-    private String storeType;
-
-    @ApiModelProperty(value = "经营板块")
-    private String businessSection;
-
-    //    @ApiModelProperty(value = "商家是否打卡")
-//    @ApiModelProperty(value = "该用户是否在该店铺打过卡")
-//    private String clockInStore;
-//
-//    @ApiModelProperty(value = "今天在该店铺是否打过卡")
-//    private String clockInStoreToday;
-//
-//    @ApiModelProperty(value = "在该店铺的打卡次数")
-//    private Long clockInStoreNum;
-//
-//    @ApiModelProperty(value = "该用户打卡的所有店铺次数")
-//    private int clockInNum;
-
-}

+ 0 - 22
alien-entity/src/main/java/shop/alien/entity/store/vo/StoreCommentAppealLogVo.java

@@ -1,22 +0,0 @@
-package shop.alien.entity.store.vo;
-
-import com.fasterxml.jackson.annotation.JsonInclude;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import shop.alien.store.entity.StoreCommentAppealLog;
-
-/**
- * 申诉记录返回类
- *
- * @author ssk
- * @version 1.0
- * @date 2025/1/6 16:52
- */
-@Data
-@JsonInclude
-public class StoreCommentAppealLogVo extends StoreCommentAppealLog {
-
-    @ApiModelProperty(value = "流程状态, 0:商家提交, 1:系统审核, 2:系统初审失败, 3:系统初审成功, 4:申诉失败, 5:申诉成功")
-    private String processTypeStr;
-
-}

+ 0 - 61
alien-entity/src/main/java/shop/alien/entity/store/vo/StoreCommentAppealVo.java

@@ -1,61 +0,0 @@
-package shop.alien.entity.store.vo;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import shop.alien.store.entity.StoreCommentAppeal;
-
-import java.util.List;
-
-/**
- * 评论申诉返回类
- *
- * @author ssk
- * @version 1.0
- * @date 2025/1/6 13:15
- */
-@Data
-@JsonInclude
-public class StoreCommentAppealVo extends StoreCommentAppeal {
-
-    @ApiModelProperty(value = "商家申诉图片链接")
-    private List<String> imgList;
-
-    @ApiModelProperty(value = "申诉状态字符串")
-    private String appealStatusStr;
-
-    @ApiModelProperty(value = "顾客评论")
-    private String commentContent;
-
-    @ApiModelProperty(value = "顾客评论星级")
-    private Integer commentStar;
-
-    @ApiModelProperty(value = "顾客用户名")
-    private String userName;
-
-    @ApiModelProperty(value = "顾客头像")
-    private String userImage;
-
-    @ApiModelProperty(value = "顾客评价时间")
-    private String commentTime;
-
-    @ApiModelProperty(value = "门店名称")
-    private String storeName;
-
-    @ApiModelProperty(value = "门店联系人")
-    private String storeContact;
-
-    @ApiModelProperty(value = "门店联系人电话")
-    private String storePhone;
-
-    @ApiModelProperty(value = "门店类型(1:中餐, 2:烧烤, 3:饮品, 4:甜点, 5:火锅, 6:宵夜, 7:西餐, 8:轻食, 9:水果)")
-    @TableField("store_type")
-    private String storeType;
-
-    @ApiModelProperty(value = "门店状态字符串")
-    private String storeTypeStr;
-
-    @ApiModelProperty(value = "申诉流程记录")
-    private List<StoreCommentAppealLogVo> storeCommentAppealLogList;
-}

+ 0 - 52
alien-entity/src/main/java/shop/alien/entity/store/vo/StoreCommentVo.java

@@ -1,52 +0,0 @@
-package shop.alien.entity.store.vo;
-
-import com.fasterxml.jackson.annotation.JsonInclude;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import shop.alien.store.entity.StoreComment;
-
-import java.util.List;
-
-/**
- * 评论列表返回类
- *
- * @author ssk
- * @version 1.0
- * @date 2025/1/2 16:23
- */
-@Data
-@JsonInclude
-public class StoreCommentVo extends StoreComment {
-
-    @ApiModelProperty(value = "子评论")
-    private List<StoreCommentVo> storeComment;
-
-    @ApiModelProperty(value = "用户名")
-    private String userName;
-
-    @ApiModelProperty(value = "头像地址")
-    private String userImage;
-
-    @ApiModelProperty(value = "图片地址")
-    private List<String> imgUrl;
-
-    @ApiModelProperty(value = "是否点赞")
-    private Integer isLike;
-
-    @ApiModelProperty(value = "首评")
-    public boolean firstComment;
-
-    @ApiModelProperty(value = "有图片")
-    public boolean hasImage;
-
-    @ApiModelProperty(value = "差评")
-    public boolean lowScore;
-
-    @ApiModelProperty(value = "评论数")
-    public Integer commitCount;
-
-    @ApiModelProperty(value = "标签")
-    private List<String> labels;
-
-
-}

+ 0 - 47
alien-entity/src/main/java/shop/alien/entity/store/vo/StoreCommitPercentVo.java

@@ -1,47 +0,0 @@
-package shop.alien.entity.store.vo;
-
-import com.fasterxml.jackson.annotation.JsonInclude;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-/**
- * 回复百分比
- *
- * @author ssk
- * @version 1.0
- * @date 2025/1/6 8:46
- */
-@Data
-@JsonInclude
-public class StoreCommitPercentVo {
-
-    @ApiModelProperty(value = "好评")
-    private String highCommentCount;
-
-    @ApiModelProperty(value = "中评")
-    private String midCommentCount;
-
-    @ApiModelProperty(value = "差评")
-    private String lowCommentCount;
-
-    @ApiModelProperty(value = "总回复数")
-    private String allCommentCount;
-
-    @ApiModelProperty(value = "根回复数")
-    private String rootCommentCount;
-
-    @ApiModelProperty(value = "回复数")
-    private String commentCount;
-
-    @ApiModelProperty(value = "好评率")
-    private String highPercent;
-
-    @ApiModelProperty(value = "中评率")
-    private String midPercent;
-
-    @ApiModelProperty(value = "差评率")
-    private String lowPercent;
-
-    @ApiModelProperty(value = "回复率")
-    private String replyPercent;
-}

+ 0 - 64
alien-entity/src/main/java/shop/alien/entity/store/vo/StoreDictionaryVo.java

@@ -1,64 +0,0 @@
-package shop.alien.entity.store.vo;
-
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.util.Date;
-import java.util.List;
-
-/**
- * <p>
- * 门店字典表 新
- * </p>
- *
- * @author ssk
- * @since 2024-12-26
- */
-@Data
-@ApiModel(value = "StoreDictionary对象", description = "门店字典表 新")
-public class StoreDictionaryVo extends Model<StoreDictionaryVo> {
-
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "主键")
-    private Integer id;
-
-    @ApiModelProperty(value = "类型名称")
-    private String typeName;
-
-    @ApiModelProperty(value = "类型描述")
-    private String typeDetail;
-
-    @ApiModelProperty(value = "字典值id")
-    private String dictId;
-
-    @ApiModelProperty(value = "字典描述")
-    private String dictDetail;
-
-    @ApiModelProperty(value = "删除标记, 0:未删除, 1:已删除")
-    private Integer deleteFlag;
-
-    @ApiModelProperty(value = "创建时间")
-    private Date createdTime;
-
-    @ApiModelProperty(value = "创建人ID")
-    private Integer createdUserId;
-
-    @ApiModelProperty(value = "修改时间")
-    private Date updatedTime;
-
-    @ApiModelProperty(value = "修改人ID")
-    private Integer updatedUserId;
-
-    @ApiModelProperty(value = "子词典数据集")
-    private List<StoreDictionaryVo> subDataList;
-
-    @Override
-    protected Serializable pkVal() {
-        return this.id;
-    }
-
-}

+ 0 - 19
alien-entity/src/main/java/shop/alien/entity/store/vo/StoreDynamicDiscountInviteLogVo.java

@@ -1,19 +0,0 @@
-package shop.alien.entity.store.vo;
-
-import lombok.Data;
-import shop.alien.store.entity.StoreDynamicDiscountInviteLog;
-
-/**
- * 已邀请用户列表
- *
- * @author ssk
- * @version 1.0
- * @date 2025/3/26 17:08
- */
-@Data
-public class StoreDynamicDiscountInviteLogVo extends StoreDynamicDiscountInviteLog {
-
-    private String userName;
-
-    private String userImage;
-}

+ 0 - 40
alien-entity/src/main/java/shop/alien/entity/store/vo/StoreDynamicDiscountVo.java

@@ -1,40 +0,0 @@
-package shop.alien.entity.store.vo;
-
-import com.fasterxml.jackson.annotation.JsonInclude;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import shop.alien.store.entity.LifeUser;
-import shop.alien.store.entity.StoreDynamicDiscount;
-
-import java.util.List;
-
-/**
- * 商户动态折扣列表返回类
- *
- * @author ssk
- * @version 1.0
- * @date 2025/3/18 16:45
- */
-@JsonInclude
-@Data
-public class StoreDynamicDiscountVo extends StoreDynamicDiscount {
-
-    @ApiModelProperty(value = "状态字符串")
-    private String statusStr;
-
-    @ApiModelProperty(value = "团购类型字符串, 1:邀请好友,")
-    private String groupTypeStr;
-
-    @ApiModelProperty(value = "折扣适用范围, 0:堂食, 1外卖")
-    private String discountRangeStr;
-
-    @ApiModelProperty(value = "活动人群, 0:所有人, 逗号分割id:固定人群")
-    private List<LifeUser> activityCrowdList;
-
-    @ApiModelProperty(value = "门店名称")
-    private String storeName;
-
-    @ApiModelProperty(value = "图片url")
-    private String imgUrl;
-
-}

+ 0 - 25
alien-entity/src/main/java/shop/alien/entity/store/vo/StoreGroupPackageVO.java

@@ -1,25 +0,0 @@
-package shop.alien.entity.store.vo;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-import shop.alien.store.entity.LifeCoupon;
-import shop.alien.store.entity.StoreGroupInfo;
-
-import java.util.List;
-
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@ApiModel(value="StoreGroupPackageVO对象", description="八大类新建团购VO")
-public class StoreGroupPackageVO {
-
-    @ApiModelProperty(value = "团购")
-    private LifeCoupon storeGroupPackage;
-
-    @ApiModelProperty(value = "子表信息")
-    private List<StoreGroupInfo> storeGroupInfos;
-
-}

+ 0 - 31
alien-entity/src/main/java/shop/alien/entity/store/vo/StoreImgTypeVo.java

@@ -1,31 +0,0 @@
-package shop.alien.entity.store.vo;
-
-import com.fasterxml.jackson.annotation.JsonInclude;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-/**
- * 图片类型
- *
- * @author ssk
- * @version 1.0
- * @date 2025/1/15 9:30
- */
-@Data
-@JsonInclude
-public class StoreImgTypeVo {
-
-    @ApiModelProperty(value = "0:其他, 1:入口图, 2:相册, 3:菜品, 4:环境, 5:价目表, 6:推荐菜, 7:菜单, 8:用户评论, 9:商家申诉,10:商家头像,11:店铺轮播图,12:联名卡图片,13:动态折扣, 14:套餐图片")
-    private Integer imgType;
-
-    @ApiModelProperty(value = "图片类型字符串")
-    private String imgTypeStr;
-
-    @ApiModelProperty(value = "数量")
-    private Integer count;
-
-    @ApiModelProperty(value = "图片地址")
-    private String imgUrl;
-
-
-}

+ 0 - 21
alien-entity/src/main/java/shop/alien/entity/store/vo/StoreImgVo.java

@@ -1,21 +0,0 @@
-package shop.alien.entity.store.vo;
-
-import com.fasterxml.jackson.annotation.JsonInclude;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import shop.alien.store.entity.StoreImg;
-
-/**
- * 上传图片vo
- *
- * @author ssk
- * @version 1.0
- * @date 2025/1/13 10:35
- */
-@EqualsAndHashCode(callSuper = true)
-@Data
-@JsonInclude
-public class StoreImgVo extends StoreImg {
-
-    String name;
-}

+ 0 - 59
alien-entity/src/main/java/shop/alien/entity/store/vo/StoreIncomeDetailsRecordVo.java

@@ -1,59 +0,0 @@
-package shop.alien.entity.store.vo;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import shop.alien.store.entity.StoreIncomeDetailsRecord;
-
-import java.util.Date;
-import java.util.List;
-
-/**
- * 未到账期返回类
- *
- * @author ssk
- * @version 1.0
- * @date 2025/2/27 8:51
- */
-@ApiModel(value = "StoreIncomeDetailsRecordVo", description = "未到账期返回类")
-@Data
-@JsonInclude
-public class StoreIncomeDetailsRecordVo extends StoreIncomeDetailsRecord {
-
-    @ApiModelProperty(value = "可用金额")
-    String noYetPaymentMoney;
-
-    @ApiModelProperty(value = "收入金额")
-    String incomeMoney;
-
-    @ApiModelProperty(value = "手续费Str")
-    String commissionStr;
-
-    @ApiModelProperty(value = "时间")
-    String date;
-
-    @ApiModelProperty(value = "验券时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    Date checkTime;
-
-    @ApiModelProperty(value = "下单时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    Date orderTime;
-
-    @ApiModelProperty(value = "收益时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    Date incomeTime;
-
-    @ApiModelProperty(value = "券code")
-    String quanCode;
-
-    @ApiModelProperty(value = "券名称")
-    String couponName;
-
-    @ApiModelProperty(value = "商家名称")
-    String storeName;
-
-    List<StoreIncomeDetailsRecordVo> incomeDetailsRecordVoList;
-}

+ 0 - 165
alien-entity/src/main/java/shop/alien/entity/store/vo/StoreInfoVo.java

@@ -1,165 +0,0 @@
-package shop.alien.entity.store.vo;
-
-import com.fasterxml.jackson.annotation.JsonInclude;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
-import shop.alien.store.entity.LifeCoupon;
-import shop.alien.store.entity.StoreInfo;
-import shop.alien.store.entity.StoreStaffConfig;
-import shop.alien.store.entity.vo.LifeCouponVo;
-
-import java.util.List;
-
-@EqualsAndHashCode(callSuper = true)
-@Data
-@JsonInclude
-@NoArgsConstructor
-@ApiModel(value = "StoreInfoVo对象", description = "商家信息")
-public class StoreInfoVo extends StoreInfo {
-
-    @ApiModelProperty(value = "主键")
-    private Integer id;
-
-    @ApiModelProperty(value = "商户ID")
-    private Integer storeId;
-
-    @ApiModelProperty(value = "商家名称")
-    private String storeName;
-
-    @ApiModelProperty(value = "商家头像")
-    private String imgUrl;
-
-    @ApiModelProperty(value = "商家入口图")
-    private String entranceImage;
-
-    @ApiModelProperty(value = "联系人")
-    private String storeContact;
-
-    @ApiModelProperty(value = "联系人电话")
-    private String storePhone;
-
-    @ApiModelProperty(value = "联系人身份证号")
-    private String idCard;
-
-    @ApiModelProperty(value = "密码")
-    private String password;
-
-    @ApiModelProperty(value = "门店状态字符串")
-    private String storeStatusStr;
-
-    @ApiModelProperty(value = "营业状态字符串")
-    private String businessStatusStr;
-
-    @ApiModelProperty(value = "门店状态字符串")
-    private String storeTypeStr;
-
-    @ApiModelProperty(value = "商家评分")
-    private double score;
-
-    @ApiModelProperty(value = "是否连锁, 0:否, 1:是")
-    private Integer isChain;
-
-    @ApiModelProperty(value = "门店类型(1:中餐, 2:烧烤, 3:饮品, 4:甜点, 5:火锅, 6:宵夜, 7:西餐, 8:轻食, 9:水果)")
-    private List<String> storeTypeList;
-
-    @ApiModelProperty(value = "门店坐标经度")
-    private String storePositionLongitude;
-
-    @ApiModelProperty(value = "门店坐标纬度")
-    private String storePositionLatitude;
-
-    @ApiModelProperty(value = "token")
-    private String token;
-
-    private double distance;
-
-    private String dishName;
-
-    @ApiModelProperty(value = "门店简介")
-    private String storeBlurb;
-
-    @ApiModelProperty(value = "门店过期状态(0:已到期,1:未到期)")
-    private String expiredState;
-
-    @ApiModelProperty(value = "经营板块id(词典表 键为 business_section)")
-    private Integer businessSection;
-
-    @ApiModelProperty(value = "用户账号")
-    private String userAccount;
-
-    @ApiModelProperty(value = "经营种类集合")
-    private List<String> businessTypesList;
-
-    @ApiModelProperty(value = "营业执照图片地址")
-    private List<String> businessLicenseAddress;
-
-    @ApiModelProperty(value = "营业执照图片地址")
-    private List<String> contractImageList;
-
-    @ApiModelProperty(value = "过期天数")
-    private Long daysToExpire;
-
-    @ApiModelProperty(value = "前端查询集合Label")
-    private String Label;
-
-    @ApiModelProperty(value = "前端查询集合Value")
-    private Integer value;
-
-    @ApiModelProperty(value = "营业状态, 见字典表 businessStatus")
-    private Integer businessStatus;
-
-    @ApiModelProperty(value = "平均得分")
-    private String avgScore;
-
-    @ApiModelProperty(value = "人均消费")
-    private String avgPrice;
-
-    @ApiModelProperty(value = "总评论数")
-    private String totalNum;
-
-    @ApiModelProperty(value = "优惠券列表")
-    private List quanList;
-
-    @ApiModelProperty(value = "营业时间")
-    private List<String> openTime;
-
-    @ApiModelProperty(value = "最近地铁站名")
-    private String subwayName;
-
-    @ApiModelProperty(value = "最近地铁站距离")
-    private double distance2;
-
-    @ApiModelProperty(value = "是否收藏")
-    private Integer collection;
-
-    @ApiModelProperty(value = "优惠券列表")
-    private List<LifeCoupon> couponList;
-
-    @ApiModelProperty(value = "优惠券列表")
-    private List<LifeCouponVo> tuangouList;
-
-    @ApiModelProperty(value = "员工列表")
-    private List<StoreStaffConfig> employeeList;
-
-    @ApiModelProperty(value = "该用户是否在该店铺打过卡")
-    private Integer clockInStore;
-
-    @ApiModelProperty(value = "该用户是否在该店铺打过卡")
-    private Integer clockInStoreToday;
-
-    @ApiModelProperty(value = "该用户在该店铺打卡次数")
-    private Integer clockInStoreNum;
-
-    @ApiModelProperty(value = "该用户打卡的所有哦店铺次数")
-    private Integer clockInNum;
-
-    @ApiModelProperty(value = "该用户在该店铺的动态")
-    private List<LifeUserDynamicsVo> dynamicsList;
-
-    @ApiModelProperty(value = "该用户在该店铺的动态总数")
-    private Integer totalDynamicsNum;
-
-}

+ 0 - 61
alien-entity/src/main/java/shop/alien/entity/store/vo/StoreMainInfoVo.java

@@ -1,61 +0,0 @@
-package shop.alien.entity.store.vo;
-
-import com.fasterxml.jackson.annotation.JsonInclude;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import shop.alien.store.entity.StoreBusinessInfo;
-import shop.alien.store.entity.StoreInfo;
-import shop.alien.store.entity.StoreLabel;
-import shop.alien.store.entity.vo.StoreMenuVo;
-
-import java.util.List;
-
-/**
- * 门店主页信息
- *
- * @author ssk
- * @version 1.0
- * @date 2024/12/23 17:17
- */
-@Data
-@JsonInclude
-public class StoreMainInfoVo extends StoreInfo {
-
-    @ApiModelProperty(value = "营业状态")
-    private String businessStatusStr;
-
-    @ApiModelProperty(value = "门店面积")
-    private String storeAreaStr;
-
-    //图片类型, 0:其他, 1:入口图, 2:相册, 3:菜品, 4:环境, 5:价目表, 6:推荐菜, 7:菜单
-
-    @ApiModelProperty(value = "入口图")
-    List<String> inletsUrl;
-
-    @ApiModelProperty(value = "相册")
-    List<String> albumUrl;
-
-    @ApiModelProperty(value = "推荐菜")
-    List<StoreMenuVo> recommendUrl;
-
-    @ApiModelProperty(value = "菜单")
-    List<StoreMenuVo> menuUrl;
-
-    @ApiModelProperty(value = "门店标签")
-    StoreLabel storeLabel;
-
-    @ApiModelProperty(value = "营业时间")
-    List<StoreBusinessInfo> storeBusinessInfo;
-
-    @ApiModelProperty(value = "门店头像")
-    String headImgUrl;
-
-    @ApiModelProperty(value = "门店地址")
-    String storeAddress;
-
-    @ApiModelProperty(value = "注销状态")
-    private Integer logoutFlag;
-
-    @ApiModelProperty(value = "注销状态用户")
-    private Integer logoutFlagUser;
-}

+ 0 - 98
alien-entity/src/main/java/shop/alien/entity/store/vo/StoreMembershipCardOrderVo.java

@@ -1,98 +0,0 @@
-package shop.alien.entity.store.vo;
-
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * <p>
- * 商家会员卡订单表
- * </p>
- *
- * @author ssk
- * @since 2025-03-11
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@ApiModel(value = "StoreMembershipCardOrder对象", description = "商家会员卡订单表")
-public class StoreMembershipCardOrderVo extends Model<StoreMembershipCardOrderVo> {
-
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "主键")
-    private Integer id;
-
-    @ApiModelProperty(value = "商铺id")
-    private String storeId;
-
-    @ApiModelProperty(value = "商铺名称")
-    private String storeName;
-
-    @ApiModelProperty(value = "会员卡id")
-    private String cardId;
-
-    @ApiModelProperty(value = "订单编号")
-    private String orderCode;
-
-    @ApiModelProperty(value = "订单状态(0:未过期,1:已过期)")
-    private Integer orderStatus;
-
-    @ApiModelProperty(value = "订单状态(0:未过期,1:已过期)")
-    private String orderStatusStr;
-
-
-    @ApiModelProperty(value = "会员卡类型")
-    private Integer membershipType;
-
-    @ApiModelProperty(value = "会员卡类型")
-    private String membershipTypeStr;
-
-    @ApiModelProperty(value = "订单类型(0:黄金vip,1:白金vip)")
-    private Integer orderType;
-
-    @ApiModelProperty(value = "购买类型(0:包月,1:包季,2:半年,3:包年)")
-    private Integer purchasePattern;
-
-    @ApiModelProperty(value = "购买类型(0:包月,1:包季,2:半年,3:包年)")
-    private String purchasePatternStr;
-
-    @ApiModelProperty(value = "开通时间")
-    private Date openingTime;
-
-    @ApiModelProperty(value = "到期时间")
-    private Date expirationTime;
-
-    @ApiModelProperty(value = "付款金额")
-    private Double paymentAmount;
-
-    @ApiModelProperty(value = "删除状态")
-    @TableLogic
-    private Integer deleteFlag;
-
-    @ApiModelProperty(value = "创建时间")
-    private Date createdTime;
-
-    @ApiModelProperty(value = "更新时间")
-    private Date updatedTime;
-
-    @ApiModelProperty(value = "创建人ID")
-    private Integer createdUserId;
-
-    @ApiModelProperty(value = "修改人ID")
-    private Integer updatedUserId;
-
-
-    @Override
-    protected Serializable pkVal() {
-        return this.id;
-    }
-
-}

+ 0 - 79
alien-entity/src/main/java/shop/alien/entity/store/vo/StoreMembershipCardVo.java

@@ -1,79 +0,0 @@
-package shop.alien.entity.store.vo;
-
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * <p>
- * 商家会员卡
- * </p>
- *
- * @author ssk
- * @since 2025-03-11
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@ApiModel(value = "StoreMembershipCard对象", description = "商家会员卡")
-public class StoreMembershipCardVo extends Model<StoreMembershipCardVo> {
-
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "主键")
-    private Integer id;
-
-    @ApiModelProperty(value = "商铺id")
-    private Integer storeId;
-
-    @ApiModelProperty(value = "卡片类型(0:黄金vip,1:白金vip)")
-    private Integer cardType;
-
-    @ApiModelProperty(value = "商铺名称")
-    private String storeName;
-
-    @ApiModelProperty(value = "会员卡状态(词典表:membership_card_status)")
-    private String membershipCardStatus;
-
-    @ApiModelProperty(value = "会员类型(词典表:membership_type)")
-    private String membershipType;
-
-    @ApiModelProperty(value = "首次开通时间")
-    private Date firstOpeningTime;
-
-    @ApiModelProperty(value = "开通时间")
-    private Date openingTime;
-
-    @ApiModelProperty(value = "到期时间")
-    private Date expirationTime;
-
-    @ApiModelProperty(value = "删除状态")
-    @TableLogic
-    private Integer deleteFlag;
-
-    @ApiModelProperty(value = "创建时间")
-    private Date createdTime;
-
-    @ApiModelProperty(value = "更新时间")
-    private Date updatedTime;
-
-    @ApiModelProperty(value = "创建人ID")
-    private Integer createdUserId;
-
-    @ApiModelProperty(value = "修改人ID")
-    private Integer updatedUserId;
-
-
-    @Override
-    protected Serializable pkVal() {
-        return this.id;
-    }
-
-}

+ 0 - 29
alien-entity/src/main/java/shop/alien/entity/store/vo/StoreMenuVo.java

@@ -1,29 +0,0 @@
-package shop.alien.entity.store.vo;
-
-import com.fasterxml.jackson.annotation.JsonInclude;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import shop.alien.store.entity.StoreMenu;
-
-/**
- * @author ssk
- * @version 1.0
- * @date 2025/1/8 10:20
- */
-@Data
-@JsonInclude
-public class StoreMenuVo extends StoreMenu {
-
-    @ApiModelProperty(value = "图片排序")
-    private Integer imgSort;
-
-    @ApiModelProperty(value = "图片链接")
-    private String imgUrl;
-
-    @ApiModelProperty(value = "图片描述")
-    private String imgDescription;
-
-    @ApiModelProperty(value = "是否点赞")
-    private Integer isLike;
-
-}

+ 0 - 54
alien-entity/src/main/java/shop/alien/entity/store/vo/StorePersonalCustomizedVo.java

@@ -1,54 +0,0 @@
-package shop.alien.entity.store.vo;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-import shop.alien.store.entity.StorePersonalCustomized;
-
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@ApiModel(value = "StorePersonalCustomizedVo", description = "个性化定制")
-public class StorePersonalCustomizedVo extends StorePersonalCustomized {
-
-    @ApiModelProperty(value = "目的地")
-    private String destination;
-
-    @ApiModelProperty(value = "出行人数")
-    private Integer usePeoples;
-
-    @ApiModelProperty(value = "最低价格")
-    private Integer minPrice;
-
-    @ApiModelProperty(value = "最高价格")
-    private Integer maxPrice;
-
-    @ApiModelProperty(value = "饮食偏好(字典--DietaryPreferences)")
-    private String dietaryPreferences;
-
-    @ApiModelProperty(value = "烹饪方式(字典--CookingMethods)")
-    private String cookingMethods;
-
-    @ApiModelProperty(value = "用户-经度")
-    private double jingdu;
-
-    @ApiModelProperty(value = "用户-纬度")
-    private double weidu;
-
-    @ApiModelProperty(value = "分页-页数")
-    private Integer page;
-
-    @ApiModelProperty(value = "分页-条数")
-    private Integer size;
-
-    @ApiModelProperty(value = "套餐名称")
-    private String couponName;
-
-    @ApiModelProperty(value = "套餐图片")
-    private String couponImage;
-
-    @ApiModelProperty(value = "价格")
-    private String price;
-}

+ 0 - 65
alien-entity/src/main/java/shop/alien/entity/store/vo/StoreSalesDetailsVo.java

@@ -1,65 +0,0 @@
-package shop.alien.entity.store.vo;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.util.Date;
-import java.util.List;
-
-@Data
-@JsonInclude
-@NoArgsConstructor
-@ApiModel(value = "StoreSalesDetailsVo对象", description = "售卖明细")
-public class StoreSalesDetailsVo {
-
-    @ApiModelProperty(value = "分页-页数")
-    private Integer page;
-
-    @ApiModelProperty(value = "分页-条数")
-    private Integer size;
-
-    @ApiModelProperty(value = "券id")
-    private String couponCode;
-
-    @ApiModelProperty(value = "图片路径")
-    private String imagePath;
-
-    @ApiModelProperty(value = "商家id")
-    private Integer storeId;
-
-    @ApiModelProperty(value = "套餐名称")
-    private String couponName;
-
-    @ApiModelProperty(value = "套餐名称(查询用)")
-    private List<String> couponNameList;
-
-    @ApiModelProperty(value = "订单编号")
-    private String orderNo;
-
-    @ApiModelProperty(value = "支付时间")
-    private String payTime;
-
-    @ApiModelProperty(value = "套餐金额")
-    private String price;
-
-    @ApiModelProperty(value = "用户手机号码")
-    private String userPhone;
-
-    @ApiModelProperty(value = "订单状态 0-未核销 1-已核销 2-已过期 3-待退款 4-已退款")
-    private String status;
-
-    @ApiModelProperty(value = "1-代金券  2-套餐")
-    private Integer type;
-
-    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
-    @ApiModelProperty(value = "支付时间-开始时间")
-    private Date payStartTime;
-
-    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
-    @ApiModelProperty(value = "支付时间-结束时间")
-    private Date payEndTime;
-}

+ 0 - 33
alien-entity/src/main/java/shop/alien/entity/store/vo/StoreUserVo.java

@@ -1,33 +0,0 @@
-package shop.alien.entity.store.vo;
-
-import com.fasterxml.jackson.annotation.JsonInclude;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import shop.alien.store.entity.StoreUser;
-
-/**
- * 二期-门店用户扩展
- *
- * @author ssk
- * @since 2024-12-05
- */
-@EqualsAndHashCode(callSuper = true)
-@Data
-@JsonInclude
-@ApiModel(value = "StoreUserVo对象", description = "门店用户扩展")
-public class StoreUserVo extends StoreUser {
-
-    @ApiModelProperty(value = "登录Token")
-    private String token;
-
-    @ApiModelProperty(value = "经营模块ID")
-    private Integer businessSection;
-
-    @ApiModelProperty(value = "经营种类")
-    private String businessTypesName;
-
-    @ApiModelProperty(value = "账号是否启用")
-    private boolean switchStatus;
-}

+ 0 - 42
alien-entity/src/main/java/shop/alien/entity/store/vo/StoreVipLogVo.java

@@ -1,42 +0,0 @@
-package shop.alien.entity.store.vo;
-
-import lombok.Data;
-import shop.alien.store.entity.StoreVipLog;
-
-/**
- * @author ssk
- * @version 1.0
- */
-@Data
-public class StoreVipLogVo extends StoreVipLog {
-
-    /**
-     * 门店名称
-     */
-    private String storeName;
-
-    /**
-     * 订单编号
-     */
-    private String orderNo;
-
-    /**
-     * 订单金额
-     */
-    private String orderMoney;
-
-    /**
-     * vip状态(0:未过期, 1:已过期)
-     */
-    private String vipStatus;
-
-    /**
-     * vip类型, 1:黄金, 2:白金
-     */
-    private String vipTypeStr;
-
-    /**
-     * 购买时长, 1:包月, 2:包季, 3:包年
-     */
-    private String buyDurationStr;
-}

+ 0 - 23
alien-entity/src/main/java/shop/alien/entity/store/vo/SystemLoginVo.java

@@ -1,23 +0,0 @@
-package shop.alien.entity.store.vo;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@ApiModel(value="SystemLogin对象", description="web登录信息")
-public class SystemLoginVo {
-
-    @ApiModelProperty(value = "token")
-    public String token;
-
-    @ApiModelProperty(value = "结果")
-    public boolean result;
-
-    @ApiModelProperty(value = "提示信息")
-    public String message;
-}

+ 0 - 34
alien-entity/src/main/java/shop/alien/entity/store/vo/WebAuditVo.java

@@ -1,34 +0,0 @@
-package shop.alien.entity.store.vo;
-
-import lombok.Data;
-import shop.alien.store.entity.WebAudit;
-
-/**
- * @Author: fcw
- * @CreateTime: 2025-04-03
- * @Description: 审核
- */
-
-@Data
-public class WebAuditVo extends WebAudit {
-
-    private String id;
-
-    private String storeInfoId;
-
-    private String lifeUserOrderId;
-
-    private String storeCommentAppealId;
-
-    private String lifeGroupPackageId;
-
-    private String lifeActivityId;
-
-    private String content;
-
-    private String type;
-
-    private String status;
-
-    private String typeSum;
-}

+ 0 - 22
alien-entity/src/main/java/shop/alien/entity/store/vo/WebsocketVo.java

@@ -1,22 +0,0 @@
-package shop.alien.entity.store.vo;
-
-import com.fasterxml.jackson.annotation.JsonInclude;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@Data
-@JsonInclude
-public class WebsocketVo {
-
-    @ApiModelProperty(value = "发送者id")
-    private String senderId;
-
-    @ApiModelProperty(value = "接收者id")
-    private String receiverId;
-
-    @ApiModelProperty(value = "消息类型  1-文本  2-图片  3-链接")
-    private String type;
-
-    @ApiModelProperty(value = "消息内容")
-    private String text;
-}

+ 1 - 1
alien-store/src/main/java/shop/alien/store/controller/AliController.java

@@ -9,7 +9,7 @@ import org.springframework.web.bind.annotation.CrossOrigin;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-import shop.alien.store.entity.result.R;
+import shop.alien.entity.result.R;
 import shop.alien.store.service.AliService;
 import shop.alien.store.util.AlipayTradeAppPay;
 import shop.alien.store.util.AlipayTradeRefund;

+ 2 - 2
alien-store/src/main/java/shop/alien/store/controller/EssentialModuleInformationController.java

@@ -5,8 +5,8 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.*;
-import shop.alien.store.entity.EssentialModuleInformation;
-import shop.alien.store.entity.result.R;
+import shop.alien.entity.result.R;
+import shop.alien.entity.store.EssentialModuleInformation;
 import shop.alien.store.entity.vo.EssentialModuleInformationVo;
 import shop.alien.store.service.EssentialModuleInformationService;
 

+ 1 - 1
alien-store/src/main/java/shop/alien/store/controller/GaoDeController.java

@@ -7,8 +7,8 @@ import io.swagger.annotations.*;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
+import shop.alien.entity.result.R;
 import shop.alien.store.config.GaoDeMapUtil;
-import shop.alien.store.entity.result.R;
 
 import java.util.HashMap;
 import java.util.Map;

+ 2 - 2
alien-store/src/main/java/shop/alien/store/controller/LifeActivityController.java

@@ -6,8 +6,8 @@ import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
-import shop.alien.store.entity.LifeActivity;
-import shop.alien.store.entity.result.R;
+import shop.alien.entity.result.R;
+import shop.alien.entity.store.LifeActivity;
 import shop.alien.store.entity.vo.LifeActivityVo;
 import shop.alien.store.service.LifeActivityService;
 import shop.alien.store.util.FileUpload;

+ 2 - 2
alien-store/src/main/java/shop/alien/store/controller/LifeAppealManageController.java

@@ -10,9 +10,9 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
-import shop.alien.store.entity.LifeAppealManage;
+import shop.alien.entity.result.R;
+import shop.alien.entity.store.LifeAppealManage;
 import shop.alien.store.entity.dto.LifeAppealManageDto;
-import shop.alien.store.entity.result.R;
 import shop.alien.store.entity.vo.LifeAppealManageVo;
 import shop.alien.store.service.LifeAppealManageService;
 import shop.alien.store.util.FileUpload;

+ 2 - 2
alien-store/src/main/java/shop/alien/store/controller/LifeBlacklistController.java

@@ -7,8 +7,8 @@ import io.swagger.annotations.ApiOperationSupport;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
-import shop.alien.store.entity.LifeBlacklist;
-import shop.alien.store.entity.result.R;
+import shop.alien.entity.result.R;
+import shop.alien.entity.store.LifeBlacklist;
 import shop.alien.store.entity.vo.LifeBlacklistVo;
 import shop.alien.store.service.LifeBlacklistService;
 

+ 2 - 2
alien-store/src/main/java/shop/alien/store/controller/LifeBrandedCardController.java

@@ -6,8 +6,8 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
-import shop.alien.store.entity.LifeBrandedCard;
-import shop.alien.store.entity.LifeCoupon;
+import shop.alien.entity.store.LifeBrandedCard;
+import shop.alien.entity.store.LifeCoupon;
 import shop.alien.store.entity.vo.StoreInfoVo;
 import shop.alien.store.service.LifeBrandedCardService;
 import shop.alien.store.util.FileUpload;

+ 2 - 2
alien-store/src/main/java/shop/alien/store/controller/LifeBrowseRecordController.java

@@ -5,8 +5,8 @@ import io.swagger.annotations.*;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
-import shop.alien.store.entity.LifeBrowseRecord;
-import shop.alien.store.entity.result.R;
+import shop.alien.entity.result.R;
+import shop.alien.entity.store.LifeBrowseRecord;
 import shop.alien.store.service.LifeBrowseRecordService;
 import shop.alien.store.util.ListToPage;
 

+ 2 - 2
alien-store/src/main/java/shop/alien/store/controller/LifeClassManageController.java

@@ -12,8 +12,8 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
-import shop.alien.store.entity.LifeClassManage;
-import shop.alien.store.entity.result.R;
+import shop.alien.entity.result.R;
+import shop.alien.entity.store.LifeClassManage;
 import shop.alien.store.mapper.LifeClassManageMapper;
 import shop.alien.store.service.LifeClassManageService;
 import shop.alien.store.util.ExcelExporter;

+ 2 - 2
alien-store/src/main/java/shop/alien/store/controller/LifeCollectController.java

@@ -8,9 +8,9 @@ import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.*;
+import shop.alien.entity.result.R;
+import shop.alien.entity.store.LifeCollect;
 import shop.alien.store.config.GaoDeMapUtil;
-import shop.alien.store.entity.LifeCollect;
-import shop.alien.store.entity.result.R;
 import shop.alien.store.entity.vo.StoreInfoVo;
 import shop.alien.store.mapper.LifeCollectMapper;
 import shop.alien.store.mapper.StoreInfoMapper;

+ 2 - 2
alien-store/src/main/java/shop/alien/store/controller/LifeCommentController.java

@@ -7,8 +7,8 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
-import shop.alien.store.entity.LifeComment;
-import shop.alien.store.entity.result.R;
+import shop.alien.entity.result.R;
+import shop.alien.entity.store.LifeComment;
 import shop.alien.store.entity.vo.LifePinglunVo;
 import shop.alien.store.service.LifeCommentService;
 import shop.alien.store.util.FileUpload;

+ 2 - 2
alien-store/src/main/java/shop/alien/store/controller/LifeCouponController.java

@@ -8,8 +8,8 @@ import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
-import shop.alien.store.entity.LifeCoupon;
-import shop.alien.store.entity.result.R;
+import shop.alien.entity.result.R;
+import shop.alien.entity.store.LifeCoupon;
 import shop.alien.store.service.LifeCouponService;
 
 import java.util.Map;

+ 2 - 2
alien-store/src/main/java/shop/alien/store/controller/LifeDictController.java

@@ -4,8 +4,8 @@ import io.swagger.annotations.*;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
-import shop.alien.store.entity.LifeDict;
-import shop.alien.store.entity.result.R;
+import shop.alien.entity.result.R;
+import shop.alien.entity.store.LifeDict;
 import shop.alien.store.entity.vo.StoreDictionaryVo;
 import shop.alien.store.service.LifeDictService;
 

+ 2 - 2
alien-store/src/main/java/shop/alien/store/controller/LifeDiscountCouponController.java

@@ -5,10 +5,10 @@ import io.swagger.annotations.*;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
-import shop.alien.store.entity.UserLoginInfo;
+import shop.alien.entity.result.R;
+import shop.alien.entity.store.UserLoginInfo;
 import shop.alien.store.entity.dto.LifeDiscountCouponDto;
 import shop.alien.store.entity.dto.LifeDiscountCouponUserDto;
-import shop.alien.store.entity.result.R;
 import shop.alien.store.entity.vo.LifeDiscountCouponVo;
 import shop.alien.store.service.LifeDiscountCouponService;
 import shop.alien.store.service.LifeDiscountCouponUserService;

+ 2 - 2
alien-store/src/main/java/shop/alien/store/controller/LifeDiscountCouponStoreFriendController.java

@@ -7,9 +7,9 @@ import io.swagger.annotations.ApiOperationSupport;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
-import shop.alien.store.entity.UserLoginInfo;
+import shop.alien.entity.result.R;
+import shop.alien.entity.store.UserLoginInfo;
 import shop.alien.store.entity.dto.LifeDiscountCouponStoreFriendDto;
-import shop.alien.store.entity.result.R;
 import shop.alien.store.entity.vo.LifeDiscountCouponStoreFriendVo;
 import shop.alien.store.service.LifeDiscountCouponStoreFriendService;
 import shop.alien.store.util.TokenInfo;

+ 1 - 1
alien-store/src/main/java/shop/alien/store/controller/LifeFansController.java

@@ -7,7 +7,7 @@ import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
-import shop.alien.store.entity.result.R;
+import shop.alien.entity.result.R;
 import shop.alien.store.service.LifeFansService;
 
 import java.util.List;

+ 3 - 3
alien-store/src/main/java/shop/alien/store/controller/LifeGroupPackageController.java

@@ -10,9 +10,9 @@ import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
-import shop.alien.store.entity.LifeCoupon;
-import shop.alien.store.entity.StoreGroupInfo;
-import shop.alien.store.entity.result.R;
+import shop.alien.entity.result.R;
+import shop.alien.entity.store.LifeCoupon;
+import shop.alien.entity.store.StoreGroupInfo;
 import shop.alien.store.entity.vo.LifeCouponVo;
 import shop.alien.store.entity.vo.LifeTuanGouParamVo;
 import shop.alien.store.mapper.LifeCouponMapper;

+ 1 - 1
alien-store/src/main/java/shop/alien/store/controller/LifeLogController.java

@@ -7,7 +7,7 @@ import io.swagger.annotations.Api;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
-import shop.alien.store.entity.LifeLog;
+import shop.alien.entity.store.LifeLog;
 import shop.alien.store.mapper.LifeLogMapper;
 
 import java.util.Date;

+ 2 - 2
alien-store/src/main/java/shop/alien/store/controller/LifeMessageController.java

@@ -8,8 +8,8 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.messaging.handler.annotation.MessageMapping;
 import org.springframework.messaging.handler.annotation.SendTo;
 import org.springframework.web.bind.annotation.*;
-import shop.alien.store.entity.LifeMessage;
-import shop.alien.store.entity.result.R;
+import shop.alien.entity.result.R;
+import shop.alien.entity.store.LifeMessage;
 import shop.alien.store.entity.vo.LifeMessageVo;
 import shop.alien.store.mapper.LifeMessageMapper;
 import shop.alien.store.service.LifeMessageService;

+ 2 - 2
alien-store/src/main/java/shop/alien/store/controller/LifeNoticeController.java

@@ -6,8 +6,8 @@ import io.swagger.annotations.*;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
-import shop.alien.store.entity.LifeNotice;
-import shop.alien.store.entity.result.R;
+import shop.alien.entity.result.R;
+import shop.alien.entity.store.LifeNotice;
 import shop.alien.store.entity.vo.LifeNoticeVo;
 import shop.alien.store.mapper.LifeNoticeMapper;
 import shop.alien.store.service.LifeNoticeService;

+ 2 - 2
alien-store/src/main/java/shop/alien/store/controller/LifePromotionPackageController.java

@@ -5,8 +5,8 @@ import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.map.HashedMap;
 import org.springframework.web.bind.annotation.*;
-import shop.alien.store.entity.LifePromotionPackage;
-import shop.alien.store.entity.result.R;
+import shop.alien.entity.result.R;
+import shop.alien.entity.store.LifePromotionPackage;
 import shop.alien.store.entity.vo.LifePromotionPackageVo;
 import shop.alien.store.service.PromotionPackageService;
 import shop.alien.store.util.AlipayTradeAppPay;

+ 3 - 3
alien-store/src/main/java/shop/alien/store/controller/LifeReverseGroupBuyingController.java

@@ -5,9 +5,9 @@ import io.swagger.annotations.*;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
-import shop.alien.store.entity.LifeReverseGroupBidding;
-import shop.alien.store.entity.LifeReverseGroupBuying;
-import shop.alien.store.entity.result.R;
+import shop.alien.entity.result.R;
+import shop.alien.entity.store.LifeReverseGroupBidding;
+import shop.alien.entity.store.LifeReverseGroupBuying;
 import shop.alien.store.entity.vo.LifeReverseGroupBuyingStoreVo;
 import shop.alien.store.entity.vo.LifeReverseGroupBuyingUserVo;
 import shop.alien.store.service.LifeReverseGroupBuyingService;

+ 2 - 2
alien-store/src/main/java/shop/alien/store/controller/LifeStoreController.java

@@ -9,8 +9,8 @@ import org.springframework.util.ObjectUtils;
 import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
-import shop.alien.store.entity.LifeUser;
-import shop.alien.store.entity.result.R;
+import shop.alien.entity.result.R;
+import shop.alien.entity.store.LifeUser;
 import shop.alien.store.entity.vo.LifeFansVo;
 import shop.alien.store.entity.vo.LifeStoreVo;
 import shop.alien.store.entity.vo.LifeUserVo;

Some files were not shown because too many files changed in this diff