second init

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.entity.store.LifeCoupon;
-import shop.alien.entity.store.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;
-}

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;
-}

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.entity.store.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;
-}

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.entity.store.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;
-
-}

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;
-}

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;
-}

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.entity.store.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;
-
-}

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.entity.store.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;
-}

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;
-    }
-
-}

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.entity.store.LifeUser;
-import shop.alien.entity.store.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;
-
-}

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;
-
-
-}

alien-entity/src/main/java/shop/alien/entity/store/vo/StoreInfoExcelVo.java

@@ -1,75 +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 shop.alien.entity.util.ExcelHeader;
-import shop.alien.entity.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;
-
-
-
-}

alien-entity/src/main/java/shop/alien/entity/store/vo/StoreInfoExpiredRecordsExcelVo.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 shop.alien.entity.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;
-
-
-}

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

@@ -1,164 +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.entity.store.LifeCoupon;
-import shop.alien.entity.store.StoreInfo;
-import shop.alien.entity.store.StoreStaffConfig;
-
-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;
-
-}

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

@@ -1,60 +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.entity.store.StoreBusinessInfo;
-import shop.alien.entity.store.StoreInfo;
-import shop.alien.entity.store.StoreLabel;
-
-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;
-}

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.entity.store.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;
-
-}

alien-entity/src/main/java/shop/alien/entity/store/vo/StoreUserExcelVo.java

@@ -1,37 +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 shop.alien.entity.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;
-}

alien-entity/src/main/java/shop/alien/entity/system/entity/SystemUser.java

@@ -1,74 +0,0 @@
-package shop.alien.entity.system.entity;
-
-import com.baomidou.mybatisplus.annotation.*;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.util.Date;
-
-/**
- * 系统用户
- *
- * @author ssk
- * @since 2022-07-12
- */
-@Data
-@TableName("system_user")
-@ApiModel(value = "SystemUser对象", description = "系统用户")
-public class SystemUser extends Model<SystemUser> {
-
-    @ApiModelProperty(value = "主键")
-    @TableId(value = "id", type = IdType.AUTO)
-    private Integer id;
-
-    @ApiModelProperty(value = "昵称")
-    @TableField("nickname")
-    private String nickname;
-
-    @ApiModelProperty(value = "账号")
-    @TableField("account")
-    private String account;
-
-    @ApiModelProperty(value = "密码")
-    @TableField("password")
-    private String password;
-
-    @ApiModelProperty(value = "手机")
-    @TableField("phone")
-    private String phone;
-
-    @ApiModelProperty(value = "邮箱")
-    @TableField("email")
-    private String email;
-
-    @ApiModelProperty(value = "角色(0 普通用户 1 管理员)")
-    @TableField("role")
-    private Integer role;
-
-    @ApiModelProperty(value = "删除标记, 0:未删除, 1:已删除")
-    @TableField("delete_flag")
-    @TableLogic
-    private Integer deleteFlag;
-
-    @ApiModelProperty(value = "创建时间")
-    @TableField(value = "created_time", fill = FieldFill.INSERT)
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date createdTime;
-
-    @ApiModelProperty(value = "创建人ID")
-    @TableField("created_user_id")
-    private Integer createdUserId;
-
-    @ApiModelProperty(value = "修改时间")
-    @TableField(value = "updated_time", fill = FieldFill.UPDATE)
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date updatedTime;
-
-    @ApiModelProperty(value = "修改人ID")
-    @TableField("updated_user_id")
-    private Integer updatedUserId;
-
-}

alien-entity/src/main/java/shop/alien/entity/system/entity/User.java

@@ -1,90 +0,0 @@
-package shop.alien.entity.system.entity;
-
-import com.baomidou.mybatisplus.annotation.*;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * 用户类
- */
-@Data
-@TableName(value = "TB_USER")
-public class User implements Serializable {
-
-    private static final long serialVersionUID = -3899134870592382664L;
-
-    /**
-     * 主键ID
-     */
-    @TableId(value = "USER_ID", type = IdType.AUTO)
-    private Long userId;
-
-    /**
-     * 登陆账号
-     */
-    @TableField("USER_NAME")
-    private String userName;
-
-    /**
-     * 密码(md5值)
-     */
-    @TableField("USER_PASS")
-    private String userPass;
-
-    /**
-     * 公司主键ID
-     */
-    @TableField("COMPANY_ID")
-    private Long companyId;
-
-    /**
-     * 删除标识
-     */
-    @TableField("DELETE_FLAG")
-    @TableLogic(value = "0", delval = "1")
-    private String deleteFlag;
-
-    /**
-     * 用户类型
-     */
-    @TableField("ROLE_TYPE")
-    private String roleType;
-
-    /**
-     * 邮箱
-     */
-    @TableField("EMAIL")
-    private String email;
-
-    /**
-     * 手机号
-     */
-    @TableField("PHONE_NUMBER")
-    private String phoneNumber;
-
-    /**
-     * 创建人ID
-     */
-    @TableField("CREATED_USER_ID")
-    private Long createdUserId;
-
-    /**
-     * 创建时间
-     */
-    @TableField("CREATED_TIME")
-    private Date createdTIme;
-
-    /**
-     * 修改人ID
-     */
-    @TableField("UPDATED_USER_ID")
-    private Long updatedUserId;
-
-    /**
-     * 修改时间
-     */
-    @TableField("UPDATED_TIME")
-    private Date updatedTIme;
-}

alien-entity/src/main/java/shop/alien/entity/system/mapper/SystemUserMapper.java

@@ -1,16 +0,0 @@
-package shop.alien.entity.system.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Mapper;
-import shop.alien.entity.system.entity.SystemUser;
-
-/**
- * 系统用户
- *
- * @author ssk
- * @since 2022-07-12
- */
-@Mapper
-public interface SystemUserMapper extends BaseMapper<SystemUser> {
-
-}

alien-entity/src/main/java/shop/alien/entity/system/mapper/UserMapper.java

@@ -1,12 +0,0 @@
-package shop.alien.entity.system.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Mapper;
-import shop.alien.entity.system.entity.User;
-
-/**
- * 用户Mapper
- */
-@Mapper
-public interface UserMapper extends BaseMapper<User> {
-}

alien-entity/src/main/java/shop/alien/entity/util/ExcelExporter.java

@@ -1,95 +0,0 @@
-package shop.alien.entity.util;
-
-import org.apache.poi.ss.usermodel.Row;
-import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.ss.usermodel.Workbook;
-import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-import org.springframework.util.StringUtils;
-import shop.alien.entity.store.LifeClassManage;
-import shop.alien.entity.store.vo.StoreCommentAppealVo;
-import shop.alien.entity.store.vo.StoreDynamicDiscountVo;
-import shop.alien.entity.store.vo.StoreInfoVo;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.text.SimpleDateFormat;
-import java.util.List;
-
-public class ExcelExporter {
-
-    public static <T> byte[] exportToExcel(List<T> data, String[] headers, String sheetName) throws IOException {
-        Workbook workbook = new XSSFWorkbook();
-        Sheet sheet = workbook.createSheet(sheetName);
-
-        Row headerRow = sheet.createRow(0);
-        for (int i = 0; i < headers.length; i++) {
-            headerRow.createCell(i).setCellValue(headers[i]);
-        }
-        SimpleDateFormat simpleFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-
-        int rowNum = 1;
-        for (T item : data) {
-            Row row = sheet.createRow(rowNum++);
-            if (item instanceof StoreInfoVo) {
-                StoreInfoVo storeInfoVo = (StoreInfoVo) item;
-                row.createCell(0).setCellValue(storeInfoVo.getStoreName());
-                row.createCell(1).setCellValue(storeInfoVo.getStoreContact());
-                row.createCell(2).setCellValue(storeInfoVo.getStorePhone());
-                row.createCell(3).setCellValue(storeInfoVo.getStoreTypeStr());
-                if (!StringUtils.isEmpty(storeInfoVo.getCreatedTime())) {
-                    String date = simpleFormat.format(storeInfoVo.getCreatedTime());
-                    row.createCell(4).setCellValue(date);
-                }
-//                row.createCell(6).setCellValue(storeInfoVo.getStoreState());
-            } else if (item instanceof StoreCommentAppealVo) {
-                StoreCommentAppealVo user = (StoreCommentAppealVo) item;
-                row.createCell(0).setCellValue(user.getStoreName());
-                row.createCell(1).setCellValue(user.getStoreContact());
-                row.createCell(2).setCellValue(user.getStorePhone());
-                row.createCell(3).setCellValue(user.getStoreTypeStr());
-                if (!StringUtils.isEmpty(user.getCreatedTime())) {
-                    String date = simpleFormat.format(user.getCreatedTime());
-                    row.createCell(4).setCellValue(date);
-                }
-                row.createCell(5).setCellValue(user.getCommentContent());
-                row.createCell(6).setCellValue(user.getAppealReason());
-                row.createCell(7).setCellValue(user.getAppealStatusStr());
-            } else if (item instanceof LifeClassManage) {
-                LifeClassManage manage = (LifeClassManage) item;
-                row.createCell(0).setCellValue(manage.getClassName());
-                row.createCell(1).setCellValue(manage.getClassLength());
-                row.createCell(2).setCellValue(manage.getClassTeacher());
-                row.createCell(3).setCellValue(manage.getPlayCount());
-                row.createCell(4).setCellValue(manage.getClassBigType());
-                if (!StringUtils.isEmpty(manage.getCreatedTime())) {
-                    String date = simpleFormat.format(manage.getCreatedTime());
-                    row.createCell(5).setCellValue(date);
-                }
-                if (!StringUtils.isEmpty(manage.getClassState())) {
-                    row.createCell(6).setCellValue(manage.getClassState().equals("1") ? "正常" : "隐藏");
-                }
-            } else if (item instanceof StoreDynamicDiscountVo) {
-                StoreDynamicDiscountVo dynamicDiscountVo = (StoreDynamicDiscountVo) item;
-                row.createCell(0).setCellValue(dynamicDiscountVo.getActivityNo());
-                row.createCell(1).setCellValue(dynamicDiscountVo.getActivityName());
-                row.createCell(2).setCellValue(dynamicDiscountVo.getCreatedTime());
-                row.createCell(3).setCellValue(dynamicDiscountVo.getActivityStartTime() + " - " + dynamicDiscountVo.getActivityEndTime());
-                switch (dynamicDiscountVo.getStatus()) {
-                    case 0:
-                        row.createCell(4).setCellValue("待审核");
-                        break;
-                    case 1:
-                        row.createCell(4).setCellValue("已通过");
-                        break;
-                    case 2:
-                        row.createCell(4).setCellValue("已拒绝");
-                        break;
-                }
-            }
-        }
-        ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
-        workbook.write(outputStream);
-        workbook.close();
-        return outputStream.toByteArray();
-    }
-}

alien-entity/src/main/java/shop/alien/entity/util/ExcelGenerator.java

@@ -1,126 +0,0 @@
-package shop.alien.entity.util;
-
-import org.apache.poi.ss.usermodel.*;
-import org.apache.poi.xssf.usermodel.XSSFClientAnchor;
-import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-
-import java.io.ByteArrayOutputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.lang.reflect.Field;
-import java.net.URL;
-import java.util.List;
-
-public class ExcelGenerator {
-
-    public static <T> void generateExcel(String filePath, List<T> dataList, Class<T> clazz) throws IOException {
-        // 创建一个新的工作簿
-        XSSFWorkbook workbook = new XSSFWorkbook();
-        // 创建一个工作表
-        Sheet sheet = workbook.createSheet("Sheet1");
-
-        // 获取类的所有字段
-        Field[] fields = clazz.getDeclaredFields();
-
-        // 创建加粗字体
-        Font headerFont = workbook.createFont();
-        headerFont.setBold(true);
-
-        // 创建表头样式并应用字体
-        CellStyle headerCellStyle = workbook.createCellStyle();
-        headerCellStyle.setFont(headerFont);
-
-        // 创建表头
-        Row headerRow = sheet.createRow(0);
-        for (int i = 0; i < fields.length; i++) {
-            Field field = fields[i];
-            ExcelHeader excelHeader = field.getAnnotation(ExcelHeader.class);
-            String headerName;
-            if (excelHeader != null) {
-                headerName = excelHeader.value();
-            } else {
-                headerName = field.getName();
-            }
-            Cell cell = headerRow.createCell(i);
-            cell.setCellValue(headerName);
-//            Cell cell = headerRow.createCell(i);
-//            cell.setCellValue(fields[i].getName());
-            cell.setCellStyle(headerCellStyle);
-        }
-
-        // 添加数据
-        for (int i = 0; i < dataList.size(); i++) {
-            Row row = sheet.createRow(i + 1);
-
-            T obj = dataList.get(i);
-            for (int j = 0; j < fields.length; j++) {
-                Field field = fields[j];
-                field.setAccessible(true);
-                if (field.isAnnotationPresent(ExcelImage.class)) {
-                    row.setHeightInPoints(80); // 数据行行高
-                    try {
-                        String imageUrl = (String) field.get(obj);
-                        if (imageUrl != null && !imageUrl.isEmpty()) {
-                            try (InputStream is = new URL(imageUrl).openStream();
-                                 ByteArrayOutputStream baos = new ByteArrayOutputStream()) {
-                                byte[] buffer = new byte[1024];
-                                int length;
-                                while ((length = is.read(buffer)) != -1) {
-                                    baos.write(buffer, 0, length);
-                                }
-                                byte[] imageBytes = baos.toByteArray();
-                                int pictureIndex = workbook.addPicture(imageBytes, Workbook.PICTURE_TYPE_JPEG);
-                                // 去掉泛型参数 <Sheet>
-                                Drawing patriarch = sheet.createDrawingPatriarch();
-                                ClientAnchor anchor = new XSSFClientAnchor(0, 0, 0, 0, (short) j, i + 1, (short) (j + 1), i + 2);
-                                patriarch.createPicture(anchor, pictureIndex);
-                            } catch (Exception e) {
-                                e.printStackTrace();
-                                Cell cell = row.createCell(j);
-                                cell.setCellValue("图片加载失败");
-                            }
-                        } else {
-                            Cell cell = row.createCell(j);
-                            cell.setCellValue("");
-                        }
-                    } catch (Exception e) {
-                        e.printStackTrace();
-                        Cell cell = row.createCell(j);
-                        cell.setCellValue("图片加载失败");
-                    }
-                } else {
-                    // 常规字段处理（保持原有）...
-                    try {
-                        Object value = field.get(obj);
-                        Cell cell = row.createCell(j);
-                        if (value != null) {
-                            cell.setCellValue(value.toString());
-                        }
-                    } catch (IllegalAccessException e) {
-                        e.printStackTrace();
-                    }
-                }
-
-            }
-        }
-
-        // 自动调整列宽
-        for (int i = 0; i < fields.length; i++) {
-//            sheet.autoSizeColumn(i);
-            sheet.setColumnWidth(i, Math.max(sheet.getColumnWidth(i), 15 * 256));
-            // 处理图片列等特殊情况，确保列宽足够
-            if (fields[i].isAnnotationPresent(ExcelImage.class)) {
-                sheet.setColumnWidth(i, Math.max(sheet.getColumnWidth(i), 12 * 256)); // 图片列适当加宽
-            }
-        }
-
-        // 将工作簿写入文件
-        try (FileOutputStream fileOut = new FileOutputStream(filePath)) {
-            workbook.write(fileOut);
-        }
-
-        // 关闭工作簿
-        workbook.close();
-    }
-}    

alien-entity/src/main/java/shop/alien/entity/util/ExcelHeader.java

@@ -1,12 +0,0 @@
-package shop.alien.entity.util;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.FIELD)
-public @interface ExcelHeader {
-    String value();
-}

alien-entity/src/main/java/shop/alien/entity/util/ExcelImage.java

@@ -1,11 +0,0 @@
-package shop.alien.entity.util;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.FIELD)
-public @interface ExcelImage {
-}

alien-gateway/src/main/java/shop/alien/gateway/config/JWTFilterConfig.java

@@ -1,87 +0,0 @@
-//package shop.alien.gateway.config;
-//
-//import org.springframework.beans.factory.annotation.Autowired;
-//import org.springframework.context.annotation.Configuration;
-//import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
-//import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
-//
-///**
-// * Token 拦截器配置
-// *
-// * @author ssk
-// * @version 1.0
-// * @date 2024/12/25 16:59
-// */
-//@Configuration
-//public class JWTFilterConfig implements WebMvcConfigurer {
-//
-//    @Autowired
-//    private JWTInterceptor jwtInterceptor;
-//
-//    @Override
-//    public void addInterceptors(InterceptorRegistry registry) {
-//        registry.addInterceptor(jwtInterceptor)
-//                .addPathPatterns("/**")
-//                //login
-//                .excludePathPatterns("/user/userLogin")
-//                //门店用户登录
-//                .excludePathPatterns("/store/user/login")
-//                // 门店用户登录校验
-//                .excludePathPatterns("/store/user/checkLogin")
-//                // 门店用户注册
-//                .excludePathPatterns("/store/user/register")
-//                // 门店用户注册校验
-//                .excludePathPatterns("/store/user/checkRegister")
-//                //文件上传
-//                .excludePathPatterns("/file/upload")
-//                //阿里回调
-//                .excludePathPatterns("/ali/notify")
-//                //发送短信
-//                .excludePathPatterns("/ali/sendSms")
-//                //修改密码
-//                .excludePathPatterns("/store/user/updatePassword")
-//                //根据手机号获取用户
-//                .excludePathPatterns("/store/user/getUserByPhone")
-//                //社区列表
-//                .excludePathPatterns("/userDynamics/getUserDynamics")
-//                //活动列表
-//                .excludePathPatterns("/activity/getActivityList")
-//                //联名卡列表
-//                .excludePathPatterns("/userbrandedcard/getBrandedCardList")
-//                //查询字典
-//                .excludePathPatterns("/dicts/getLifeDictByTypeName")
-//                //首页轮播图
-//                .excludePathPatterns("/userCarouselImage/getUserCarouselImage")
-//                //查询商铺列表
-//                .excludePathPatterns("/userstore/getStoreList")
-//                //websocket
-//                .excludePathPatterns("/socket/**")
-//                .excludePathPatterns("/websocket/**")
-//                //druid
-//                .excludePathPatterns("/druid/**")
-//                //swagger
-//                .excludePathPatterns("/webjars/**")
-//                .excludePathPatterns("/swagger-resources/**")
-//                .excludePathPatterns("/v2/**")
-//                .excludePathPatterns("/jrebel/statistics")
-//                .excludePathPatterns("/error")
-//                .excludePathPatterns("/doc.html")
-//                //web数据中台登录接口
-//                .excludePathPatterns("/sys/login")
-//                .excludePathPatterns("/img/getCarouselImage")
-//                //八大类相关接口
-//                .excludePathPatterns("/essential-module-information/getChildByParentId")
-//                .excludePathPatterns("/essential-module-information/getEssentialModuleInformationList")
-//                .excludePathPatterns("/essential-module-information/getList")
-//                .excludePathPatterns("/essential-module-information/getPrimaryData")
-//                .excludePathPatterns("/version/getLatestVersion")
-//                .excludePathPatterns("/elasticSearch/*")
-////                .excludePathPatterns("/**");
-//                .excludePathPatterns("/user-violation/level")
-//                .excludePathPatterns("/store/user/updatePassword")
-//                .excludePathPatterns("/testInfo/getTestInfo")
-//                .excludePathPatterns("/file/uploadApp")
-//        ;
-//    }
-//
-//}

alien-gateway/src/main/java/shop/alien/gateway/config/JWTInterceptor.java

@@ -1,120 +0,0 @@
-//package shop.alien.gateway.config;
-//
-//import com.auth0.jwt.exceptions.AlgorithmMismatchException;
-//import com.auth0.jwt.exceptions.SignatureVerificationException;
-//import com.auth0.jwt.exceptions.TokenExpiredException;
-//import com.auth0.jwt.interfaces.DecodedJWT;
-//import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-//import com.baomidou.mybatisplus.core.toolkit.StringUtils;
-//import com.fasterxml.jackson.databind.ObjectMapper;
-//import lombok.extern.slf4j.Slf4j;
-//import org.springframework.beans.factory.annotation.Autowired;
-//import org.springframework.stereotype.Component;
-//import org.springframework.web.cors.CorsUtils;
-//import org.springframework.web.servlet.HandlerInterceptor;
-//import shop.alien.entity.store.StoreUser;
-//import shop.alien.gateway.mapper.StoreUserMapper;
-//
-//import javax.servlet.http.HttpServletRequest;
-//import javax.servlet.http.HttpServletResponse;
-//import java.util.HashMap;
-//import java.util.Map;
-//
-///**
-// * Token校验
-// *
-// * @author ssk
-// * @version 1.0
-// * @date 2024/12/25 16:59
-// */
-//@Slf4j
-//@Component
-//public class JWTInterceptor implements HandlerInterceptor {
-//
-//    @Autowired
-//    private BaseRedisService baseRedisService;
-//
-//    @Autowired
-//    private StoreUserMapper storeUserMapper;
-//
-//    @Override
-//    public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler)
-//            throws Exception {
-//        if (CorsUtils.isPreFlightRequest(request)) {
-//            // 这是一个OPTIONS请求，我们可以选择放行
-//            return true;
-//        }
-//        //获取请求头中的token
-//        String token = request.getHeader("Authorization");
-//        log.info("====================>token值: " + token);
-//        String path = request.getRequestURI();
-//        log.info("====================>path: " + path);
-//        Map<String, Object> map = new HashMap<>();
-//        int errorType = 0;
-//        try {
-//            JWTUtils.TokenVerify(token);
-//            DecodedJWT tokenInfo = JWTUtils.getTokenInfo(token);
-//            log.info("phone：{}", tokenInfo.getClaim("phone").asString());
-//            String phone = tokenInfo.getClaim("phone").asString();
-//            log.info("userType：{}", tokenInfo.getClaim("userType").asString());
-//            String deviceType = tokenInfo.getClaim("userType").asString();
-//            String redisKey;
-//            //区分
-//            if ("web".equals(deviceType)) {
-//                //管理端单设备登录
-////                redisKey = deviceType + "_" + tokenInfo.getClaim("userName").asString();
-//                //不限制
-//                return true;
-//            } else {
-//                redisKey = deviceType + "_" + tokenInfo.getClaim("phone").asString();
-//            }
-//            String redisVal = baseRedisService.getString(redisKey);
-//            if (StringUtils.isEmpty(redisVal) || !token.equals(redisVal)) {
-//                //判断程序是否为用户禁用
-//                StoreUser storeUser = storeUserMapper.selectOne(new LambdaQueryWrapper<StoreUser>().eq(StoreUser::getPhone, phone));
-//                if (storeUser.getStatus() == 1) {
-//                    map.put("msg", "你的账号已被禁用");
-//                    //别问, 问就是约定俗成
-//                    map.put("code", 777);
-//                } else {
-//                    map.put("msg", "用户在别处登录");
-//                    //别问, 问就是约定俗成
-//                    map.put("code", 666);
-//                }
-//
-//                map.put("success", false);
-//                String json = new ObjectMapper().writeValueAsString(map);
-//                response.setContentType("application/json;charset=UTF-8");
-//                response.getWriter().print(json);
-//                return false;
-//            }
-//            //放行请求
-//            return true;
-//        } catch (SignatureVerificationException e) {
-//            errorType = 1;
-//            log.error("JWTInterceptor SignatureVerificationException Msg={}", e.getMessage());
-//            map.put("msg", "无效签名");
-//        } catch (TokenExpiredException e) {
-//            errorType = 2;
-//            log.error("JWTInterceptor TokenExpiredException Msg={}", e.getMessage());
-//            map.put("msg", "token已过期");
-//        } catch (AlgorithmMismatchException e) {
-//            errorType = 3;
-//            log.error("JWTInterceptor AlgorithmMismatchException Msg={}", e.getMessage());
-//            map.put("msg", "算法不一致");
-//        } catch (Exception e) {
-//            errorType = 4;
-//            log.error("JWTInterceptor Exception Msg={}", e.getMessage());
-//            map.put("msg", "token无效");
-//        }
-//        log.info("====================>token无效类型: " + errorType);
-//        map.put("code", 401);
-//        map.put("success", false);
-//        //使用jackson将map转为json
-//        String json = new ObjectMapper().writeValueAsString(map);
-//        response.setContentType("application/json;charset=UTF-8");
-//        response.getWriter().print(json);
-//        return false;
-//    }
-//
-//}

alien-gateway/src/main/java/shop/alien/gateway/config/JWTUtils.java

@@ -1,66 +0,0 @@
-package shop.alien.gateway.config;
-
-import com.auth0.jwt.JWT;
-import com.auth0.jwt.JWTCreator;
-import com.auth0.jwt.algorithms.Algorithm;
-import com.auth0.jwt.interfaces.DecodedJWT;
-import org.springframework.web.context.request.RequestContextHolder;
-import org.springframework.web.context.request.ServletRequestAttributes;
-
-import javax.servlet.http.HttpServletRequest;
-import java.util.Date;
-import java.util.Map;
-
-/**
- * Token工具类
- *
- * @author ssk
- * @version 1.0
- * @date 2024/12/25 16:58
- */
-public class JWTUtils {
-
-    private static final String SIGN = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
-
-    //1000ms x 60秒 x 60分钟 x 24小时 x 30天
-    private static final Long EXPIRATION_TIME = 1000 * 60 * 60 * 24 * 30L;
-
-    /**
-     * 生成Token
-     */
-    public static String createToken(Map<String, String> map) {
-        //创建JWTBuilder
-        JWTCreator.Builder builder = JWT.create();
-        //设置payload
-        map.forEach(builder::withClaim);
-        //设置过期时间和签名，生成token
-        return builder.withExpiresAt(new Date(System.currentTimeMillis() + EXPIRATION_TIME)).sign(Algorithm.HMAC256(SIGN));
-    }
-
-    /**
-     * 验证token
-     */
-    public static void TokenVerify(String token) {
-        JWT.require(Algorithm.HMAC256(SIGN)).build().verify(token);
-    }
-
-    /**
-     * 获取token信息
-     */
-    public static DecodedJWT getTokenInfo(String token) {
-        return JWT.require(Algorithm.HMAC256(SIGN)).build().verify(token);
-    }
-
-    /**
-     * 非控制器获取token
-     */
-    public static String getToken() {
-        ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
-        if (attributes != null) {
-            HttpServletRequest request = attributes.getRequest();
-            String token = request.getHeader("Authorization");
-            return token;
-        }
-        return null;
-    }
-}

alien-gateway/src/main/java/shop/alien/gateway/filter/JwtTokenFilter.java → alien-gateway/src/main/java/shop/alien/gateway/config/JwtTokenFilter.java

@@ -1,7 +1,6 @@
-package shop.alien.gateway.filter;
+package shop.alien.gateway.config;
 
 import com.alibaba.cloud.commons.lang.StringUtils;
-import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import io.jsonwebtoken.Claims;
 import io.jsonwebtoken.ExpiredJwtException;

alien-gateway/src/main/java/shop/alien/gateway/filter/JwtUtil.java → alien-gateway/src/main/java/shop/alien/gateway/config/JwtUtil.java

@@ -1,4 +1,4 @@
-package shop.alien.gateway.filter;
+package shop.alien.gateway.config;
 
 import io.jsonwebtoken.Claims;
 import io.jsonwebtoken.JwtBuilder;

alien-gateway/src/main/java/shop/alien/gateway/controller/LifeUserController.java

@@ -1,23 +1,12 @@
 package shop.alien.gateway.controller;
 
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import io.swagger.annotations.*;
 import lombok.RequiredArgsConstructor;
 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.entity.result.R;
-import shop.alien.entity.store.LifeFans;
-import shop.alien.entity.store.LifeUser;
 import shop.alien.entity.store.vo.LifeUserVo;
-import shop.alien.gateway.mapper.LifeUserMapper;
 import shop.alien.gateway.service.LifeUserService;
-import shop.alien.gateway.util.FileUpload;
-import shop.alien.gateway.util.RandomCreateUtil;
-
-import java.util.HashMap;
-import java.util.Map;
 
 /**
  * 用户
@@ -32,12 +21,6 @@ public class LifeUserController {
 
     private final LifeUserService service;
 
-    private final FileUpload fileUpload;
-
-    private final LifeUserMapper lifeUserMapper;
-
-    private final RandomCreateUtil randomCreateUtil;
-
     @ApiOperation("用户登录")
     @ApiOperationSupport(order = 1)
     @ApiImplicitParams({@ApiImplicitParam(name = "phoneNum", value = "手机号", dataType = "String", paramType = "query", required = true)})
@@ -50,139 +33,5 @@ public class LifeUserController {
         }
         return R.data(userVo);
     }
-    @ApiOperation("查询用户信息")
-    @ApiOperationSupport(order = 2)
-    @ApiImplicitParams({@ApiImplicitParam(name = "id", value = "主键id", dataType = "String", paramType = "query", required = true)})
-    @GetMapping("/selectUserById")
-    public R<LifeUser> selectUserById(@RequestParam("id") String id) {
-        log.info("LifeUserController.selectUserById?id={}", id);
-        LifeUser lifeUserVo = new LifeUser();
-        LifeUser user = lifeUserMapper.selectById(id);
-        if (null == user) {
-            return R.fail("查询失败");
-        }
-//        BeanUtils.copyProperties(user, lifeUserVo);
-//        // 添加 是否拉黑标识,是否是达人标识
-//        //达人标识 0 不是达人 1 是达人
-//        LambdaUpdateWrapper<LifeUserExpert> wrapper = new LambdaUpdateWrapper<>();
-//        wrapper.eq(LifeUserExpert::getUserId, user.getId());
-//        LifeUserExpert lifeUserExpert = lifeUserExpertMapper.selectOne(wrapper);
-//        if (null != lifeUserExpert) {
-//            lifeUserVo.setIsExpert("1");
-//        } else {
-//            lifeUserVo.setIsExpert("0");
-//        }
-        // 被拉黑标识 0 未拉黑 1 已拉黑(待定)
-
-        return R.data(user);
-    }
-
-    @ApiOperation("修改用户信息")
-    @ApiOperationSupport(order = 3)
-    @PostMapping("/modifyUser")
-    public R<Boolean> modifyUser(@RequestBody LifeUser user) {
-        log.info("LifeUserController.modifyUser?user={}", user.toString());
-        int num = service.modifyUser(user);
-        if (num == 0) {
-            return R.fail("修改失败");
-        }
-        return R.success("修改成功");
-    }
-
-    @ApiOperation("关注")
-    @ApiOperationSupport(order = 4)
-    @PostMapping("/addFans")
-    public R<Boolean> addFans(@RequestBody LifeFans fans) {
-        log.info("LifeUserController.addFans?fans={}", fans.toString());
-        int num = service.addFans(fans);
-        if (num == 0) {
-            return R.fail("关注失败");
-        }
-        return R.success("关注成功");
-    }
-
-    @ApiOperation("取消关注")
-    @ApiOperationSupport(order = 5)
-    @PostMapping("/cancelFollewed")
-    public R<Boolean> cancelFollewed(@RequestBody LifeFans fans) {
-        log.info("LifeUserController.cancelFollewed?fans={}", fans.toString());
-        int num = service.cancelFans(fans);
-        if (num == 0) {
-            return R.fail("取消失败");
-        }
-        return R.success("取消成功");
-    }
-
-    @ApiOperation("搜索商家或用户")
-    @ApiOperationSupport(order = 6)
-    @PostMapping("/getStoreAndUserByName")
-    public R<IPage<LifeUserVo>> getStoreAndUserByName(@RequestBody LifeUserVo vo) {
-        log.info("LifeUserController.getStoreAndUserByName?vo={}", vo.toString());
-        return R.data(service.getStoreAndUserByName(vo));
-    }
-
-    @GetMapping("/getUserById")
-    public LifeUser getUserById(@RequestParam("id") String id) {
-        log.info("LifeUserController.getUserById?id={}", id);
-        return service.getUserById(id);
-    }
-
-    @PostMapping("/addUser")
-    public int addOrUpdateUser(LifeUser user, @RequestParam(value = "image", required = false) MultipartFile image) throws Exception {
-        log.info("LifeUserController.addOrUpdateUser?user={}&image={}", user.toString(), image.getOriginalFilename());
-        String path = "";
-        if (!StringUtils.isEmpty(image.getOriginalFilename())) {
-            path = fileUpload.saveImage(image);
-        }
-        // 设置图片路径
-        user.setUserImage(path);
-        //邀请码
-
-        user.setInvitedNum(randomCreateUtil.getRandomNStr(20));
-        return service.addOrUpdateUser(user);
-    }
-
-    @GetMapping("/getUserPage")
-    public Map<String, Object> getStoresPage(@RequestParam(defaultValue = "1") int page,
-                                             @RequestParam(defaultValue = "10") int size,
-                                             @RequestParam(required = false) String realName,
-                                             @RequestParam(required = false) String userPhone) {
-        log.info("LifeUserController.getStoresPage?page={},size={},realName={},userPhone={}", page, size, realName, userPhone);
-        IPage<LifeUser> stores = service.getStoresPage(page, size, realName, userPhone);
-        Map<String, Object> response = new HashMap<>();
-        response.put("data", stores.getRecords());
-        response.put("total", stores.getRecords().size());
-        response.put("current", stores.getCurrent());
-        response.put("size", stores.getSize());
-        return response;
-    }
-
-    /**
-     * 用户端注销用户
-     */
-    @ApiOperation("用户端注销用户")
-    @PostMapping("/liftCancelAccount")
-    public R<Boolean> liftCancelAccount(@RequestBody LifeUser user) {
-        log.info("StoreUserController.liftCancelAccount?LifeUser={}", user);
-        service.liftCancelAccount(user);
-        return R.success("注销成功");
-    }
-
-    /**
-     * 用户端撤回注销用户
-     */
-    @ApiOperation("用户端撤回注销用户")
-    @PostMapping("/liftCancelAccountUn")
-    public R<Boolean> liftCancelAccountUn(@RequestBody LifeUser user) {
-        log.info("StoreUserController.liftCancelAccountUn?LifeUser={}", user);
-        service.liftCancelAccountUn(user.getId());
-        return R.success("撤回注销成功");
-    }
-
-    @GetMapping("/getUserByPhone")
-    public R<LifeUser> getUserByPhone(@RequestParam("phone") String phone) {
-        log.info("LifeUserController.getUserByPhone?phone={}", phone);
-        return R.data(service.getUserByPhone(phone));
-    }
 
 }

alien-gateway/src/main/java/shop/alien/gateway/controller/LoginController.java

@@ -1,35 +0,0 @@
-package shop.alien.gateway.controller;
-
-import shop.alien.entity.result.R;
-import shop.alien.entity.system.entity.SystemUser;
-import shop.alien.gateway.service.LoginService;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * 登录Controller
- *
- * @author ssk
- * @version 1.0
- * @date 2025/1/21 16:58
- */
-@RestController
-@RequiredArgsConstructor
-public class LoginController {
-
-    private final LoginService loginService;
-
-    /**
-     * 登陆认证接口
-     *
-     * @param systemUser 用户类
-     * @return token
-     */
-    @PostMapping("/login")
-    public R login(@RequestBody SystemUser systemUser) {
-        return R.data(loginService.login(systemUser));
-    }
-
-}

alien-gateway/src/main/java/shop/alien/gateway/controller/StoreUserController.java

@@ -1,22 +1,16 @@
 package shop.alien.gateway.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
 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.entity.store.StoreImg;
 import shop.alien.entity.store.StoreUser;
-import shop.alien.entity.store.vo.StoreInfoVo;
 import shop.alien.entity.store.vo.StoreUserVo;
-import shop.alien.gateway.mapper.StoreImgMapper;
 import shop.alien.gateway.mapper.StoreUserMapper;
-import shop.alien.gateway.service.StoreInfoService;
 import shop.alien.gateway.service.StoreUserService;
 
-import java.io.IOException;
 import java.util.Objects;
 import java.util.Optional;
 
@@ -37,8 +31,6 @@ public class StoreUserController {
 
     private final StoreUserService storeUserService;
     private final StoreUserMapper storeUserMapper;
-    private final StoreInfoService storeInfoService;
-    private final StoreImgMapper storeImgMapper;
 
     @ApiOperation("门店用户登录")
     @ApiOperationSupport(order = 1)
@@ -63,21 +55,6 @@ public class StoreUserController {
     }
 
     /**
-     * 校验商户端账号是否禁用
-     *
-     * @param accountId
-     * @return
-     */
-    @ApiOperation("校验账号是否被禁用")
-    @ApiOperationSupport(order = 1)
-    @ApiImplicitParams({@ApiImplicitParam(name = "accountId", value = "账号id", dataType = "Integer", paramType = "query", required = true)})
-    @GetMapping("/checkAccount")
-    private R<StoreUserVo> checkAccount(Integer accountId) {
-        return storeUserService.getById(accountId).getStatus() != 1 ? R.success("账号正常")
-                : R.fail("账号禁用");
-    }
-
-    /**
      * checkPwd
      *
      * @param user
@@ -90,304 +67,4 @@ public class StoreUserController {
                 : R.fail("密码错误");
     }
 
-    @ApiOperation("修改密码")
-    @ApiOperationSupport(order = 2)
-    @ApiImplicitParams({@ApiImplicitParam(name = "phone", value = "手机号", dataType = "String", paramType = "query", required = true),
-            @ApiImplicitParam(name = "oldPassword", value = "旧密码", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "newPassword", value = "新密码", dataType = "String", paramType = "query", required = true),
-            @ApiImplicitParam(name = "type", value = "类型:0:忘记密码,其他:修改密码", dataType = "Integer", paramType = "query", required = true)})
-    @GetMapping("/updatePassword")
-    public R<Boolean> updatePassword(String phone, String oldPassword, String newPassword, Integer type) {
-        log.info("StoreUserController.updatePassword?phone={}&oldPassword={}&newPassword={}&type={}", phone, oldPassword, newPassword, type);
-        StoreUser storeUser = storeUserService.getUserByPhone(phone);
-        if (null != storeUser) {
-            if (0 == type || oldPassword.equals(storeUser.getPassword())) {
-                if (newPassword.equals(storeUser.getPassword())) {
-                    return R.fail("新密码与原密码相同");
-                }
-                if (storeUserService.updatePassword(storeUser.getId(), newPassword)) {
-                    return R.success("修改成功");
-                }
-                return R.fail("修改失败");
-            }
-            return R.fail("旧密码错误");
-        }
-        return R.fail("手机号不存在");
-    }
-
-    @ApiOperation("修改用户信息")
-    @ApiOperationSupport(order = 3)
-    @ApiImplicitParams({@ApiImplicitParam(name = "id", value = "主键", dataType = "String", paramType = "query", required = true),
-            @ApiImplicitParam(name = "name", value = "姓名", dataType = "String", paramType = "query", required = true),
-            @ApiImplicitParam(name = "idCard", value = "身份证", dataType = "String", paramType = "query", required = true)})
-    @GetMapping("/setUserInfo")
-    public R<Boolean> setUserInfo(Integer id, String name, String idCard) {
-        log.info("StoreUserController.setUserInfo?id={}&name={}&idCard={}", id, name, idCard);
-        if (storeUserService.setUserInfo(id, name, idCard)) {
-            return R.success("修改成功");
-        }
-        return R.fail("修改失败");
-    }
-
-    @ApiOperation("根据手机号获取用户")
-    @ApiOperationSupport(order = 4)
-    @ApiImplicitParams({@ApiImplicitParam(name = "phone", value = "手机号", dataType = "String", paramType = "query", required = true)})
-    @GetMapping("/getUserByPhone")
-    public R<StoreUser> getUserByPhone(String phone) {
-        log.info("StoreUserController.getUserInfo?phone={}", phone);
-        StoreUser storeUser = storeUserService.getUserByPhone(phone);
-        if (null != storeUser) {
-            return R.data(storeUser);
-        }
-        return R.fail("手机号不存在");
-    }
-
-    @ApiOperation("修改支付密码")
-    @ApiOperationSupport(order = 5)
-    @ApiImplicitParams({@ApiImplicitParam(name = "id", value = "主键", dataType = "String", paramType = "query", required = true), @ApiImplicitParam(name = "payPassword", value = "支付密码", dataType = "String", paramType = "query", required = true)})
-    @GetMapping("/setPayPassword")
-    public R<Boolean> setPayPassword(Integer id, String payPassword) {
-        if (storeUserService.setPayPassword(id, payPassword)) {
-            return R.success("修改成功");
-        }
-        return R.fail("修改失败");
-    }
-
-    @ApiOperation("修改用户状态")
-    @ApiOperationSupport(order = 6)
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "phone", value = "手机号", dataType = "String", paramType = "query", required = true),
-            @ApiImplicitParam(name = "type", value = "修改类型 (pass:密码状态改为1, face:人脸状态改为2)", dataType = "String", paramType = "query", required = true)
-    })
-    @GetMapping("/updateUserStatus")
-    public R<StoreUser> updateUserStatus(String phone, String type) {
-        log.info("StoreUserController.updateUserStatus?phone={}&type={}", phone, type);
-        if (storeUserService.updateUserStatus(phone, type)) {
-            return R.success("修改成功");
-        }
-        return R.fail("修改失败");
-    }
-
-    @ApiOperation("修改商户信息")
-    @ApiOperationSupport(order = 7)
-    @PostMapping("/setStoreUserInfo")
-    public R<Boolean> setStoreUserInfo(@RequestBody StoreInfoVo storeInfo) {
-        log.info("StoreUserController.setStoreUserInfo?storeInfo={}", storeInfo);
-
-        // 查询店铺图片信息
-        LambdaQueryWrapper<StoreImg> queryWrapper = new LambdaQueryWrapper<StoreImg>()
-                .eq(StoreImg::getImgType, 10)
-                .eq(StoreImg::getStoreId, storeInfo.getId());
-        StoreImg storeImg = storeImgMapper.selectOne(queryWrapper);
-
-        // 如果查询到店铺图片信息，则更新图片 URL
-        if (storeImg != null) {
-            storeImg.setImgUrl(storeInfo.getImgUrl());
-            int imgUpdateResult = storeImgMapper.updateById(storeImg);
-            if (imgUpdateResult == 0) {
-                log.error("更新店铺图片信息失败，storeInfo: {}", storeInfo);
-                return R.fail("修改失败，更新店铺图片信息失败");
-            }
-        } else {
-            StoreImg storeImg1 = new StoreImg();
-            storeImg1.setStoreId(storeInfo.getId());
-            storeImg1.setImgType(10);
-            storeImg1.setImgUrl(storeInfo.getImgUrl());
-            storeImg1.setImgSort(0);
-            int insert = storeImgMapper.insert(storeImg1);
-            if (insert == 0) {
-                log.error("添加店铺图片信息失败，storeInfo: {}", storeInfo);
-                return R.fail("添加失败，添加店铺图片信息失败");
-            }
-        }
-
-        // 更新店铺信息
-        boolean infoUpdateResult = storeInfoService.updateById(storeInfo);
-        if (!infoUpdateResult) {
-            log.error("更新店铺信息失败，storeInfo: {}", storeInfo);
-            return R.fail("修改失败，更新店铺信息失败");
-        }
-
-        // 所有更新操作成功，返回成功信息
-        return R.success("修改成功");
-
-    }
-
-    /**
-     * web端查询用户列表
-     */
-    @ApiOperation("web端查询用户列表")
-    @ApiOperationSupport(order = 7)
-    @GetMapping("/getStoreUserList")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true),
-            @ApiImplicitParam(name = "pageSize", value = "页容", dataType = "int", paramType = "query", required = true),
-            @ApiImplicitParam(name = "storeName", value = "门店名称", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "storeContact", value = "门店联系人", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "storePhone", value = "门店电话", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "storeType", value = "门店类型", dataType = "String", paramType = "query")
-    })
-    public R<IPage<StoreUserVo>> getStoreUserList(@RequestParam(defaultValue = "1") int pageNum,
-                                                  @RequestParam(defaultValue = "10") int pageSize,
-                                                  @RequestParam(required = false) String id,
-                                                  @RequestParam(required = false) String phone,
-                                                  @RequestParam(required = false) Integer status) {
-        log.info("StoreInfoController.getStoreUserList?pageNum={},pageSize={},id={},phone={},status={}", pageNum, pageSize, id, phone, status);
-        R<IPage<StoreUserVo>> storeUserVoR = storeUserService.getStoreUserList(pageNum, pageSize, id, phone, status);
-        return storeUserVoR;
-    }
-
-    /**
-     * web端新增商家端用户
-     */
-    @ApiOperation("web端新增商家端用户")
-    @ApiOperationSupport(order = 7)
-    @PostMapping("/addStoreUser")
-    public R<StoreUserVo> addStoreUser(@RequestBody StoreUserVo storeUserVo) {
-        log.info("StoreUserController.addStoreUser?storeUserVo={}", storeUserVo);
-        R<StoreUserVo> storeUserVoR = storeUserService.addStoreUser(storeUserVo);
-        return storeUserVoR;
-    }
-
-    /**
-     * web端编辑商家端用户
-     */
-    @ApiOperation("web端编辑商家端用户")
-    @ApiOperationSupport(order = 7)
-    @PostMapping("/editStoreUser")
-    public R<StoreUserVo> editStoreUser(@RequestBody StoreUser storeUser) {
-        log.info("StoreUserController.editStoreUser?storeUser={}", storeUser);
-        R<StoreUserVo> storeUserVoR = storeUserService.editStoreUser(storeUser);
-        return storeUserVoR;
-    }
-
-    /**
-     * web端重置商家端用户密码
-     */
-    @ApiOperation("web端编辑商家端用户")
-    @ApiOperationSupport(order = 7)
-    @PutMapping("/resetStoreUserPassword")
-    public R<StoreUserVo> resetStoreUserPassword(@RequestBody StoreUser storeUser) {
-        log.info("StoreUserController.resetStoreUserPassword?storeUser={}", storeUser);
-        storeUserService.resetStoreUserPassword(storeUser);
-        return R.success("初始化成功");
-    }
-
-    /**
-     * web端删除商家端用户
-     */
-    @ApiOperation("web端删除商家端用户")
-    @ApiOperationSupport(order = 7)
-    @DeleteMapping("/deleteStoreUser")
-    public R<StoreUserVo> deleteStoreUser(@RequestParam(value = "id") String id) {
-        log.info("StoreUserController.deleteStoreUser?id={}", id);
-        storeUserService.deleteStoreUser(id);
-        return R.success("删除成功");
-    }
-
-    /**
-     * web端切换商家端用户
-     */
-    @ApiOperation("web端切换商家端用户")
-    @ApiOperationSupport(order = 7)
-    @PutMapping("/switchingStates")
-    public R<StoreUserVo> switchingStates(@RequestBody StoreUser storeUser) {
-        log.info("StoreUserController.switchingStates?storeUser={}", storeUser);
-        storeUserService.switchingStates(storeUser);
-        return R.success("切换成功");
-    }
-
-    @ApiOperation(value = "web端导出商家端账号相关信息")
-    @ApiOperationSupport(order = 6)
-    @GetMapping("/exportExcel")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "id", value = "用户id", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "phone", value = "联系电话", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "status", value = "状态", dataType = "String", paramType = "query"),
-    })
-    @ResponseBody
-    public R exportExcel(@RequestParam(value = "id", required = false) String id
-            , @RequestParam(value = "phone", required = false) String phone
-            , @RequestParam(value = "status", required = false) String status) throws IOException {
-        log.info("StoreInfoController.exportExcel");
-        String excelPath = storeUserService.exportExcel(id, phone, status);
-        return R.data(excelPath);
-    }
-
-
-    /**
-     * register
-     *
-     * @param phone
-     * @param password
-     * @return
-     */
-    @ApiOperation("门店用户注册")
-    @ApiOperationSupport(order = 7)
-    @ApiImplicitParams({@ApiImplicitParam(name = "phone", value = "手机号", dataType = "String", paramType = "query", required = true),
-            @ApiImplicitParam(name = "password", value = "密码", dataType = "String", paramType = "query", required = true)})
-    @GetMapping("/register")
-    public R<Boolean> register(String phone, String password) {
-        log.info("StoreUserController.register?phone={}&password={}", phone, password);
-        return storeUserService.register(phone, password);
-    }
-
-
-    /**
-     * register
-     *
-     * @param phone
-     * @return
-     */
-    @ApiOperation("门店用户注册校验")
-    @ApiOperationSupport(order = 8)
-    @ApiImplicitParams({@ApiImplicitParam(name = "phone", value = "手机号", dataType = "String", paramType = "query", required = true)})
-    @GetMapping("/checkRegister")
-    public R<Boolean> checkRegister(String phone) {
-        log.info("StoreUserController.register?phone={}", phone);
-        Boolean res = storeUserService.checkRegister(phone);
-        return R.data(res);
-    }
-
-
-    /**
-     * register
-     *
-     * @param phone
-     * @return
-     */
-    @ApiOperation("门店用户登录校验")
-    @ApiOperationSupport(order = 9)
-    @ApiImplicitParams({@ApiImplicitParam(name = "phone", value = "手机号", dataType = "String", paramType = "query", required = true)})
-    @GetMapping("/checkLogin")
-    public R<Boolean> checkLogin(String phone) {
-        log.info("StoreUserController.checkLogin?phone={}", phone);
-        return storeUserService.checkLogin(phone);
-    }
-
-    /**
-     * 商家端注销用户
-     */
-    @ApiOperation("商家端注销用户")
-    @PostMapping("/storeCancelAccount")
-    public R<StoreUserVo> storeCancelAccount(@RequestBody StoreUserVo storeUserVo) {
-        log.info("StoreUserController.storeCancelAccount?storeUserVo={}", storeUserVo);
-        try {
-            storeUserService.storeCancelAccount(storeUserVo);
-        } catch (Exception e) {
-            return R.fail(e.getMessage());
-        }
-        return R.success("注销成功");
-    }
-
-    /**
-     * 商家端撤销注销用户
-     */
-    @ApiOperation("商家端撤销注销用户")
-    @PostMapping("/storeCancelAccountUn")
-    public R<StoreUserVo> storeCancelAccountUn(@RequestBody StoreUserVo storeUserVo) {
-        log.info("StoreUserController.storeCancelAccountUn?storeUserVo={}", storeUserVo);
-        storeUserService.storeCancelAccountUn(storeUserVo);
-        return R.success("撤回注销成功");
-    }
 }

alien-gateway/src/main/java/shop/alien/gateway/mapper/EssentialCityCodeMapper.java

@@ -1,16 +0,0 @@
-package shop.alien.gateway.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import shop.alien.entity.store.EssentialCityCode;
-
-/**
- * <p>
- * 区域编码 Mapper 接口
- * </p>
- *
- * @author ssk
- * @since 2025-04-23
- */
-public interface EssentialCityCodeMapper extends BaseMapper<EssentialCityCode> {
-
-}

alien-gateway/src/main/java/shop/alien/gateway/mapper/LifeCouponMapper.java

@@ -1,67 +0,0 @@
-package shop.alien.gateway.mapper;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.Constants;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Select;
-import shop.alien.entity.store.LifeCoupon;
-import shop.alien.entity.store.vo.LifeCouponVo;
-
-import java.util.List;
-
-@Mapper
-public interface LifeCouponMapper extends BaseMapper<LifeCoupon> {
-
-    @Select("select coupon.id,\n" +
-            "coupon.store_id,\n" +
-            "coupon.coupon_code,\n" +
-            "coupon.`name`,\n" +
-            "coupon.price,\n" +
-            "coupon.offprice,\n" +
-            "coupon.expiration_date,\n" +
-            "coupon.start_date,\n" +
-            "coupon.end_date,\n" +
-            "coupon.unused_date,\n" +
-            "coupon.single_qty,\n" +
-            "coupon.buy_limit,\n" +
-            "coupon.stock_qty,\n" +
-            "coupon.use_rule,\n" +
-            "coupon.min_use_peoples,\n" +
-            "coupon.max_use_peoples,\n" +
-            "coupon.dietary_preferences,\n" +
-            "coupon.cooking_methods,\n" +
-            "coupon.applicable_rule,\n" +
-            "coupon.`status`,\n" +
-            "coupon.store_service,\n" +
-            "coupon.fapiao_info,\n" +
-            "coupon.type,\n" +
-            "coupon.approval_comments,\n" +
-            "coupon.delete_flag,\n" +
-            "coupon.created_time,\n" +
-            "coupon.updated_time,\n" +
-            "coupon.created_user_id,\n" +
-            "coupon.updated_user_id,\n" +
-            "coupon.open_price_protection,\n" +
-            "coupon.price_below,\n" +
-            "coupon.coupon_comp,\n" +
-            "coupon_comp_date,\n" +
-            "coupon.uploaded_picList,\n" +
-            "coupon.applicable_num,\n" +
-            "coupon.write_off,\n" +
-            "coupon.reservation_rules,\n" +
-            "coupon.rate_score, store.store_name, store.store_address, user.phone, coupon.created_time, coupon.name, coupon.status " +
-            "from life_coupon coupon " +
-            "left join store_info store on store.id = coupon.store_id and store.delete_flag = 0 " +
-            "left join store_user user on store.id = user.store_id and user.delete_flag = 0 ${ew.customSqlSegment}")
-    IPage<LifeCouponVo> getGroupPackageList(IPage<LifeCouponVo> page, @Param(Constants.WRAPPER) QueryWrapper<LifeCouponVo> queryWrapper);
-
-    @Select("SELECT lc.store_id,lc.price FROM life_coupon AS lc LEFT JOIN store_info AS si ON lc.store_id = si.id WHERE si.delete_flag = 0 and si.business_section_name = #{businessSectionName}")
-    List<LifeCoupon> selectCoupon(String businessSectionName);
-
-    @Select("SELECT * FROM life_coupon ${ew.customSqlSegment}")
-    List<LifeCoupon> getList(@Param(Constants.WRAPPER) LambdaQueryWrapper<LifeCoupon> lambdaQueryWrapper);
-}

alien-gateway/src/main/java/shop/alien/gateway/mapper/LifeFansMapper.java

@@ -1,205 +0,0 @@
-package shop.alien.gateway.mapper;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.Constants;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Select;
-import shop.alien.entity.store.LifeFans;
-import shop.alien.entity.store.vo.LifeFansVo;
-
-import java.util.List;
-
-@Mapper
-public interface LifeFansMapper extends BaseMapper<LifeFans> {
-
-    @Select("select foll.*,lb.id blackListid, if(isnull(fans.id), 0, 1) isFollowMe, 1 as isFollowThis,  " +
-            "  (select count(1) from life_fans where fans_id= foll.phoneId and delete_flag =0) followNum, " +
-            "  (select count(1) from life_fans where followed_id= foll.phoneId and delete_flag =0) fansNum from ( " +
-            "    with follow as (   " +
-            "        select substring_index(followed_id, '_', 1) as flag, substring_index(followed_id, '_', -1) as phone   " +
-            "        from life_fans   " +
-            "        where delete_flag = 0 and fans_id = #{fansId} " +
-            "    )   " +
-            "    select info.id, info.store_name name, img.img_url image, concat('store_', user.phone) phoneId, info.store_blurb blurb, 1 blockedType,user.id blockedId" +
-            "    from follow foll " +
-            "    join store_user user on foll.phone = user.phone " +
-            "    join store_info info on info.id = user.store_id " +
-            "    left join store_img img on img.store_id = user.store_id and img.img_type = '10' and img.delete_flag = 0 " +
-            "    where foll.flag = 'store' and user.delete_flag = 0 and info.delete_flag = 0 " +
-            "    union " +
-            "    select user.id, user.user_name name, user.user_image image, concat('user_', user.user_phone) phoneId, user.jianjie blurb, 2 blockedType,user.id blockedId" +
-            "    from follow foll " +
-            "    join life_user user on foll.phone = user.user_phone   " +
-            "    where foll.flag = 'user' and user.delete_flag = 0   " +
-            ") foll   " +
-            "left join life_fans fans on fans.fans_id = foll.phoneId and fans.followed_id = #{fansId} and fans.delete_flag = 0 " +
-            "left join life_blacklist lb on lb.blocked_type = foll.blockedType and lb.blocked_id = foll.blockedId and lb.blocker_type = #{blockerType} and lb.blocker_id = #{blockerId} and lb.delete_flag = 0" +
-            "${ew.customSqlSegment} ")
-    IPage<LifeFansVo> getMyFollowed(IPage<LifeFansVo> iPage, @Param("fansId") String fansId, @Param("blockerType") String blockerType, @Param("blockerId") String blockerId, @Param(Constants.WRAPPER) QueryWrapper<LifeFansVo> wrapper);
-
-
-    @Select("select foll.*, if(isnull(fans.id), 0, 1) isFollowMe, 1 as isFollowThis from ( " +
-            "    with follow as (   " +
-            "        select substring_index(followed_id, '_', 1) as flag, substring_index(followed_id, '_', -1) as phone   " +
-            "        from life_fans   " +
-            "        where delete_flag = 0 and fans_id = #{fansId} " +
-            "    )   " +
-            "    select info.id, info.store_name name, img.img_url image, concat('store_', user.phone) phoneId " +
-            "    from follow foll " +
-            "    join store_user user on foll.phone = user.phone " +
-            "    join store_info info on info.id = user.store_id " +
-            "    left join store_img img on img.store_id = user.store_id and img.img_type = '10' and img.delete_flag = 0 " +
-            "    where foll.flag = 'store' and user.delete_flag = 0 and info.delete_flag = 0 " +
-            "    union " +
-            "    select user.id, user.user_name name, user.user_image image, concat('user_', user.user_phone) phoneId " +
-            "    from follow foll " +
-            "    join life_user user on foll.phone = user.user_phone   " +
-            "    where foll.flag = 'user' and user.delete_flag = 0   " +
-            ") foll " +
-            "left join life_fans fans on fans.fans_id = foll.phoneId and fans.followed_id = #{fansId} and fans.delete_flag = 0 ")
-    List<LifeFansVo> getMyFollowedAll(@Param("fansId") String fansId);
-
-    @Select("select foll.*,lb.id blackListid, if(isnull(fans.id), 0, 1) isFollowThis, 1 as isFollowMe, " +
-            "    (select count(1) from life_fans fans2 where fans2.followed_id = foll.phoneId and fans2.delete_flag = 0) fansNum, " +
-            "    (select count(1) from life_fans fans3 where fans3.fans_id = foll.phoneId and fans3.delete_flag = 0) followNum " +
-            "from ( " +
-            "    with follow as ( " +
-            "        select substring_index(fans_id, '_', 1) as flag, substring_index(fans_id, '_', -1) as phone " +
-            "        from life_fans " +
-            "        where delete_flag = 0 and followed_id = #{fansId} " +
-            "    ) " +
-            "    select info.id, info.store_name name, img.img_url image, concat('store_', user.phone) phoneId, info.store_blurb blurb, 1 blockedType,user.id blockedId" +
-            "    from follow foll " +
-            "    join store_user user on foll.phone = user.phone " +
-            "    join store_info info on info.id = user.store_id " +
-            "    left join store_img img on img.store_id = user.store_id and img.img_type = '10' and img.delete_flag = 0 " +
-            "    where foll.flag = 'store' and user.delete_flag = 0 and info.delete_flag = 0 " +
-            "    union " +
-            "    select user.id, user.user_name name, user.user_image image, concat('user_', user.user_phone) phoneId, user.jianjie blurb, 2 blockedType,user.id blockedId" +
-            "    from follow foll " +
-            "    join life_user user on foll.phone = user.user_phone " +
-            "    where foll.flag = 'user' and user.delete_flag = 0 " +
-            ") foll " +
-            "left join life_fans fans on fans.followed_id = foll.phoneId and fans.fans_id = #{fansId} and fans.delete_flag = 0 " +
-            "left join life_blacklist lb on lb.blocked_type = foll.blockedType and lb.blocked_id = foll.blockedId and lb.blocker_type = #{blockerType} and lb.blocker_id = #{blockerId} and lb.delete_flag = 0" +
-            "${ew.customSqlSegment} ")
-    IPage<LifeFansVo> getMyFans(IPage<LifeFansVo> iPage, @Param("fansId") String fansId, @Param("blockerType") String blockerType, @Param("blockerId") String blockerId, @Param(Constants.WRAPPER) QueryWrapper<LifeFansVo> wrapper);
-
-    @Select("select foll.*, if(isnull(fans.id), 0, 1) isFollowThis, 1 as isFollowMe, count(fans2.id) fansNum, count(fans3.id) followNum from ( " +
-            "    with follow as ( " +
-            "    select substring_index(fans_id, '_', 1) as flag, substring_index(fans_id, '_', -1) as phone " +
-            "    from life_fans " +
-            "    where delete_flag = 0 and followed_id = #{fansId} " +
-            "    ) " +
-            "    select info.id, info.store_name name, img.img_url image, concat('store_', user.phone) phoneId, info.store_blurb blurb " +
-            "    from follow foll " +
-            "    join store_user user on foll.phone = user.phone " +
-            "    join store_info info on info.id = user.store_id " +
-            "    left join store_img img on img.store_id = user.store_id and img.img_type = '10' and img.delete_flag = 0 " +
-            "    where foll.flag = 'store' and user.delete_flag = 0 and info.delete_flag = 0 " +
-            ") foll " +
-            "left join life_fans fans on fans.followed_id = foll.phoneId and fans.fans_id = #{fansId} and fans.delete_flag = 0 " +
-            "left join life_fans fans2 on fans2.followed_id = foll.phoneId and fans2.delete_flag = 0 " +
-            "left join life_fans fans3 on fans3.fans_id = foll.phoneId and fans3.delete_flag = 0 " +
-            "${ew.customSqlSegment} ")
-    IPage<LifeFansVo> getMyStoreFans(IPage<LifeFansVo> iPage, @Param("fansId") String fansId, @Param(Constants.WRAPPER) QueryWrapper<LifeFansVo> wrapper);
-
-    @Select("select foll.*, if(isnull(fans.id), 0, 1) isFollowThis, 1 as isFollowMe, " +
-            "       (select count(1) from life_fans fans2 where fans2.followed_id = foll.phoneId and fans2.delete_flag = 0) fansNum, " +
-            "       (select count(1) from life_fans fans3 where fans3.fans_id = foll.phoneId and fans3.delete_flag = 0) followNum " +
-            " from ( " +
-            "    with follow as ( " +
-            "    select substring_index(fans_id, '_', 1) as flag, substring_index(fans_id, '_', -1) as phone " +
-            "    from life_fans " +
-            "    where delete_flag = 0 and followed_id = #{fansId} " +
-            "    ) " +
-            "    select user.id, user.user_name name, user.user_image image, concat('user_', user.user_phone) phoneId, user.jianjie blurb " +
-            "    from follow foll " +
-            "    join life_user user on foll.phone = user.user_phone " +
-            "    where foll.flag = 'user' and user.delete_flag = 0 " +
-            ") foll " +
-            "left join life_fans fans on fans.followed_id = foll.phoneId and fans.fans_id = #{fansId} and fans.delete_flag = 0 " +
-            "${ew.customSqlSegment} ")
-    IPage<LifeFansVo> getMyUserFans(IPage<LifeFansVo> iPage, @Param("fansId") String fansId, @Param(Constants.WRAPPER) QueryWrapper<LifeFansVo> wrapper);
-
-    @Select("select foll.*, lb.id blackListid, 1 as isFollowThis, 1 as isFollowMe, " +
-            "       (select count(1) from life_fans fans2 where fans2.followed_id = foll.phoneId and fans2.delete_flag = 0) fansNum, " +
-            "       (select count(1) from life_fans fans3 where fans3.fans_id = foll.phoneId and fans3.delete_flag = 0) followNum " +
-            "from ( " +
-            "    with follow as ( " +
-            "        select substring_index(fans1.followed_id, '_', 1) as flag, substring_index(fans1.followed_id, '_', -1) as phone " +
-            "        from life_fans fans1 " +
-            "        join life_fans fans2 on fans1.followed_id = fans2.fans_id and fans1.fans_id = fans2.followed_id " +
-            "        where fans1.delete_flag = 0 and fans2.delete_flag = 0 and fans1.fans_id = #{fansId} " +
-            "    ) " +
-            "    select info.id, info.store_name name, img.img_url image, concat('store_', user.phone) phoneId, info.store_blurb blurb, 1 blockedType,user.id blockedId " +
-            "    from follow foll " +
-            "    join store_user user on foll.phone = user.phone " +
-            "    join store_info info on info.id = user.store_id " +
-            "    left join store_img img on img.store_id = user.store_id and img.img_type = '10' and img.delete_flag = 0 " +
-            "    where foll.flag = 'store' and user.delete_flag = 0 and info.delete_flag = 0 " +
-            "    union " +
-            "    select user.id, user.user_name name, user.user_image image, concat('user_', user.user_phone) phoneId, user.jianjie blurb, 2 blockedType,user.id blockedId " +
-            "    from follow foll " +
-            "    join life_user user on foll.phone = user.user_phone " +
-            "    where foll.flag = 'user' and user.delete_flag = 0 " +
-            ") foll " +
-            "left join life_blacklist lb on lb.blocked_type = foll.blockedType and lb.blocked_id = foll.blockedId and lb.blocker_type = #{blockerType} and lb.blocker_id = #{blockerId} and lb.delete_flag = 0" +
-            "${ew.customSqlSegment} ")
-    IPage<LifeFansVo> getMutualAttention(IPage<LifeFansVo> iPage, @Param("fansId") String fansId,  @Param("blockerType") String blockerType, @Param("blockerId") String blockerId, @Param(Constants.WRAPPER) QueryWrapper<LifeFansVo> wrapper);
-
-    @Select("select foll.*, 1 as isFollowThis, 1 as isFollowMe, " +
-            "       (select count(1) from life_fans fans2 where fans2.followed_id = foll.phoneId and fans2.delete_flag = 0) fansNum, " +
-            "       (select count(1) from life_fans fans3 where fans3.fans_id = foll.phoneId and fans3.delete_flag = 0) followNum " +
-            "from ( " +
-            "    with follow as ( " +
-            "        select substring_index(fans1.followed_id, '_', 1) as flag, substring_index(fans1.followed_id, '_', -1) as phone " +
-            "        from life_fans fans1 " +
-            "        join life_fans fans2 on fans1.followed_id = fans2.fans_id and fans1.fans_id = fans2.followed_id " +
-            "        where fans1.delete_flag = 0 and fans2.delete_flag = 0 and fans1.fans_id = #{fansId} " +
-            "    ) " +
-            "    select user.id, user.user_name name, user.user_image image, concat('user_', user.user_phone) phoneId, user.jianjie blurb " +
-            "    from follow foll " +
-            "    join life_user user on foll.phone = user.user_phone " +
-            "    where foll.flag = 'user' and user.delete_flag = 0 " +
-            ") foll " +
-            "${ew.customSqlSegment} ")
-    IPage<LifeFansVo> getMutualAttentionUser(IPage<LifeFansVo> iPage, @Param("fansId") String fansId, @Param(Constants.WRAPPER) QueryWrapper<LifeFansVo> wrapper);
-
-    @Select("select (select count(1) from life_fans where fans_id = #{phoneId} and delete_flag = 0 and followed_id not REGEXP '_$') followNum, " +
-            "(select count(1) from life_fans where followed_id= #{phoneId} and delete_flag = 0 and fans_id not REGEXP '_$') fansNum, " +
-            "(select count(1) from ( " +
-            "        select foll.*, 1 as isFollowThis, 1 as isFollowMe, " +
-            "               (select count(1) from life_fans fans2 where fans2.followed_id = foll.phoneId and fans2.delete_flag = 0) fansNum, " +
-            "               (select count(1) from life_fans fans3 where fans3.fans_id = foll.phoneId and fans3.delete_flag = 0) followNum " +
-            "        from ( " +
-            "            with follow as ( " +
-            "                select substring_index(fans1.followed_id, '_', 1) as flag, substring_index(fans1.followed_id, '_', -1) as phone " +
-            "                from life_fans fans1 " +
-            "                join life_fans fans2 on fans1.followed_id = fans2.fans_id and fans1.fans_id = fans2.followed_id " +
-            "                where fans1.delete_flag = 0 and fans2.delete_flag = 0 and fans1.fans_id = #{phoneId} " +
-            "            ) " +
-            "            select info.id, info.store_name name, img.img_url image, concat('store_', user.phone) phoneId " +
-            "            from follow foll " +
-            "            join store_user user on foll.phone = user.phone " +
-            "            join store_info info on info.id = user.store_id " +
-            "            left join store_img img on img.store_id = user.store_id and img.img_type = '10' and img.delete_flag = 0 " +
-            "            where foll.flag = 'store' and user.delete_flag = 0 and info.delete_flag = 0 " +
-            "            union " +
-            "            select user.id, user.user_name name, user.user_image image, concat('user_', user.user_phone) phoneId " +
-            "            from follow foll " +
-            "            join life_user user on foll.phone = user.user_phone " +
-            "            where foll.flag = 'user' and user.delete_flag = 0 " +
-            "        ) foll " +
-            "    ) a " +
-            ") friendNum, " +
-            "( " +
-            "    select count(id) " +
-            "    from life_user_dynamics " +
-            "    where delete_flag = 0 and phone_id = #{phoneId} " +
-            ") dynamicsNum")
-    LifeFansVo getHomePageInfo(@Param("phoneId") String phoneId);
-}

alien-gateway/src/main/java/shop/alien/gateway/mapper/LifeMessageMapper.java

@@ -1,75 +0,0 @@
-package shop.alien.gateway.mapper;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.Constants;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Select;
-import org.apache.ibatis.annotations.Update;
-import shop.alien.entity.store.LifeMessage;
-import shop.alien.entity.store.vo.LifeFansVo;
-import shop.alien.entity.store.vo.LifeMessageVo;
-
-import java.util.List;
-
-/**
- * 消息
- */
-@Mapper
-public interface LifeMessageMapper extends BaseMapper<LifeMessage> {
-
-    @Select("select id, user_name userName, user_image userImage, concat('user_', user_phone) phoneId " +
-            "from life_user " +
-            "where delete_flag = 0 and user_phone != '' and user_phone in (${userPhones})  " +
-            "union " +
-            "select info.id, info.store_name userName, img.img_url userImage, concat('store_', user.phone) phoneId " +
-            "from store_user user " +
-            "join store_info info on info.id = user.store_id " +
-            "left join store_img img on img.store_id = info.id and img.img_type = '10' and img.delete_flag = 0 " +
-            "where user.delete_flag = 0 and info.delete_flag = 0 and user.phone != '' and phone in (${storePhones}) ")
-    List<LifeMessageVo> getLifeUserAndStoreUserByPhone(@Param("storePhones") String storePhones, @Param("userPhones") String userPhones);
-
-    @Select("with message_num as ( " +
-            "    with message as ( " +
-            "        select id, type, content, created_time, if(sender_id = #{phoneId}, receiver_id, sender_id) phoneId, sender_id, receiver_id, is_read " +
-            "        from life_message " +
-            "        where delete_flag = 0 and (sender_id = #{phoneId} or receiver_id = #{phoneId}) " +
-            "               and (instr(delete_phone_id, #{phoneId}) is null or instr(delete_phone_id, #{phoneId}) = 0)" +
-            "    ) " +
-            "    select *, row_number() over (partition by phoneId order by created_time desc ) num " +
-            "    from message " +
-            ") " +
-            "select id, type, phoneId, content, created_time createdTime, is_read " +
-            "from message_num " +
-            "${ew.customSqlSegment}")
-    IPage<LifeMessageVo> getLifeMessagePageByPhoneId(IPage<LifeMessageVo> iPage, @Param("phoneId") String phoneId, @Param(Constants.WRAPPER) QueryWrapper<LifeFansVo> dynamicsWrapper);
-
-    @Update("update life_message set delete_phone_id = (if(delete_phone_id is null, #{receiverId}, concat(delete_phone_id, ',', #{receiverId}))) ,delete_flag = '1'" +
-            "where (receiver_id = #{senderId} and sender_id = #{receiverId}) or (sender_id = #{senderId} and receiver_id = #{receiverId}) ")
-    int deleteMessageByPhoneId(@Param("senderId") String senderId, @Param("receiverId") String receiverId);
-
-//    @Select("select lm.id,lm.updated_time,lm.created_user_id,lm.receiver_name,lm.is_read,lm.type,lm.content," +
-//            "lm.current_time,lm.delete_flag,lm.sender_id,lm.sender_name,lm.receiver_id,lm.delete_phone_id," +
-//            "lm.created_time,lm.updated_user_id,lu.user_image,img.img_url storeImg" +
-//            "    from life_message lm" +
-//            "    left join life_user lu " +
-//            "    on SUBSTRING(lm.sender_id, INSTR(lm.sender_id, '_') + 1) = lu.user_phone" +
-//            "        left join store_user su on SUBSTRING(lm.sender_id, INSTR(lm.sender_id, '_') + 1) = su.phone " +
-//            "        left join store_info s on su.store_id = s.id" +
-//            "        left join store_img img on img.store_id = s.id and img.img_type = '10' and img.delete_flag = 0 "+
-//            "    where lm.delete_flag = 0 and su.delete_flag = 0 and s.delete_flag = 0" +
-//            "    and ( ((lm.receiver_id = #{senderId} and lm.sender_id = #{receiverId})" +
-//            "    or (lm.sender_id = #{senderId} and lm.receiver_id = #{receiverId})) )" +
-//            "    order by lm.created_time asc")
-@Select("select lm.id,lm.updated_time,lm.created_user_id,lm.receiver_name,lm.is_read,lm.type,lm.content,lm.current_time,lm.delete_flag,lm.sender_id,lm.sender_name,lm.receiver_id,lm.delete_phone_id,lm.created_time,lm.updated_user_id,lu.user_image" +
-        "    from life_message lm" +
-        "    left join life_user lu " +
-        "    on SUBSTRING(lm.sender_id, INSTR(lm.sender_id, '_') + 1) = lu.user_phone"+
-        "    where lm.delete_flag = 0" +
-        "    and ( ((lm.receiver_id = #{senderId} and lm.sender_id = #{receiverId})" +
-        "    or (lm.sender_id = #{senderId} and lm.receiver_id = #{receiverId})) )" +
-        "    order by lm.created_time asc")
-    List<LifeMessageVo> selectUserImageLists(@Param("receiverId") String receiverId,@Param("senderId") String senderId);
-}

alien-gateway/src/main/java/shop/alien/gateway/mapper/LifeNoticeMapper.java

@@ -1,10 +0,0 @@
-package shop.alien.gateway.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Mapper;
-import shop.alien.entity.store.LifeNotice;
-
-@Mapper
-public interface LifeNoticeMapper extends BaseMapper<LifeNotice> {
-
-}

alien-gateway/src/main/java/shop/alien/gateway/mapper/LifeUserDynamicsMapper.java

@@ -1,44 +0,0 @@
-package shop.alien.gateway.mapper;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.toolkit.Constants;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Select;
-import shop.alien.entity.store.LifeUserDynamics;
-import shop.alien.entity.store.vo.LifeUserDynamicsVo;
-
-import java.util.List;
-
-@Mapper
-public interface LifeUserDynamicsMapper extends BaseMapper<LifeUserDynamics> {
-
-    @Select("with dynamice as( " +
-            "    select id, title, phone_id phoneId, context, image_path, address, liulan_count, dianzan_count, type, created_time, substring_index(phone_id, '_', 1) flag, substring_index(phone_id, '_', -1) phone, draft " +
-            "    from life_user_dynamics " +
-            "    where delete_flag = 0 order by created_time desc" +
-            ") " +
-            "select dynamice.*, info.store_name userName, img.img_url userImage, info.id storeUserId, user.id storeOrUserId " +
-            "from dynamice " +
-            "join store_user user on dynamice.phone = user.phone " +
-            "join store_info info on info.id = user.store_id " +
-            "left join store_img img on img.store_id = user.store_id and img.img_type = '10' and img.delete_flag = 0  " +
-            "where dynamice.flag = 'store' and user.delete_flag = 0 and info.delete_flag = 0 " +
-            "union " +
-            "select dynamice.*, user.user_name userName, user.user_image userImage, user.id storeUserId, user.id storeOrUserId " +
-            "from dynamice " +
-            "join life_user user on dynamice.phone = user.user_phone " +
-            "where dynamice.flag = 'user' and user.delete_flag = 0")
-    List<LifeUserDynamicsVo> getLifeUserDynamicsList();
-
-    @Select("select lud.id ,lud.image_path,lud.context,lu.user_image,lu.user_name,IF(llr.huifu_id IS NOT NULL, 1, 0) AS isLike\n" +
-            "from life_user_dynamics lud\n" +
-            "left join life_user lu \n" +
-            "on lud.phone_id = CONCAT('store_', lu.user_phone )\n" +
-            "left join life_like_record llr\n" +
-            "on llr.huifu_id = lud.id\n" +
-            "and lu.user_phone = (select CONCAT('user_',lu1.user_phone) from life_user lu1 where lu1.id = #{userId})"+
-            "${ew.customSqlSegment}")
-    List<LifeUserDynamicsVo> getStoreDynamicslist(@Param("userId") String userId,@Param(Constants.WRAPPER) QueryWrapper<LifeUserDynamics> dynamicsWrapper);
-}

alien-gateway/src/main/java/shop/alien/gateway/mapper/LifeUserMapper.java

@@ -1,18 +1,8 @@
 package shop.alien.gateway.mapper;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.Constants;
 import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Select;
 import shop.alien.entity.store.LifeUser;
-import shop.alien.entity.store.vo.LifeFansVo;
-import shop.alien.entity.store.vo.LifeUserOrderVo;
-import shop.alien.entity.store.vo.LifeUserVo;
-
-import java.util.List;
 
 /**
  * 用户
@@ -20,39 +10,4 @@ import java.util.List;
 @Mapper
 public interface LifeUserMapper extends BaseMapper<LifeUser> {
 
-    @Select("select info.store_name, user.phone, img.img_url " +
-            "from store_info info " +
-            "join store_user user on user.store_id = info.id " +
-            "left join store_img img on img.store_id = info.id and img.img_type = '10' and img.delete_flag = 0 " +
-            "where info.delete_flag = 0 and user.delete_flag = 0 " +
-            "and substring_index(#{phoneId}, '_', 1) = 'store' " +
-            "and substring_index(#{phoneId}, '_', -1) = user.phone " +
-            "union " +
-            "select user_name name, user_phone phone, user_image img_url " +
-            "from life_user " +
-            "where delete_flag = 0 and substring_index(#{phoneId}, '_', 1) = 'user' and substring_index(#{phoneId}, '_', -1) = user_phone")
-    LifeFansVo getUserInfoByPhoneId(@Param("phoneId") String phoneId);
-
-
-    LifeFansVo getUserInfoByPhoneIdList(@Param("phoneId") String phoneId);
-
-    List<LifeUserOrderVo> getUserOrderDetail(Integer userId);
-
-    @Select("select * from ( " +
-            "    select store.id, concat('store_', user.phone) phoneId, img.img_url imgUrl, store_blurb blurb, store.store_name storeUserName " +
-            "    from store_info store " +
-            "    join store_user user on user.store_id = store.id " +
-            "    left join store_img img on img.store_id = store.id and img.img_type = '10' and img.delete_flag = 0 " +
-            "    where store.delete_flag = 0 " +
-            "    and user.delete_flag = 0 " +
-            "    union all " +
-            "    select id, concat('user_', user_phone) phoneId, user_image imgUrl, jianjie blurb, user_name name " +
-            "    from life_user " +
-            "    where delete_flag = 0 " +
-            ") a " +
-            "${ew.customSqlSegment}")
-    IPage<LifeUserVo> getStoreAndUserByName(IPage<LifeUserVo> iPage, @Param(Constants.WRAPPER) QueryWrapper<LifeUserVo> wrapper);
-
-    LifeUserVo getRemoveUser(@Param("id") String id);
-
 }

alien-gateway/src/main/java/shop/alien/gateway/mapper/StoreBusinessInfoMapper.java

@@ -1,28 +0,0 @@
-package shop.alien.gateway.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Select;
-import shop.alien.entity.store.StoreBusinessInfo;
-
-import java.util.List;
-
-/**
- * 门店营业时间 Mapper 接口
- *
- * @author ssk
- * @since 2024-12-05
- */
-@Mapper
-public interface StoreBusinessInfoMapper extends BaseMapper<StoreBusinessInfo> {
-
-    /**
-     * 获取商家的营业时间
-     * @param businessSectionName
-     * @return
-     */
-    @Select("SELECT sbi.id,sbi.store_id,sbi.business_type,sbi.business_date,sbi.start_time,sbi.end_time,sbi.delete_flag,sbi.created_time," +
-            "sbi.created_user_id,sbi.updated_time,sbi.updated_user_id FROM store_business_info AS sbi LEFT JOIN store_info AS si " +
-            "ON sbi.store_id = si.id WHERE sbi.delete_flag = 0 and si.delete_flag = 0 and si.business_section_name = #{businessSectionName}")
-    List<StoreBusinessInfo> selectBusinessInfo(String businessSectionName);
-}

alien-gateway/src/main/java/shop/alien/gateway/mapper/StoreDictionaryMapper.java

@@ -1,23 +0,0 @@
-package shop.alien.gateway.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Select;
-import shop.alien.entity.store.StoreDictionary;
-
-/**
- * <p>
- * 门店字典表 新 Mapper 接口
- * </p>
- *
- * @author ssk
- * @since 2024-12-26
- */
-public interface StoreDictionaryMapper extends BaseMapper<StoreDictionary> {
-
-    @Select("SELECT max(dict_id) num " +
-            "FROM store_dictionary " +
-            "WHERE type_name = #{dictId} " +
-            "ORDER BY dict_id DESC")
-    Integer getMaxDictIdByTypeName(String dictId);
-
-}

alien-gateway/src/main/java/shop/alien/gateway/mapper/StoreImgMapper.java

@@ -1,29 +0,0 @@
-package shop.alien.gateway.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Select;
-import shop.alien.entity.store.StoreImg;
-import shop.alien.entity.store.vo.StoreImgTypeVo;
-
-import java.util.List;
-
-/**
- * 门店图片 Mapper 接口
- *
- * @author ssk
- * @since 2024-12-05
- */
-@Mapper
-public interface StoreImgMapper extends BaseMapper<StoreImg> {
-
-    @Select("select IFNULL(img_type, 0) img_type, count(1) count, img_url imgUrl from store_img where store_id = #{storeId} and img_type = 0 and delete_flag= 0 " +
-            "union all " +
-            "select IFNULL(img_type, 3) img_type, count(1) count, img_url imgUrl from store_img where store_id = #{storeId} and img_type = 3 and delete_flag= 0 " +
-            "union all " +
-            "select IFNULL(img_type, 4) img_type, count(1) count, img_url imgUrl from store_img where store_id = #{storeId} and img_type = 4 and delete_flag= 0 " +
-            "union all " +
-            "select IFNULL(img_type, 5) img_type, count(1) count, img_url imgUrl from store_img where store_id = #{storeId} and img_type = 5 and delete_flag= 0")
-    List<StoreImgTypeVo> getStoreImgTypeCount(@Param("storeId") Integer storeId);
-}

alien-gateway/src/main/java/shop/alien/gateway/mapper/StoreInfoMapper.java

@@ -1,18 +1,8 @@
 package shop.alien.gateway.mapper;
 
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.Constants;
 import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Select;
 import shop.alien.entity.store.StoreInfo;
-import shop.alien.entity.store.vo.StoreInfoVo;
-import shop.alien.entity.store.vo.StoreMainInfoVo;
-
-import java.util.List;
 
 /**
  * 门店信息 Mapper 接口
@@ -22,73 +12,4 @@ import java.util.List;
  */
 @Mapper
 public interface StoreInfoMapper extends BaseMapper<StoreInfo> {
-
-    @Select("SELECT a.*, b.dict_detail businessStatusStr, c.dict_detail storeAreaStr FROM store_info a " +
-            "left join store_dictionary b on a.business_status = b.dict_id and b.type_name='businessStatus' " +
-            "left join store_dictionary c on a.store_area = c.dict_id and c.type_name='storeArea' where a.id = #{id}")
-    StoreMainInfoVo getStoreInfo(Integer id);
-
-    @Select("select a.*, b.name store_contact, b.phone store_phone, b.password, img.img_url entranceImage, dict.dict_detail storeTypeStr, " +
-            "( " +
-            " select ifnull(round(avg(score), 1), 0) " +
-            " from store_evaluation eval " +
-            " where eval.store_id = a.id and eval.delete_flag = 0 " +
-            ") score " +
-            "from store_info a " +
-            "left join store_user b on a.id = b.store_id and b.delete_flag = 0 " +
-            "left join store_img img on img.store_id = a.id and img.img_type = 1 and img.delete_flag = 0 " +
-            "left join store_dictionary dict on dict.type_name = 'storeType' and dict.dict_id = a.store_type and dict.delete_flag = 0 " +
-            " ${ew.customSqlSegment}")
-    StoreInfoVo getStoreInfoVoOne(@Param(Constants.WRAPPER) QueryWrapper<StoreInfoVo> queryWrapper);
-
-    @Select("with menu as (select store_id,GROUP_CONCAT(dish_name) dish_name from store_menu GROUP BY store_id) " +
-            "select a.*, b.name store_contact, b.phone store_phone, b.password, c.dish_name, a.store_type, img.img_url entranceImage, d.img_url, dict.dict_detail storeTypeStr, dict2.dict_detail businessStatusStr " +
-            "from store_info a " +
-            "left join store_user b on a.id = b.store_id  AND b.delete_flag = 0 " +
-            "left join menu c on a.id = c.store_id " +
-            "left join store_img img on img.store_id = a.id and img.img_type = 1 and img.delete_flag = 0 " +
-            "left join store_dictionary dict on dict.type_name = 'storeType' and dict.dict_id = a.store_type and dict.delete_flag = 0 " +
-            "left join store_dictionary dict2 on dict2.type_name = 'businessStatus' and a.business_status = dict2.dict_id and dict2.delete_flag = 0 " +
-            "left join store_img d on d.store_id = a.id and d.img_type = 10 and d.delete_flag = 0" +
-            " ${ew.customSqlSegment}")
-    List<StoreInfoVo> getStoreInfoVoList(@Param(Constants.WRAPPER) QueryWrapper<StoreInfoVo> queryWrapper);
-
-    /**
-     * web端-门店列表
-     *
-     * @param page         分页
-     * @param queryWrapper 查询条件
-     * @return IPage<StoreInfoVo>
-     */
-    @Select("select a.*, img.img_url entranceImage,b.name store_contact, b.phone store_phone, b.id_card idCard, b.password, c.dict_detail store_status_str, d.dict_detail business_status_str, e.dict_detail store_type_str,  " +
-            "( " +
-            " select ifnull(round(avg(score), 1), 0) " +
-            " from store_evaluation eval " +
-            " where eval.store_id = a.id and eval.delete_flag = 0 " +
-            ") score " +
-            "from store_info a " +
-            "left join store_user b on a.id = b.store_id " +
-            "left join store_img img on img.store_id = a.id and img.img_type = 1 and img.delete_flag = 0 " +
-            "left join store_dictionary c on a.store_status = c.dict_id and c.type_name = 'storeState' and c.delete_flag = 0 " +
-            "left join store_dictionary d on a.business_status = d.dict_id and d.type_name = 'businessStatus' and d.delete_flag = 0 " +
-            "left join store_dictionary e on e.type_name = 'storeType' and e.dict_id = a.store_type and e.delete_flag = 0 " +
-            "${ew.customSqlSegment}")
-    IPage<StoreInfoVo> getStoreInfoVoPage(IPage<StoreInfoVo> page, @Param(Constants.WRAPPER) QueryWrapper<StoreInfoVo> queryWrapper);
-
-    @Select("select info.store_name, user.phone, img.img_url " +
-            "from store_info info " +
-            "join store_user user on user.store_id = info.id " +
-            "left join store_img img on img.store_id = info.id and img.img_type = '10' and img.delete_flag = 0 " +
-            "where info.id = #{id} and info.delete_flag = 0 and user.delete_flag = 0 ")
-    StoreInfoVo getStoreUserInfo(Integer id);
-
-    @Select("select a.*, b.name store_contact, b.phone store_phone, b.id_card idCard, b.password, c.dict_detail store_status_str, d.dict_detail business_status_str " +
-            "from store_info a " +
-            "left join store_user b on a.id = b.store_id " +
-            "left join store_dictionary c on a.store_status = c.dict_id and c.type_name = 'storeState' " +
-            "left join store_dictionary d on a.business_status = d.dict_id and d.type_name = 'businessStatus' ${ew.customSqlSegment}")
-    List<StoreInfoVo> getStoreInfoVo(@Param(Constants.WRAPPER) QueryWrapper<StoreInfoVo> queryWrapper);
-
-    @Select("select * from store_info ${ew.customSqlSegment}")
-    List<StoreInfo> getList(@Param(Constants.WRAPPER) LambdaQueryWrapper<StoreInfo> queryWrapper);
 }

alien-gateway/src/main/java/shop/alien/gateway/mapper/StoreLabelMapper.java

@@ -1,16 +0,0 @@
-package shop.alien.gateway.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Mapper;
-import shop.alien.entity.store.StoreLabel;
-
-/**
- * 门店标签 Mapper 接口
- *
- * @author ssk
- * @since 2024-12-05
- */
-@Mapper
-public interface StoreLabelMapper extends BaseMapper<StoreLabel> {
-
-}

alien-gateway/src/main/java/shop/alien/gateway/mapper/StoreMenuMapper.java

@@ -1,38 +0,0 @@
-package shop.alien.gateway.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Select;
-import shop.alien.entity.store.StoreMenu;
-import shop.alien.entity.store.vo.StoreMenuVo;
-
-import java.util.List;
-
-/**
- * 门店推荐 Mapper 接口
- *
- * @author ssk
- * @since 2024-12-05
- */
-@Mapper
-public interface StoreMenuMapper extends BaseMapper<StoreMenu> {
-
-    /**
-     * 获取菜单
-     *
-     * @param storeId  门店id
-     * @param dishType 菜品类型, 0:菜单, 1:推荐
-     * @return List<StoreMenuVo>
-     */
-    //"图片类型, 0:其他, 1:入口图, 2:相册, 3:菜品, 4:环境, 5:价目表, 6:推荐菜, 7:菜单, 8:用户评论, 9:商家申诉, 10:商家头像, 11:店铺轮播图"
-    @Select("select a.*, b.img_url, b.img_sort, b.img_description from store_menu a " +
-            "left join store_img b on a.img_id = b.id where a.delete_flag = 0 and b.delete_flag = 0 " +
-            "and a.store_id = #{storeId} AND (if(#{dishType} is null, 1 = 1, a.dish_type = #{dishType}))")
-    List<StoreMenuVo> getStoreMenuList(@Param("storeId") Integer storeId, @Param("dishType") Integer dishType);
-
-    @Select("select a.*, b.img_url, b.img_sort, b.img_description from store_menu a " +
-            "left join store_img b on a.img_id = b.id where a.delete_flag = 0 and b.delete_flag = 0 " +
-            "and a.id = #{id}")
-    StoreMenuVo getMenuInfo(@Param("id") Integer id);
-}

alien-gateway/src/main/java/shop/alien/gateway/mapper/StoreUserMapper.java

@@ -2,13 +2,8 @@ package shop.alien.gateway.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Select;
 import shop.alien.entity.store.StoreUser;
 
-import java.util.List;
-import java.util.Map;
-
 /**
  * <p>
  * 门店用户 Mapper 接口
@@ -19,21 +14,4 @@ import java.util.Map;
  */
 @Mapper
 public interface StoreUserMapper extends BaseMapper<StoreUser> {
-
-    @Select("SELECT\n" +
-            "\t`user`.phone,\n" +
-            "\t`user`.id,\n" +
-            "\tinfo.store_name as storeName,\n" +
-            "\timg.img_url as imgUrl \n" +
-            "FROM\n" +
-            "\tstore_user AS `user`\n" +
-            "\tLEFT JOIN store_info AS info ON `user`.store_id = info.id\n" +
-            "\tLEFT JOIN store_img AS img ON img.store_id = info.id \n" +
-            "WHERE\n" +
-            "\t`user`.phone IN (${userPhones}) \n" +
-            "\tAND `user`.delete_flag = 0 \n" +
-            "\tAND img.img_type = 10")
-    List<Map<String,Object>> selectStore(@Param("userPhones") String userPhones);
-
-    StoreUser getRemoveUser(@Param("id") String id);
 }

alien-gateway/src/main/java/shop/alien/gateway/service/LifeUserService.java

@@ -2,34 +2,20 @@ package shop.alien.gateway.service;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.support.SFunction;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.RequiredArgsConstructor;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.lang3.tuple.Triple;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
-import org.springframework.util.CollectionUtils;
-import shop.alien.entity.store.LifeFans;
-import shop.alien.entity.store.LifeNotice;
 import shop.alien.entity.store.LifeUser;
-import shop.alien.entity.store.vo.LifeMessageVo;
 import shop.alien.entity.store.vo.LifeUserVo;
 import shop.alien.gateway.config.BaseRedisService;
-import shop.alien.gateway.filter.JwtUtil;
-import shop.alien.gateway.mapper.LifeFansMapper;
-import shop.alien.gateway.mapper.LifeMessageMapper;
-import shop.alien.gateway.mapper.LifeNoticeMapper;
+import shop.alien.gateway.config.JwtUtil;
 import shop.alien.gateway.mapper.LifeUserMapper;
-import shop.alien.gateway.util.FunctionMagic;
 
-import java.util.*;
-import java.util.stream.Collectors;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
 
 /**
  * 用户
@@ -40,97 +26,11 @@ public class LifeUserService extends ServiceImpl<LifeUserMapper, LifeUser> {
 
     private final LifeUserMapper lifeUserMapper;
 
-    private final LifeFansMapper lifeFansMapper;
-
     private final BaseRedisService baseRedisService;
 
-    private final LifeNoticeMapper lifeNoticeMapper;
-
-    private final LifeMessageMapper messageMapper;
-
     @Value("${jwt.expiration-time}")
     private String effectiveTime;
 
-    public IPage<LifeUser> getStoresPage(int page, int size, String realName, String userPhone) {
-        IPage<LifeUser> storePage = new Page<>(page, size);
-        QueryWrapper<LifeUser> queryWrapper = new QueryWrapper<>();
-        queryWrapper.like(!realName.isEmpty(), "real_name", realName);
-        queryWrapper.like(!userPhone.isEmpty(), "user_phone", userPhone);
-        queryWrapper.orderByDesc("created_time");
-        return lifeUserMapper.selectPage(storePage, queryWrapper);
-    }
-
-    public int modifyUser(LifeUser user) {
-        return lifeUserMapper.updateById(user);
-    }
-
-    public int addOrUpdateUser(LifeUser user) {
-        user.setCreatedTime(new Date());
-        return lifeUserMapper.insert(user);
-    }
-
-    public LifeUser getUserById(String id) {
-        return lifeUserMapper.selectById(id);
-    }
-
-    public int addFans(LifeFans fans) {
-        fans.setCreatedTime(new Date());
-        int num = lifeFansMapper.insert(fans);
-
-        if (num == 1) {
-            LifeNotice notice = new LifeNotice();
-            notice.setTitle("关注通知");
-            notice.setContext("关注了你");
-            notice.setNoticeType(0);
-            notice.setReceiverId(fans.getFollowedId());
-            notice.setSenderId(fans.getFansId());
-
-            // 根据手机号查询发送人信息
-            String storePhones = "''";
-            String userPhones = "''";
-            if (fans.getFansId().split("_")[0].equals("store")) {
-                storePhones = "'" + fans.getFansId().split("_")[1] + "'";
-            } else {
-                userPhones = "'" + fans.getFansId().split("_")[1] + "'";
-            }
-            List<LifeMessageVo> userList = messageMapper.getLifeUserAndStoreUserByPhone(storePhones, userPhones);
-            if (!CollectionUtils.isEmpty(userList)) {
-                notice.setBusinessId(userList.get(0).getId());
-            }
-            lifeNoticeMapper.insert(notice);
-        }
-
-        return num;
-    }
-
-    public int cancelFans(LifeFans fans) {
-        LambdaUpdateWrapper<LifeFans> wrapper = new LambdaUpdateWrapper<>();
-        wrapper.eq(LifeFans::getFansId, fans.getFansId());
-        wrapper.eq(LifeFans::getFollowedId, fans.getFollowedId());
-        return lifeFansMapper.delete(wrapper);
-    }
-
-    public IPage<LifeUserVo> getStoreAndUserByName(LifeUserVo vo) {
-        QueryWrapper<LifeUserVo> queryWrapper = new QueryWrapper<>();
-        queryWrapper.like(StringUtils.isNotEmpty(vo.getSearchName()), "a.storeUserName", vo.getSearchName());
-        IPage<LifeUserVo> voList = lifeUserMapper.getStoreAndUserByName(new Page<>(vo.getPage(), vo.getSize()), queryWrapper);
-
-        // 查询我的关注
-        LambdaQueryWrapper<LifeFans> lifeFansWrapper = new LambdaQueryWrapper<>();
-        lifeFansWrapper.eq(LifeFans::getFansId, vo.getPhoneId());
-        List<LifeFans> lifeFansList = lifeFansMapper.selectList(lifeFansWrapper);
-        List<String> followList = lifeFansList.stream().map(LifeFans::getFollowedId).collect(Collectors.toList());
-
-        voList.getRecords().forEach(item -> {
-            if (followList.contains(item.getPhoneId())) {
-                item.setIsFollowThis("1");
-            } else {
-                item.setIsFollowThis("0");
-            }
-        });
-        return voList;
-    }
-
     public LifeUserVo userLogin(String phoneNum) {
         int effectiveTimeInt = Integer.parseInt(effectiveTime.substring(0, effectiveTime.length() - 1));
         String effectiveTimeUnit = effectiveTime.substring(effectiveTime.length() - 1);
@@ -200,41 +100,4 @@ public class LifeUserService extends ServiceImpl<LifeUserMapper, LifeUser> {
         return this.getOne(lambdaQueryWrapper);
     }
 
-    public void liftCancelAccount(LifeUser user) {
-        // 通过id获取当前用户账号信息
-        LambdaQueryWrapper<LifeUser> lambdaQueryWrapper = new LambdaQueryWrapper<>();
-        lambdaQueryWrapper.eq(LifeUser::getId, user.getId());
-        LifeUser lifeUser = lifeUserMapper.selectOne(lambdaQueryWrapper);
-        // 修改注销标记为1
-        lifeUser.setLogoutFlag(1);
-        // 添加注销原因
-        lifeUser.setLogoutReason(user.getLogoutReason());
-        // 添加注销申请时间
-        lifeUser.setLogoutTime(new Date());
-        lifeUserMapper.updateById(lifeUser);
-    }
-
-    public void liftCancelAccountUn(Integer id) {
-        LambdaQueryWrapper<LifeUser> lambdaQueryWrapper = new LambdaQueryWrapper<>();
-        lambdaQueryWrapper.eq(LifeUser::getId, id);
-        LifeUser lifeUser = lifeUserMapper.selectOne(lambdaQueryWrapper);
-        // 修改注销标记为0
-        lifeUser.setLogoutFlag(0);
-        // 清空注销原因
-        lifeUser.setLogoutReason(null);
-        // 清空注销申请时间
-        lifeUser.setLogoutTime(null);
-        lifeUserMapper.updateById(lifeUser);
-    }
-
-    public List<String> getIds(String name, String phone) {
-        if(Objects.isNull(name) && Objects.isNull(phone)) return Arrays.asList("");
-        LambdaQueryWrapper<LifeUser> wrapper = new LambdaQueryWrapper<>();
-        List<Triple<Boolean, SFunction<LifeUser, ?>, Object>> conditions = new ArrayList<>();
-        conditions.add(Triple.of(StringUtils.isNotEmpty(name), LifeUser::getUserName, name));
-        conditions.add(Triple.of(StringUtils.isNotEmpty(phone), LifeUser::getUserPhone, phone));
-        FunctionMagic.buildLikeConditions(wrapper, conditions);
-        List<String> res = FunctionMagic.convertToIds(lifeUserMapper.selectList(wrapper),LifeUser::getId);
-        return CollectionUtils.isEmpty(res) ? Arrays.asList("") : res;
-    }
 }

alien-gateway/src/main/java/shop/alien/gateway/service/LoginService.java

@@ -1,24 +0,0 @@
-package shop.alien.gateway.service;
-
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.extension.service.IService;
-import shop.alien.entity.system.entity.SystemUser;
-
-/**
- * 登录Service
- *
- * @author ssk
- * @version 1.0
- * @date 2025/1/23 9:48
- */
-public interface LoginService extends IService<SystemUser> {
-
-    /**
-     * 登录
-     *
-     * @param systemUser 用户类
-     * @return JSONObject
-     */
-    JSONObject login(SystemUser systemUser);
-
-}

alien-gateway/src/main/java/shop/alien/gateway/service/StoreUserService.java

@@ -18,143 +18,9 @@ import java.util.List;
 public interface StoreUserService extends IService<StoreUser> {
 
     /**
-     * 手机号获取
-     *
-     * @param phone 手机号
-     * @return StoreUser
-     */
-    StoreUser getUserByPhone(String phone);
-
-
-    /**
      * 创建token
      * @return
      */
     R<StoreUserVo> createToKen(StoreUser storeUser);
 
-    /**
-     * 修改用户状态
-     *
-     * @param phone 手机号
-     * @param type  修改类型 (pass:密码状态改为1, face:人脸状态改为2)
-     * @return StoreUser
-     */
-    boolean updateUserStatus(String phone, String type);
-
-    /**
-     * 修改密码
-     *
-     * @param id       主键
-     * @param password 密码
-     * @return boolean
-     */
-    boolean updatePassword(Integer id, String password);
-
-    /**
-     * 设置用户信息
-     *
-     * @param id     主键
-     * @param name   姓名
-     * @param idCard 身份证号
-     * @return boolean
-     */
-    boolean setUserInfo(Integer id, String name, String idCard);
-
-    /**
-     * 修改支付密码
-     *
-     * @param id          主键
-     * @param payPassword 支付密码
-     * @return boolean
-     */
-    boolean setPayPassword(Integer id, String payPassword);
-
-    /**
-     * 新增商家端用户
-     *
-     * @return boolean
-     */
-    R<StoreUserVo> addStoreUser(StoreUserVo storeUserVo);
-
-    /**
-     * web端查询用户列表
-     *
-     * @return boolean
-     */
-    R<IPage<StoreUserVo>> getStoreUserList(int pageNum, int pageSize, String id, String phone, Integer status);
-
-    /**
-     * web端编辑用户列表
-     *
-     * @return boolean
-     */
-    R<StoreUserVo> editStoreUser(StoreUser storeUser);
-
-    /**
-     * web端编辑用户列表
-     *
-     * @return boolean
-     */
-    void resetStoreUserPassword(StoreUser storeUser);
-
-    /**
-     * web端编辑用户列表
-     *
-     * @return boolean
-     */
-    void deleteStoreUser(String id);
-
-    /**
-     * web端切换商家端用户状态
-     *
-     * @return boolean
-     */
-    void switchingStates(StoreUser storeUser);
-
-
-    /**
-     * web端导出商家端账号相关信息
-     * */
-    String exportExcel(String id,String phone,String status) throws IOException;
-
-
-    /**
-     * 商户端校验
-     * @param phone
-     * @return
-     */
-    public boolean checkRegister(String phone);
-
-    /**
-     * 商户端登录校验
-     * @param phone
-     * @return
-     */
-    public R<Boolean> checkLogin(String phone);
-
-    /***
-     * 商户端注册
-     * @param phone
-     * @param password
-     * @return
-     */
-    R<Boolean> register(String phone, String password);
-
-    /**
-     *商家端注销用户
-     */
-    void storeCancelAccount(StoreUserVo storeUserVo);
-
-    /**
-     *商家端撤回注销用户
-     */
-    void storeCancelAccountUn(StoreUserVo storeUserVo);
-
-    /**
-     * 获取主键集合
-     * @param name
-     * @param phone
-     * @return
-     */
-    List<String> getIds(String name, String phone);
 }

alien-gateway/src/main/java/shop/alien/gateway/service/impl/LoginServiceImpl.java

@@ -1,75 +0,0 @@
-package shop.alien.gateway.service.impl;
-
-import com.alibaba.nacos.api.config.annotation.NacosValue;
-import shop.alien.entity.system.entity.SystemUser;
-import shop.alien.entity.system.mapper.SystemUserMapper;
-import shop.alien.gateway.filter.JwtUtil;
-import shop.alien.gateway.service.LoginService;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.http.HttpStatus;
-import org.springframework.stereotype.Service;
-
-/**
- * 登录ServiceImpl
- *
- * @author ssk
- * @version 1.0
- * @date 2025/1/23 9:52
- */
-@Slf4j
-@Service
-public class LoginServiceImpl extends ServiceImpl<SystemUserMapper, SystemUser> implements LoginService {
-
-    @NacosValue("${jwt.expiration-time}")
-    private String effectiveTime;
-
-    /**
-     * 登录
-     *
-     * @param systemUser 用户类
-     * @return JSONObject
-     */
-    @Override
-    public JSONObject login(SystemUser systemUser) {
-        JSONObject jsonObject = new JSONObject();
-        LambdaQueryWrapper<SystemUser> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper
-                .eq(SystemUser::getAccount, systemUser.getAccount())
-                .eq(SystemUser::getPassword, systemUser.getPassword());
-        SystemUser one = this.getOne(queryWrapper);
-        if (one == null) {
-            jsonObject.put("data", "");
-            jsonObject.put("code", HttpStatus.INTERNAL_SERVER_ERROR.value());
-            jsonObject.put("msg", "用户不存在或密码错误");
-            return jsonObject;
-        }
-        int effectiveTimeInt = Integer.parseInt(effectiveTime.substring(0, effectiveTime.length() - 1));
-        String effectiveTimeUnit = effectiveTime.substring(effectiveTime.length() - 1);
-        long effectiveTimeIntLong = 0L;
-        switch (effectiveTimeUnit) {
-            case "s": {
-                effectiveTimeIntLong = effectiveTimeInt * 1000L;
-                break;
-            }
-            case "m": {
-                effectiveTimeIntLong = effectiveTimeInt * 60L * 1000L;
-                break;
-            }
-            case "h": {
-                effectiveTimeIntLong = effectiveTimeInt * 60L * 60L * 1000L;
-                break;
-            }
-            case "d": {
-                effectiveTimeIntLong = effectiveTimeInt * 24L * 60L * 60L * 1000L;
-                break;
-            }
-        }
-        jsonObject.put("data", JwtUtil.createJWT(one.getAccount(), one.getNickname(), JSONObject.toJSONString(one), effectiveTimeIntLong));
-        jsonObject.put("code", HttpStatus.OK.value());
-        jsonObject.put("msg", "登录成功");
-        return jsonObject;
-    }
-}

alien-gateway/src/main/java/shop/alien/gateway/service/impl/StoreUserServiceImpl.java

@@ -1,35 +1,24 @@
 package shop.alien.gateway.service.impl;
 
-import com.alibaba.nacos.api.config.annotation.NacosValue;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.StringUtils;
-import com.baomidou.mybatisplus.core.toolkit.support.SFunction;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.RequiredArgsConstructor;
-import org.apache.commons.lang3.tuple.Triple;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.CollectionUtils;
 import shop.alien.entity.result.R;
-import shop.alien.entity.store.*;
-import shop.alien.entity.store.vo.StoreUserExcelVo;
+import shop.alien.entity.store.StoreInfo;
+import shop.alien.entity.store.StoreUser;
 import shop.alien.entity.store.vo.StoreUserVo;
 import shop.alien.gateway.config.BaseRedisService;
-import shop.alien.gateway.config.JWTUtils;
-import shop.alien.gateway.mapper.*;
+import shop.alien.gateway.config.JwtUtil;
+import shop.alien.gateway.mapper.StoreInfoMapper;
+import shop.alien.gateway.mapper.StoreUserMapper;
 import shop.alien.gateway.service.StoreUserService;
-import shop.alien.gateway.util.DateUtils;
-import shop.alien.gateway.util.FunctionMagic;
 
-import java.io.IOException;
-import java.time.Instant;
-import java.time.ZoneId;
-import java.time.format.DateTimeFormatter;
-import java.util.*;
+import java.util.HashMap;
+import java.util.Map;
 
 /**
  * 二期-门店用户 服务实现类
@@ -42,53 +31,17 @@ import java.util.*;
 @RequiredArgsConstructor
 public class StoreUserServiceImpl extends ServiceImpl<StoreUserMapper, StoreUser> implements StoreUserService {
 
-    @NacosValue("${spring.web.resources.excel-path}")
-    private String excelPath;
-
-    @NacosValue("${spring.web.resources.excel-generate-path}")
-    private String excelGeneratePath;
-
-    @NacosValue("${spring.web.resources.url}")
-    private String fileUrl;
+    @Value("${jwt.expiration-time}")
+    private String effectiveTime;
 
     /**
      * 设定初始化默认密码
      */
-    private static final String DEFAULT_PASSWORD = "123456";
-
-    private final StoreUserMapper storeUserMapper;
 
     private final StoreInfoMapper storeInfoMapper;
 
     private final BaseRedisService baseRedisService;
 
-    private final LifeUserDynamicsMapper lifeUserDynamicsMapper;
-
-    private final LifeFansMapper lifeFansMapper;
-
-    private final LifeNoticeMapper lifeNoticeMapper;
-
-    private final LifeMessageMapper lifeMessageMapper;
-
-    /**
-     * 手机号获取
-     *
-     * @param phone 手机号
-     * @return StoreUser
-     */
-    @Override
-    public StoreUser getUserByPhone(String phone) {
-        LambdaQueryWrapper<StoreUser> lambdaQueryWrapper = new LambdaQueryWrapper<>();
-        lambdaQueryWrapper.eq(StoreUser::getPhone, phone);
-        StoreUser user = this.getOne(lambdaQueryWrapper);
-        if (null == user) return new StoreUser();
-        LambdaQueryWrapper<StoreInfo> wrapper = new LambdaQueryWrapper<>();
-        wrapper.eq(StoreInfo::getId, user.getStoreId());
-        StoreInfo info = storeInfoMapper.selectOne(wrapper);
-        if (null != info) user.setName(info.getStoreName());
-        return user;
-    }
-
     /**
      * token
      *
@@ -97,6 +50,28 @@ public class StoreUserServiceImpl extends ServiceImpl<StoreUserMapper, StoreUser
      */
     @Override
     public R<StoreUserVo> createToKen(StoreUser storeUser) {
+        int effectiveTimeInt = Integer.parseInt(effectiveTime.substring(0, effectiveTime.length() - 1));
+        String effectiveTimeUnit = effectiveTime.substring(effectiveTime.length() - 1);
+        long effectiveTimeIntLong = 0L;
+        switch (effectiveTimeUnit) {
+            case "s": {
+                effectiveTimeIntLong = effectiveTimeInt * 1000L;
+                break;
+            }
+            case "m": {
+                effectiveTimeIntLong = effectiveTimeInt * 60L * 1000L;
+                break;
+            }
+            case "h": {
+                effectiveTimeIntLong = effectiveTimeInt * 60L * 60L * 1000L;
+                break;
+            }
+            case "d": {
+                effectiveTimeIntLong = effectiveTimeInt * 24L * 60L * 60L * 1000L;
+                break;
+            }
+        }
+
         StoreUserVo storeUserVo = new StoreUserVo();
         BeanUtils.copyProperties(storeUser, storeUserVo);
         Map<String, String> tokenMap = new HashMap<>();
@@ -104,7 +79,7 @@ public class StoreUserServiceImpl extends ServiceImpl<StoreUserMapper, StoreUser
         tokenMap.put("userName", storeUser.getName());
         tokenMap.put("userId", storeUser.getId().toString());
         tokenMap.put("userType", "store");
-        storeUserVo.setToken(JWTUtils.createToken(tokenMap));
+        storeUserVo.setToken(JwtUtil.createJWT("user_" + storeUser.getPhone(), storeUser.getName(), JSONObject.toJSONString(tokenMap), effectiveTimeIntLong));
         baseRedisService.setString("store_" + storeUser.getPhone(), storeUserVo.getToken());
         StoreInfo storeInfo = storeInfoMapper.selectById(storeUser.getStoreId());
         if (storeInfo != null) {
@@ -114,338 +89,4 @@ public class StoreUserServiceImpl extends ServiceImpl<StoreUserMapper, StoreUser
         return R.data(storeUserVo);
     }
 
-    /**
-     * 修改用户状态
-     *
-     * @param phone 手机号
-     * @param type  修改类型 (pass:密码状态改为1, face:人脸状态改为2)
-     * @return StoreUser
-     */
-    @Override
-    public boolean updateUserStatus(String phone, String type) {
-        LambdaQueryWrapper<StoreUser> lambdaQueryWrapper = new LambdaQueryWrapper<>();
-        lambdaQueryWrapper.eq(StoreUser::getPhone, phone);
-        StoreUser one = this.getOne(lambdaQueryWrapper);
-        if ("face".equals(type)) {
-            one.setPassType(2);
-        }
-        if ("pass".equals(type)) {
-            one.setPassType(2);
-        }
-        return this.updateById(one);
-    }
-
-    /**
-     * 修改密码
-     *
-     * @param id       主键
-     * @param password 密码
-     * @return boolean
-     */
-    @Override
-    public boolean updatePassword(Integer id, String password) {
-        StoreUser storeUser = new StoreUser();
-        storeUser.setId(id);
-        storeUser.setPassword(password);
-        return this.updateById(storeUser);
-    }
-
-    /**
-     * 设置用户信息
-     *
-     * @param id     主键
-     * @param name   姓名
-     * @param idCard 身份证号
-     * @return boolean
-     */
-    @Override
-    public boolean setUserInfo(Integer id, String name, String idCard) {
-        StoreUser storeUser = new StoreUser();
-        storeUser.setId(id);
-        storeUser.setName(name);
-        storeUser.setIdCard(idCard);
-        return this.updateById(storeUser);
-    }
-
-    /**
-     * 修改支付密码
-     *
-     * @param id          主键
-     * @param payPassword 支付密码
-     * @return boolean
-     */
-    @Override
-    public boolean setPayPassword(Integer id, String payPassword) {
-        StoreUser storeUser = new StoreUser();
-        storeUser.setId(id);
-        storeUser.setPayPassword(payPassword);
-        return this.updateById(storeUser);
-    }
-
-    @Override
-    public R<StoreUserVo> addStoreUser(StoreUserVo storeUserVo) {
-        //判断当前手机号是否存在
-        StoreUser phoneHave = storeUserMapper.selectOne(new LambdaQueryWrapper<StoreUser>().eq(StoreUser::getPhone, storeUserVo.getPhone()));
-        if (phoneHave != null) {
-            throw new RuntimeException("手机号已存在！！");
-        }
-        StoreUserVo vo = new StoreUserVo();
-        StoreUser storeUser = new StoreUser();
-        BeanUtils.copyProperties(storeUserVo, storeUser);
-        //存入密码类型为已修改  2025-4-22 业务修改
-        storeUser.setPassType(2);
-        int insert = storeUserMapper.insert(storeUser);
-        BeanUtils.copyProperties(storeUser, vo);
-        return R.data(vo);
-    }
-
-    @Override
-    public R<IPage<StoreUserVo>> getStoreUserList(int pageNum, int pageSize, String id, String phone, Integer status) {
-        IPage<StoreUser> page = new Page<>(pageNum, pageSize);
-        LambdaQueryWrapper<StoreUser> storeUserLambdaQueryWrapper = new LambdaQueryWrapper<>();
-        storeUserLambdaQueryWrapper.like(!StringUtils.isEmpty(id), StoreUser::getId, id);
-        storeUserLambdaQueryWrapper.like(!StringUtils.isEmpty(phone), StoreUser::getPhone, phone);
-        storeUserLambdaQueryWrapper.eq(status != null, StoreUser::getStatus, status);
-        storeUserLambdaQueryWrapper.orderByDesc(StoreUser::getCreatedTime);
-        IPage<StoreUser> storeUsers = storeUserMapper.selectPage(page, storeUserLambdaQueryWrapper);
-        IPage<StoreUserVo> storeUserVoIPage = new Page<>();
-        BeanUtils.copyProperties(storeUsers, storeUserVoIPage);
-        for (StoreUser storeUser : storeUserVoIPage.getRecords()) {
-            //不返回密码
-            storeUser.setPassword(null);
-            storeUser.setPayPassword(null);
-        }
-        return R.data(storeUserVoIPage);
-    }
-
-    @Override
-    public R<StoreUserVo> editStoreUser(StoreUser storeUser) {
-        storeUserMapper.updateById(storeUser);
-        StoreUserVo storeUserVo = new StoreUserVo();
-        BeanUtils.copyProperties(storeUser, storeUserVo);
-        return R.data(storeUserVo);
-    }
-
-    @Override
-    public void resetStoreUserPassword(StoreUser storeUser) {
-        StoreUser storeUserById = storeUserMapper.selectById(storeUser.getId());
-        //初始化密码赋值
-        storeUserById.setPassword(DEFAULT_PASSWORD);
-        storeUserById.setPayPassword(DEFAULT_PASSWORD);
-        storeUserMapper.updateById(storeUserById);
-    }
-
-    @Override
-    public void deleteStoreUser(String id) {
-        StoreUser storeUser = storeUserMapper.selectById(id);
-        String phone = storeUser.getPhone();
-        Integer storeId = storeUser.getStoreId();
-        storeUserMapper.deleteById(id);
-        //删除用户redis中的token
-        baseRedisService.delete("store_" + storeUser.getPhone());
-        //删除该账号的店铺
-        storeInfoMapper.delete(new LambdaQueryWrapper<StoreInfo>().eq(StoreInfo::getId, storeId));
-        //删除该账号的动态
-        lifeUserDynamicsMapper.delete(new LambdaQueryWrapper<LifeUserDynamics>().eq(LifeUserDynamics::getPhoneId, "store_" + phone));
-        //删除该账号关注的信息
-        lifeFansMapper.delete(new LambdaQueryWrapper<LifeFans>().eq(LifeFans::getFansId, "store_" + phone));
-        //删除关注该账号的信息
-        lifeFansMapper.delete(new LambdaQueryWrapper<LifeFans>().eq(LifeFans::getFollowedId, "store_" + phone));
-        //删除该账号的通知信息
-        lifeNoticeMapper.delete(new LambdaQueryWrapper<LifeNotice>().eq(LifeNotice::getReceiverId, "store_" + phone));
-        //删除该账号的发送消息信息
-        lifeMessageMapper.delete(new LambdaQueryWrapper<LifeMessage>().eq(LifeMessage::getSenderId, "store_" + phone));
-        //删除该账号的接受消息信息
-        lifeMessageMapper.delete(new LambdaQueryWrapper<LifeMessage>().eq(LifeMessage::getReceiverId, "store_" + phone));
-    }
-
-    @Override
-    public void switchingStates(StoreUser storeUserParam) {
-        StoreUser storeUser = storeUserMapper.selectById(storeUserParam.getId());
-        //如果当前为启用，则删除token
-        if (storeUser.getStatus() == 0) {
-            //删除用户redis中的token
-            baseRedisService.delete("store_" + storeUser.getPhone());
-        }
-        //根据当前状态切另一个状态
-        storeUser.setStatus(storeUser.getStatus() == 0 ? 1 : 0);
-        storeUserMapper.updateById(storeUser);
-    }
-
-    @Override
-    public String exportExcel(String id, String phone, String status) throws IOException {
-        // 定义格式化模式
-        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
-        // 先将 Date 转换为 Instant
-        List<StoreUser> storeUsers = storeUserMapper.selectList(
-                new LambdaQueryWrapper<StoreUser>()
-                        .like(StringUtils.isNotEmpty(id), StoreUser::getId, id)
-                        .like(StringUtils.isNotEmpty(phone), StoreUser::getPhone, phone)
-                        .eq(StringUtils.isNotEmpty(status), StoreUser::getStatus, status)
-        );
-        String fileName = UUID.randomUUID().toString().replace("-", "");
-        List<StoreUserExcelVo> storeUserExcelVoList = new ArrayList<>();
-        int serialNumber = 0;
-        for (StoreUser storeUser : storeUsers) {
-            StoreUserExcelVo storeUserExcelVo = new StoreUserExcelVo();
-            storeUserExcelVo.setSerialNumber(++serialNumber);
-            BeanUtils.copyProperties(storeUser, storeUserExcelVo);
-            Instant instant = storeUser.getCreatedTime().toInstant();
-            // 格式化时间
-            String formattedTime = instant.atZone(ZoneId.systemDefault()).toLocalDateTime().format(formatter);
-            storeUserExcelVo.setCreatedTime(formattedTime);
-            //格式化状态
-            storeUserExcelVo.setStatus(storeUser.getStatus() == 0 ? "启用" : "禁用");
-            storeUserExcelVoList.add(storeUserExcelVo);
-        }
-//        ExcelGenerator.generateExcel(excelPath + excelGeneratePath + fileName + ".xlsx", storeUserExcelVoList, StoreUserExcelVo.class);
-        return fileUrl + "excel" + excelGeneratePath + fileName + ".xlsx";
-
-    }
-
-
-    /**
-     * 注册校验
-     *
-     * @param phone
-     * @return
-     */
-    public boolean checkRegister(String phone) {
-        LambdaQueryWrapper<StoreUser> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(StoreUser::getPhone, phone);
-        queryWrapper.in(StoreUser::getStatus, 0, 1);
-        List<StoreUser> storeUsers = storeUserMapper.selectList(queryWrapper);
-        return CollectionUtils.isEmpty(storeUsers) ? Boolean.TRUE : Boolean.FALSE;
-
-
-    }
-
-    /**
-     * 注册
-     *
-     * @param phone
-     * @param password
-     * @return
-     */
-    @Override
-    public R<Boolean> register(String phone, String password) {
-
-        LambdaQueryWrapper<StoreUser> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(StoreUser::getPhone, phone)
-                .orderByDesc(StoreUser::getCreatedTime).last("LIMIT 1");
-        StoreUser storeUser = storeUserMapper.selectOne(queryWrapper);
-
-        List<Integer> noRegister = Arrays.asList(0, 1);
-
-        if (Objects.isNull((storeUser))) {
-            // 没有数据
-            saveNewUser(phone, password);
-            return R.success("操作成功");
-
-        } else if (noRegister.contains(storeUser.getStatus())) {
-            return R.fail("手机号已经注册过");
-        }
-
-        int daysSinceDeletion = DateUtils.subtraction(storeUser.getCreatedTime(), new Date());
-        if (daysSinceDeletion < 30) return R.fail(String.format("请于%d天后重新申请注册", 30 - daysSinceDeletion));
-        saveNewUser(phone, password);
-        return R.success("操作成功");
-
-    }
-
-
-    /**
-     * @param phone
-     * @return
-     */
-    @Override
-    public R<Boolean> checkLogin(String phone) {
-        LambdaQueryWrapper<StoreUser> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(StoreUser::getPhone, phone)
-                .orderByDesc(StoreUser::getCreatedTime).last("LIMIT 1");
-        StoreUser storeUser = storeUserMapper.selectOne(queryWrapper);
-        // 用户状态 0：启用，1：禁用，2:已注销
-        if (Objects.isNull(storeUser)) {
-            return R.success("用户不存在，快去注册吧！");
-        } else if (storeUser.getStatus() == 1) {
-            return R.success("账号已被禁用");
-        } else if (storeUser.getStatus() == 2) {
-            return R.success("账号已注销");
-        }
-        return R.success("success");
-    }
-
-
-    /**
-     * save User
-     *
-     * @param phone
-     * @param password
-     */
-    private void saveNewUser(String phone, String password) {
-        StoreUser registerStoreUser = new StoreUser();
-        registerStoreUser.setPhone(phone);
-        registerStoreUser.setPassword(password);
-        registerStoreUser.setPassType(2);
-        registerStoreUser.setMoney(0);
-        registerStoreUser.setDeleteFlag(0);
-        registerStoreUser.setStatus(0);
-        registerStoreUser.setIdCard("test");
-        registerStoreUser.setPassType(2);
-        registerStoreUser.setCreatedTime(new Date());
-        registerStoreUser.setLogoutFlag(0);
-        storeUserMapper.insert(registerStoreUser);
-    }
-
-    @Override
-    public void storeCancelAccount(StoreUserVo storeUserVo) {
-        // 通过id获取当前商家账号信息
-        LambdaQueryWrapper<StoreUser> storeUserLambdaQueryWrapper = new LambdaQueryWrapper<>();
-        storeUserLambdaQueryWrapper.eq(StoreUser::getId, storeUserVo.getId());
-        StoreUser storeUser = storeUserMapper.selectOne(storeUserLambdaQueryWrapper);
-        if (storeUser != null) {
-            if (null != storeUser.getStoreId()) {
-                StoreInfo storeInfo = storeInfoMapper.selectById(storeUser.getStoreId());
-                if (1 != storeInfo.getLogoutFlag()) {
-                    throw new RuntimeException("请先注销店铺再进行注销用户操作!");
-                }
-            }
-            // 修改注销标记为1
-            storeUser.setLogoutFlag(1);
-            // 添加注销原因
-            storeUser.setLogoutReason(storeUserVo.getLogoutReason());
-            // 添加注销申请时间
-            storeUser.setLogoutTime(new Date());
-            storeUserMapper.updateById(storeUser);
-        }
-    }
-
-    @Override
-    public void storeCancelAccountUn(StoreUserVo storeUserVo) {
-        // 通过id获取当前商家账号信息
-        LambdaQueryWrapper<StoreUser> storeUserLambdaQueryWrapper = new LambdaQueryWrapper<>();
-        storeUserLambdaQueryWrapper.eq(StoreUser::getId, storeUserVo.getId());
-        StoreUser storeUser = storeUserMapper.selectOne(storeUserLambdaQueryWrapper);
-        // 修改注销标记为0
-        storeUser.setLogoutFlag(0);
-        // 清空注销原因
-        storeUser.setLogoutReason(null);
-        // 清空注销申请时间
-        storeUser.setLogoutTime(null);
-        storeUserMapper.updateById(storeUser);
-    }
-
-    @Override
-    public List<String> getIds(String name, String phone) {
-        if (Objects.isNull(name) && Objects.isNull(phone)) return Arrays.asList("");
-        LambdaQueryWrapper<StoreUser> wrapper = new LambdaQueryWrapper<>();
-
-        List<Triple<Boolean, SFunction<StoreUser, ?>, Object>> conditions = new ArrayList<>();
-        conditions.add(Triple.of(StringUtils.isNotEmpty(name), StoreUser::getName, name));
-        conditions.add(Triple.of(StringUtils.isNotEmpty(phone), StoreUser::getPhone, phone));
-        FunctionMagic.buildLikeConditions(wrapper, conditions);
-        List<String> res = FunctionMagic.convertToIds(storeUserMapper.selectList(wrapper), StoreUser::getId);
-        return CollectionUtils.isEmpty(res) ? Arrays.asList("") : res;
-    }
-
 }

alien-gateway/src/main/java/shop/alien/gateway/util/DateUtils.java

@@ -1,114 +0,0 @@
-package shop.alien.gateway.util;
-
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.time.LocalDate;
-import java.time.ZoneId;
-import java.time.temporal.ChronoUnit;
-import java.util.Calendar;
-import java.util.Date;
-
-/**
- * 日期计算工具类
- *
- * @author ssk
- * @version 1.0
- * @date 2023/5/24 16:03
- */
-public class DateUtils {
-
-    public static void main(String[] args) throws ParseException {
-        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-//        Date date = calcHours(new Date(), 1);
-//        System.out.println(sdf.format(date));
-//
-//        boolean b = dateCompare(new Date(), date);
-//        System.out.println(b);
-
-
-        Date date1 = sdf.parse("2024-05-10 19:10:00");
-        Date date2 = sdf.parse("2024-05-10 19:11:00");
-        System.out.println(calcMinute(date1, 1));
-        System.out.println(dateCompare(date1, calcMinute(date1, 1)));
-
-    }
-
-    /**
-     * 天数加减
-     *
-     * @param date 日期
-     * @param days 加减天数
-     * @return 处理后的日期
-     */
-    public static Date calcDays(Date date, Integer days) {
-        Calendar c = Calendar.getInstance();
-        c.setTime(date);
-        c.add(Calendar.DAY_OF_MONTH, days);
-        return c.getTime();
-    }
-
-    /**
-     * 小时加减
-     *
-     * @param date  日期
-     * @param hours 加减时间
-     * @return 处理后的日期
-     */
-    public static Date calcHours(Date date, Integer hours) {
-        Calendar c = Calendar.getInstance();
-        c.setTime(date);
-        c.add(Calendar.HOUR_OF_DAY, hours);
-        return c.getTime();
-    }
-
-    /**
-     * 分钟加减
-     *
-     * @param date   日期
-     * @param minute 加减时间
-     * @return 处理后的日期
-     */
-    public static Date calcMinute(Date date, Integer minute) {
-        Calendar c = Calendar.getInstance();
-        c.setTime(date);
-        c.add(Calendar.MINUTE, minute);
-        return c.getTime();
-    }
-
-    /**
-     * 日期比较
-     *
-     * @param dateOne 日期1
-     * @param dateTwo 日期2
-     * @return 是否大于
-     */
-    public static boolean dateCompare(Date dateOne, Date dateTwo) {
-        return dateOne.compareTo(dateTwo) > 0;
-    }
-
-    /**
-     * 格式化日期
-     *
-     * @param date   日期
-     * @param format 格式
-     * @return 格式化后的日期
-     */
-    public static String formatDate(Date date, String format) {
-        if (format.isEmpty())
-            format = "yyyy-MM-dd HH:mm:ss";
-        SimpleDateFormat sdf = new SimpleDateFormat(format);
-        return sdf.format(date);
-    }
-
-    /**
-     * 时间相减
-     * @param start
-     * @return
-     */
-    public static int subtraction(Date start , Date end) {
-        LocalDate startDate = start.toInstant().atZone(ZoneId.systemDefault()).toLocalDate();
-        LocalDate endDate = end.toInstant().atZone(ZoneId.systemDefault()).toLocalDate();
-        return (int) ChronoUnit.DAYS.between(startDate, endDate);
-    }
-
-}

alien-gateway/src/main/java/shop/alien/gateway/util/ExcelExporter.java

@@ -1,95 +0,0 @@
-package shop.alien.gateway.util;
-
-import org.apache.poi.ss.usermodel.Row;
-import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.ss.usermodel.Workbook;
-import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-import org.springframework.util.StringUtils;
-import shop.alien.entity.store.LifeClassManage;
-import shop.alien.entity.store.vo.StoreCommentAppealVo;
-import shop.alien.entity.store.vo.StoreDynamicDiscountVo;
-import shop.alien.entity.store.vo.StoreInfoVo;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.text.SimpleDateFormat;
-import java.util.List;
-
-public class ExcelExporter {
-
-    public static <T> byte[] exportToExcel(List<T> data, String[] headers, String sheetName) throws IOException {
-        Workbook workbook = new XSSFWorkbook();
-        Sheet sheet = workbook.createSheet(sheetName);
-
-        Row headerRow = sheet.createRow(0);
-        for (int i = 0; i < headers.length; i++) {
-            headerRow.createCell(i).setCellValue(headers[i]);
-        }
-        SimpleDateFormat simpleFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-
-        int rowNum = 1;
-        for (T item : data) {
-            Row row = sheet.createRow(rowNum++);
-            if (item instanceof StoreInfoVo) {
-                StoreInfoVo storeInfoVo = (StoreInfoVo) item;
-                row.createCell(0).setCellValue(storeInfoVo.getStoreName());
-                row.createCell(1).setCellValue(storeInfoVo.getStoreContact());
-                row.createCell(2).setCellValue(storeInfoVo.getStorePhone());
-                row.createCell(3).setCellValue(storeInfoVo.getStoreTypeStr());
-                if (!StringUtils.isEmpty(storeInfoVo.getCreatedTime())) {
-                    String date = simpleFormat.format(storeInfoVo.getCreatedTime());
-                    row.createCell(4).setCellValue(date);
-                }
-//                row.createCell(6).setCellValue(storeInfoVo.getStoreState());
-            } else if (item instanceof StoreCommentAppealVo) {
-                StoreCommentAppealVo user = (StoreCommentAppealVo) item;
-                row.createCell(0).setCellValue(user.getStoreName());
-                row.createCell(1).setCellValue(user.getStoreContact());
-                row.createCell(2).setCellValue(user.getStorePhone());
-                row.createCell(3).setCellValue(user.getStoreTypeStr());
-                if (!StringUtils.isEmpty(user.getCreatedTime())) {
-                    String date = simpleFormat.format(user.getCreatedTime());
-                    row.createCell(4).setCellValue(date);
-                }
-                row.createCell(5).setCellValue(user.getCommentContent());
-                row.createCell(6).setCellValue(user.getAppealReason());
-                row.createCell(7).setCellValue(user.getAppealStatusStr());
-            } else if (item instanceof LifeClassManage) {
-                LifeClassManage manage = (LifeClassManage) item;
-                row.createCell(0).setCellValue(manage.getClassName());
-                row.createCell(1).setCellValue(manage.getClassLength());
-                row.createCell(2).setCellValue(manage.getClassTeacher());
-                row.createCell(3).setCellValue(manage.getPlayCount());
-                row.createCell(4).setCellValue(manage.getClassBigType());
-                if (!StringUtils.isEmpty(manage.getCreatedTime())) {
-                    String date = simpleFormat.format(manage.getCreatedTime());
-                    row.createCell(5).setCellValue(date);
-                }
-                if (!StringUtils.isEmpty(manage.getClassState())) {
-                    row.createCell(6).setCellValue(manage.getClassState().equals("1") ? "正常" : "隐藏");
-                }
-            } else if (item instanceof StoreDynamicDiscountVo) {
-                StoreDynamicDiscountVo dynamicDiscountVo = (StoreDynamicDiscountVo) item;
-                row.createCell(0).setCellValue(dynamicDiscountVo.getActivityNo());
-                row.createCell(1).setCellValue(dynamicDiscountVo.getActivityName());
-                row.createCell(2).setCellValue(dynamicDiscountVo.getCreatedTime());
-                row.createCell(3).setCellValue(dynamicDiscountVo.getActivityStartTime() + " - " + dynamicDiscountVo.getActivityEndTime());
-                switch (dynamicDiscountVo.getStatus()) {
-                    case 0:
-                        row.createCell(4).setCellValue("待审核");
-                        break;
-                    case 1:
-                        row.createCell(4).setCellValue("已通过");
-                        break;
-                    case 2:
-                        row.createCell(4).setCellValue("已拒绝");
-                        break;
-                }
-            }
-        }
-        ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
-        workbook.write(outputStream);
-        workbook.close();
-        return outputStream.toByteArray();
-    }
-}

alien-gateway/src/main/java/shop/alien/gateway/util/ExcelGenerator.java

@@ -1,126 +0,0 @@
-package shop.alien.gateway.util;
-
-import org.apache.poi.ss.usermodel.*;
-import org.apache.poi.xssf.usermodel.XSSFClientAnchor;
-import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-
-import java.io.ByteArrayOutputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.lang.reflect.Field;
-import java.net.URL;
-import java.util.List;
-
-public class ExcelGenerator {
-
-    public static <T> void generateExcel(String filePath, List<T> dataList, Class<T> clazz) throws IOException {
-        // 创建一个新的工作簿
-        XSSFWorkbook workbook = new XSSFWorkbook();
-        // 创建一个工作表
-        Sheet sheet = workbook.createSheet("Sheet1");
-
-        // 获取类的所有字段
-        Field[] fields = clazz.getDeclaredFields();
-
-        // 创建加粗字体
-        Font headerFont = workbook.createFont();
-        headerFont.setBold(true);
-
-        // 创建表头样式并应用字体
-        CellStyle headerCellStyle = workbook.createCellStyle();
-        headerCellStyle.setFont(headerFont);
-
-        // 创建表头
-        Row headerRow = sheet.createRow(0);
-        for (int i = 0; i < fields.length; i++) {
-            Field field = fields[i];
-            ExcelHeader excelHeader = field.getAnnotation(ExcelHeader.class);
-            String headerName;
-            if (excelHeader != null) {
-                headerName = excelHeader.value();
-            } else {
-                headerName = field.getName();
-            }
-            Cell cell = headerRow.createCell(i);
-            cell.setCellValue(headerName);
-//            Cell cell = headerRow.createCell(i);
-//            cell.setCellValue(fields[i].getName());
-            cell.setCellStyle(headerCellStyle);
-        }
-
-        // 添加数据
-        for (int i = 0; i < dataList.size(); i++) {
-            Row row = sheet.createRow(i + 1);
-
-            T obj = dataList.get(i);
-            for (int j = 0; j < fields.length; j++) {
-                Field field = fields[j];
-                field.setAccessible(true);
-                if (field.isAnnotationPresent(ExcelImage.class)) {
-                    row.setHeightInPoints(80); // 数据行行高
-                    try {
-                        String imageUrl = (String) field.get(obj);
-                        if (imageUrl != null && !imageUrl.isEmpty()) {
-                            try (InputStream is = new URL(imageUrl).openStream();
-                                 ByteArrayOutputStream baos = new ByteArrayOutputStream()) {
-                                byte[] buffer = new byte[1024];
-                                int length;
-                                while ((length = is.read(buffer)) != -1) {
-                                    baos.write(buffer, 0, length);
-                                }
-                                byte[] imageBytes = baos.toByteArray();
-                                int pictureIndex = workbook.addPicture(imageBytes, Workbook.PICTURE_TYPE_JPEG);
-                                // 去掉泛型参数 <Sheet>
-                                Drawing patriarch = sheet.createDrawingPatriarch();
-                                ClientAnchor anchor = new XSSFClientAnchor(0, 0, 0, 0, (short) j, i + 1, (short) (j + 1), i + 2);
-                                patriarch.createPicture(anchor, pictureIndex);
-                            } catch (Exception e) {
-                                e.printStackTrace();
-                                Cell cell = row.createCell(j);
-                                cell.setCellValue("图片加载失败");
-                            }
-                        } else {
-                            Cell cell = row.createCell(j);
-                            cell.setCellValue("");
-                        }
-                    } catch (Exception e) {
-                        e.printStackTrace();
-                        Cell cell = row.createCell(j);
-                        cell.setCellValue("图片加载失败");
-                    }
-                } else {
-                    // 常规字段处理（保持原有）...
-                    try {
-                        Object value = field.get(obj);
-                        Cell cell = row.createCell(j);
-                        if (value != null) {
-                            cell.setCellValue(value.toString());
-                        }
-                    } catch (IllegalAccessException e) {
-                        e.printStackTrace();
-                    }
-                }
-
-            }
-        }
-
-        // 自动调整列宽
-        for (int i = 0; i < fields.length; i++) {
-//            sheet.autoSizeColumn(i);
-            sheet.setColumnWidth(i, Math.max(sheet.getColumnWidth(i), 15 * 256));
-            // 处理图片列等特殊情况，确保列宽足够
-            if (fields[i].isAnnotationPresent(ExcelImage.class)) {
-                sheet.setColumnWidth(i, Math.max(sheet.getColumnWidth(i), 12 * 256)); // 图片列适当加宽
-            }
-        }
-
-        // 将工作簿写入文件
-        try (FileOutputStream fileOut = new FileOutputStream(filePath)) {
-            workbook.write(fileOut);
-        }
-
-        // 关闭工作簿
-        workbook.close();
-    }
-}    

alien-gateway/src/main/java/shop/alien/gateway/util/ExcelHeader.java

@@ -1,12 +0,0 @@
-package shop.alien.gateway.util;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.FIELD)
-public @interface ExcelHeader {
-    String value();
-}

alien-gateway/src/main/java/shop/alien/gateway/util/ExcelImage.java

@@ -1,11 +0,0 @@
-package shop.alien.gateway.util;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.FIELD)
-public @interface ExcelImage {
-}

alien-gateway/src/main/java/shop/alien/gateway/util/FileUpload.java

@@ -1,62 +0,0 @@
-package shop.alien.gateway.util;
-
-import com.alibaba.nacos.api.config.annotation.NacosValue;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.web.multipart.MultipartFile;
-
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-
-@Configuration
-public class FileUpload {
-
-    @NacosValue("${spring.web.resources.static-locations}")
-    private String uploadDir;
-
-    public String saveImage(MultipartFile image) {
-        try {
-            String cleanUploadDir = uploadDir.replace("file:///", "").replace("\\", "/");
-            Path path = Paths.get(cleanUploadDir, image.getOriginalFilename());
-            Files.createDirectories(path.getParent());
-            Files.write(path, image.getBytes());
-            return image.getOriginalFilename();
-        } catch (IOException e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-//    public String getVideoDuration(MultipartFile image) {
-//        String cleanUploadDir = uploadDir.replace("file:///", "").replace("\\", "/");
-//        Path path = Paths.get(cleanUploadDir, image.getOriginalFilename());
-//        try (FFmpegFrameGrabber grabber = new FFmpegFrameGrabber(path.toString())) {
-//            String fileExtension = getFileExtension(path.toString());
-//            if ("mp4".equalsIgnoreCase(fileExtension)) {
-//                grabber.setFormat("mp4");
-//            } else if ("avi".equalsIgnoreCase(fileExtension)) {
-//                grabber.setFormat("avi");
-//            } else if ("mkv".equalsIgnoreCase(fileExtension)) {
-//                grabber.setFormat("matroska");
-//            }
-//            grabber.start();
-//            double durationInSeconds = grabber.getLengthInTime() / 1_000_000.0;
-//            grabber.stop();
-//            long hours = (long) durationInSeconds / 3600;
-//            long minutes = (long) (durationInSeconds % 3600) / 60;
-//            long seconds = (long) (durationInSeconds % 60);
-//            return String.format("%dh %dm %ds", hours, minutes, seconds);
-//        } catch (Exception e) {
-//            e.printStackTrace();
-//            return "获取时长失败";
-//        }
-//    }
-
-//    private String getFileExtension(String filePath) {
-//        File file = new File(filePath);
-//        String name = file.getName();
-//        int lastIndexOfDot = name.lastIndexOf('.');
-//        return (lastIndexOfDot == -1) ? "" : name.substring(lastIndexOfDot + 1);
-//    }
-}

alien-gateway/src/main/java/shop/alien/gateway/util/FunctionMagic.java

@@ -1,315 +0,0 @@
-package shop.alien.gateway.util;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.support.SFunction;
-import org.apache.commons.lang3.tuple.Triple;
-import org.springframework.data.geo.Distance;
-import org.springframework.data.geo.GeoResult;
-import org.springframework.data.redis.connection.RedisGeoCommands;
-import org.springframework.util.CollectionUtils;
-import shop.alien.entity.store.LifeUser;
-import shop.alien.entity.store.StoreUser;
-import shop.alien.entity.store.dto.NearMeDto;
-import shop.alien.gateway.util.constant.Constant;
-
-import java.util.*;
-import java.util.function.*;
-import java.util.stream.Collectors;
-
-/**
- * Magic wand
- */
-public class FunctionMagic {
-
-    /**
-     * Magic for
-     * @param list
-     * @param processor
-     * @param <T>
-     */
-    public static <T> void processList (List<T>list , Consumer<T> processor){
-        Optional.ofNullable(list).ifPresent(l -> l.forEach(processor));
-    }
-
-
-    /**
-     * Magic default for
-     * @param list
-     * @param processor
-     * @param defaultSupplier
-     * @param <T>
-     */
-
-    public static <T> void processList(List<T> list, Consumer<T> processor, Supplier<List<T>> defaultSupplier) {
-        List<T> target = CollectionUtils.isEmpty(list) ? defaultSupplier.get() : list;
-        target.forEach(processor);
-    }
-
-
-    /**
-     * Magic for GeoResult
-     * @param targetList
-     * @return
-     * @param <T>
-     */
-    public static <T> Consumer<GeoResult<RedisGeoCommands.GeoLocation<T>>> createGeoMagic(List<T> targetList) {
-        return geoResult ->
-                Optional.ofNullable(geoResult).
-                map(GeoResult::getContent).
-                map(RedisGeoCommands.GeoLocation::getName).
-                ifPresent(targetList::add);
-    }
-
-
-    /**
-     * Magic for NearMeDto
-     * @param targetList
-     * @return
-     * @param
-     */
-    public static Consumer<GeoResult<RedisGeoCommands.GeoLocation<String>>> createNearMeDtoConsumer(List<NearMeDto> targetList) {
-        return geoResult -> Optional.ofNullable(geoResult).
-                map(GeoResult::getContent).
-                ifPresent(content -> {
-                    String name = content.getName();
-                    Distance distance = geoResult.getDistance();
-                    if (isNonNull(name).test(distance)) targetList.add(new NearMeDto(name, distance.getValue()));
-                });
-    }
-
-    /**
-     * Magic isNonNull
-     * @param var2
-     * @return
-     * @param <T>
-     * @param <R>
-     */
-    public static <T, R> Predicate<T> isNonNull(R var2) {
-        return var1 -> Objects.nonNull(var1) && Objects.nonNull(var2);
-    }
-
-
-
-    /**
-     * Magic isEmptyMagic
-     * @param valueToCheck
-     * @param columnExtractor
-     * @param queryExecutor
-     * @return
-     * @param <T>
-     * @param <R>
-     * @param <V>
-     */
-    public static <T, R, V> boolean isEmptyMagic(
-            V valueToCheck,
-            SFunction<T, R> columnExtractor,
-            SFunction<LambdaQueryWrapper<T>, T> queryExecutor) {
-
-        if (valueToCheck == null) return true;
-
-        LambdaQueryWrapper<T> wrapper = new LambdaQueryWrapper<>();
-        wrapper.select(columnExtractor);
-        wrapper.eq(columnExtractor, valueToCheck);
-        wrapper.last("LIMIT 1");
-
-        T entity = queryExecutor.apply(wrapper);
-        R columnValue = Optional.ofNullable(entity).map(columnExtractor).orElse(null);
-        return columnValue != null;
-    }
-
-
-    /**
-     * Magic buildLikeConditions
-     * @param wrapper
-     * @param conditions
-     * @param <T>
-     */
-    public static <T> void buildLikeConditions(
-            LambdaQueryWrapper<T> wrapper,
-            List<Triple<Boolean, SFunction<T, ?>, Object>> conditions){
-        conditions.forEach(condition -> wrapper.like(condition.getLeft(), condition.getMiddle(), condition.getRight()));
-    }
-
-    /**
-     * Magic convertToIds
-     * @param list
-     * @param idExtractor
-     * @return
-     * @param <T>
-     */
-    public static <T> List<String> convertToIds(
-            List<T> list,
-            Function<T, ?> idExtractor){
-        return Optional.ofNullable(list).
-                orElse(Collections.emptyList()).
-                stream().map(idExtractor).
-                filter(Objects::nonNull).
-                map(Object::toString).
-                collect(Collectors.toList());
-    }
-
-    /**
-     * Magic isListFlag
-     * @param list
-     * @param list1
-     * @return
-     * @param <T>
-     */
-
-    public static <T> boolean isListFlag(
-            List<T> list,
-            List<T> list1
-            ){
-        return !(Objects.equals(list.get(0), "") && Objects.equals(list1.get(0), ""));
-
-    }
-
-    /**
-     * Magic populateUserInfo
-     * @param dto
-     * @param userType
-     * @param userId
-     * @param userQuery
-     * @param nameSetter
-     * @param phoneSetter
-     * @param <T>
-     * @param <D>
-     */
-    public static <T, D> void populateUserInfo(
-            D dto,
-            String userType,
-            String userId,
-            Function<String, T> userQuery,
-            BiConsumer<D, String> nameSetter,
-            BiConsumer<D, String> phoneSetter) {
-
-        T user = Optional.ofNullable(userId)
-                .map(userQuery)
-                .orElseThrow(() -> new RuntimeException("User not found"));
-
-        if("1".equals(userType)) {
-            // M类型处理逻辑
-            if(user instanceof StoreUser) {
-                StoreUser storeUser = (StoreUser) user;
-                nameSetter.accept(dto, storeUser.getName());
-                phoneSetter.accept(dto, storeUser.getPhone());
-            }
-        } else {
-            // U类型处理逻辑
-            if(user instanceof LifeUser) {
-                LifeUser lifeUser = (LifeUser) user;
-                nameSetter.accept(dto, lifeUser.getUserName());
-                phoneSetter.accept(dto, lifeUser.getUserPhone());
-            }
-        }
-    }
-
-
-    /**
-     * Magic  handleUserInfo
-     * @param userType
-     * @param userId
-     * @param storeQuery
-     * @param lifeQuery
-     * @param consumer
-     * @param <T>
-     */
-
-    public static <T> void handleUserInfo(
-            String userType,
-            String userId,
-            Function<String, T> storeQuery,
-            Function<String, T> lifeQuery,
-            Consumer<T> consumer) {
-        if (userId == null) return;
-        T user = Constant.SEQUENCE_1.equals(userType) ?
-                storeQuery.apply(userId) :
-                lifeQuery.apply(userId);
-        if (user != null) {
-            consumer.accept(user);
-        }
-    }
-
-
-    /**
-     * Magic idQueryWrapper
-     * @param userId
-     * @return
-     * @param <T>
-     */
-    public static <T> QueryWrapper<T > idQueryWrapper(String userId) {
-        return new QueryWrapper<T>().eq("id", userId).last("OR (delete_flag = 1 AND id = " + userId + ") limit 1"); // 强制包含已删除的记录;
-    }
-
-
-    // 举报内容
-    private static final Map<String, String> CONTEXT = new HashMap<>();
-    static {
-        CONTEXT.put("1", "用户");
-        CONTEXT.put("2", "动态");
-        CONTEXT.put("3", "评论");
-    }
-
-
-    // 举报理由
-    private static final Map<String, String> VIOLATION = new HashMap<>();
-    static {
-        VIOLATION.put("1", "用户违规");
-        VIOLATION.put("2", "色情低俗");
-        VIOLATION.put("3", "违法违规");
-        VIOLATION.put("4", "谩骂嘲讽、煽动对立");
-        VIOLATION.put("5", "涉嫌诈骗");
-        VIOLATION.put("6", "人身攻击");
-        VIOLATION.put("7", "种族歧视");
-        VIOLATION.put("8", "政治敏感");
-        VIOLATION.put("9", "虚假、不实内容、违反公德秩序");
-        VIOLATION.put("10", "违反公德秩序");
-        VIOLATION.put("11", "危害人身安全");
-        VIOLATION.put("12", "网络暴力");
-        VIOLATION.put("13", "其他原因");
-    }
-
-
-    // 状态
-    private static final Map<String, String> STATUS = new HashMap<>();
-    static {
-        STATUS.put("0", "待处理");
-        STATUS.put("1", "已通过");
-        STATUS.put("2", "已驳回");
-    }
-
-
-    public static String getByCode(String statusCode, Map<String, String> mapping) {
-        return Optional.ofNullable(mapping.get(statusCode))
-                .orElseThrow(() -> new IllegalArgumentException("非法状态码: " + statusCode));
-    }
-
-
-    // 举报内容
-    public static String getContext(String statusCode) {
-        return getByCode(statusCode, CONTEXT);
-    }
-
-    // 举报理由
-    public static String violation(String statusCode) {
-        return getByCode(statusCode, VIOLATION);
-    }
-
-
-
-    // 状态
-    public static String status(String statusCode) {
-        return getByCode(statusCode, STATUS);
-    }
-
-
-
-
-
-
-
-
-
-
-}

alien-gateway/src/main/java/shop/alien/gateway/util/RandomCreateUtil.java

@@ -1,69 +0,0 @@
-package shop.alien.gateway.util;
-
-import org.springframework.stereotype.Component;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-import java.util.Random;
-import java.util.concurrent.ThreadLocalRandom;
-import java.util.stream.Collectors;
-
-/**
- * 生成随机数工具类
- *
- * @author ssk
- * @version 1.0
- * @date 2024/12/12 15:17
- */
-@Component
-public class RandomCreateUtil {
-
-    /**
-     * 生成随机数
-     *
-     * @param length 位数
-     * @return 随机数
-     */
-    public String getRandomNum(Integer length) {
-        List<String> list = Arrays.asList("0", "1", "2", "3", "4", "5", "6", "7", "8", "9");
-        Collections.shuffle(list);
-        List<String> collect = list.stream().limit(length).collect(Collectors.toList());
-        StringBuilder stringBuilder = new StringBuilder();
-        collect.forEach(stringBuilder::append);
-        return stringBuilder.toString();
-    }
-
-    /**
-     * 生成随机数
-     *
-     * @param min 最小值
-     * @param max 最大值
-     * @return 随机数
-     */
-    public Integer getRandomNum(Integer min, Integer max) {
-        Random random = new Random();
-        return random.nextInt((max - min) + 1) + min;
-    }
-
-    /**
-     * 生成随机字符串
-     *
-     * @param length 长度
-     * @return 字符串
-     */
-    public String getRandomNStr(Integer length) {
-        StringBuilder sb = new StringBuilder();
-        String chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
-        for (int i = 0; i < length; i++) {
-            int index = ThreadLocalRandom.current().nextInt(chars.length());
-            sb.append(chars.charAt(index));
-        }
-        return sb.toString();
-    }
-
-    public static void main(String[] args) {
-        RandomCreateUtil randomCreateUtil = new RandomCreateUtil();
-        System.out.println(randomCreateUtil.getRandomNStr(20));
-    }
-}

alien-gateway/src/main/java/shop/alien/gateway/util/constant/Constant.java

@@ -1,39 +0,0 @@
-package shop.alien.gateway.util.constant;
-
-/**
- * 常量
- */
-public class Constant {
-
-    // 主键
-    public static final String GEO_STORE_PRIMARY = "GEO_STORE_PRIMARY";
-
-    // name
-    public static final String GEO_STORE_NAME = "GEO_STORE_NAME";
-
-    public static final Integer LIMIT_COUNT = 100;
-
-
-    // 举报用户类型(1：商户，2：用户)
-    public static final String REPORTING_USER_TYPE = "reporting_user_type";
-
-    // 举报用户ID
-    public static final String REPORTING_USER_ID = "reporting_user_id";
-
-
-    public static final String PROCESSING_STATUS = "processing_status";
-
-    // 序列
-    public static final String SEQUENCE_1 = "1";
-    public static final String SEQUENCE_2 = "2";
-
-
-    // 序列
-    public static final Integer SEQUENCE_NUM_1 = 1;
-    public static final Integer SEQUENCE_NUM_2 = 2;
-
-    // 符号
-    public static final String SYMBOL_1  = ",";
-
-
-}

alien-gateway/src/main/java/shop/alien/gateway/util/constant/DiscountCouponEnum.java

@@ -1,82 +0,0 @@
-package shop.alien.gateway.util.constant;
-
-/**
- * 优惠券相关功能枚举
- * */
-public enum DiscountCouponEnum {
-    /**用户优惠券状态*/
-    //待使用
-    WAITING_USED("0"),
-    //已使用
-    HAVE_BEEN_USED("1"),
-    //已作废
-    HAVE_BEEN_VOIDED("2"),
-
-    /**商家优惠券状态*/
-    //进行中
-    UNDER_WAY("0"),
-    //已结束
-    FINISHED("1"),
-    //未开始
-    HAVE_NOT_STARTED("2"),
-    //暂停领取
-    SUSPEND_GET("3"),
-    //已售罄
-    HAVE_SOLD_OUT("4"),
-
-    /**限制使用规则*/
-    //周规则限制
-    WEEKDAY_UNAVAILABLE("weekday_unavailable"),
-    //节日规则限制
-    HOLIDAY_UNAVAILABLE("holiday_unavailable"),
-
-    /**领取规则*/
-    CLAIM_RULE("claim_rule"),
-    //每日一领
-    DAY("day"),
-    //每周一领
-    WEEK("WEEK"),
-    //每月一领
-    MONTH("MONTH"),
-    //每年一领
-    YEAR("year"),
-
-    /**条件类型*/
-    //所有
-    ALL("0"),
-    //即将过期
-    BE_ABOUT_TO_EXPORE("1"),
-    //已使用
-    HAVE_ALREADY_APPLIED("2"),
-    //已过期
-    HAVE_EXPIRED("3"),
-
-    /**优惠券领取规则*/
-    //可以领取
-    CAN_GET("1"),
-    //不可以领取
-    NO_GET("0"),
-
-    //占位最后一位
-    KEY("VALUE");
-
-    // 属性值
-    private final String description;
-    // 构造方法，用于初始化描述信息
-    DiscountCouponEnum(String description) {
-        this.description = description;
-    }
-    // 获取Value的方法
-    public String getValue() {
-        return description;
-    }
-
-// 测试带属性和方法的枚举的使用
-    public static void main(String[] args) {
-        DiscountCouponEnum discountCouponEnum = DiscountCouponEnum.WAITING_USED;
-        System.out.println("用户优惠券状态：" + discountCouponEnum);
-        System.out.println("值是：" + discountCouponEnum.getValue());
-    }
-
-}
-

alien-store/src/main/java/shop/alien/store/util/ExcelExporter.java

@@ -6,9 +6,9 @@ import org.apache.poi.ss.usermodel.Workbook;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.springframework.util.StringUtils;
 import shop.alien.entity.store.LifeClassManage;
-import shop.alien.entity.store.vo.StoreCommentAppealVo;
-import shop.alien.entity.store.vo.StoreDynamicDiscountVo;
-import shop.alien.entity.store.vo.StoreInfoVo;
+import shop.alien.store.entity.vo.StoreCommentAppealVo;
+import shop.alien.store.entity.vo.StoreDynamicDiscountVo;
+import shop.alien.store.entity.vo.StoreInfoVo;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;