fix 分离

midjourney/src/main/java/com/yhlxj/dao/mapper/GoodsDonMapper.java

@@ -0,0 +1,12 @@
+package com.yhlxj.dao.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yhlxj.dao.model.entity.GoodsDon;
+
+/**
+ * @author chan
+ * @date 2022/9/27 5:31 PM
+ */
+public interface GoodsDonMapper extends BaseMapper<GoodsDon> {
+
+}

midjourney/src/main/java/com/yhlxj/dao/mapper/GoodsDonSkuMapper.java

@@ -0,0 +1,14 @@
+package com.yhlxj.dao.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yhlxj.dao.model.entity.GoodsDonSku;
+
+import java.util.List;
+
+/**
+ * @author chan
+ * @date 2022/9/26 6:54 PM
+ */
+public interface GoodsDonSkuMapper  extends BaseMapper<GoodsDonSku> {
+
+}

midjourney/src/main/java/com/yhlxj/dao/mapper/GroupsMapper.java

@@ -0,0 +1,11 @@
+package com.yhlxj.dao.mapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yhlxj.dao.model.entity.GroupsTrips;
+
+
+/**
+ * @author chan
+ * @date 2022/9/27 4:24 PM
+ */
+public interface GroupsMapper extends BaseMapper<GroupsTrips> {
+}

midjourney/src/main/java/com/yhlxj/dao/mapper/GroupsRelationMapper.java

@@ -0,0 +1,12 @@
+package com.yhlxj.dao.mapper;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yhlxj.dao.model.entity.GroupsRelation;
+
+/**
+ * @author chan
+ * @date 2022/9/27 11:10 AM
+ */
+public interface GroupsRelationMapper extends BaseMapper<GroupsRelation> {
+}

midjourney/src/main/java/com/yhlxj/dao/model/entity/GoodsDon.java

@@ -0,0 +1,248 @@
+package com.yhlxj.dao.model.entity;
+
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.ejlchina.searcher.bean.DbIgnore;
+import com.ejlchina.searcher.bean.SearchBean;
+import com.yhlxj.dao.model.BaseEntity;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * @author chan
+ * @date 2022/9/26 4:58 PM
+ */
+@Getter
+@Setter
+@SearchBean(tables = "goods_don g",
+        where = ":condition:")
+public class GoodsDon extends BaseEntity {
+
+
+    /**
+     * 商品录入人
+     */
+    private String writer;
+
+    /**
+     * 标签
+     */
+    private String tags;
+
+    /**
+     * 商品名称
+     */
+    private String title;
+
+    /**
+     * 缩略图
+     */
+    private String logo;
+
+    /**
+     * 背景图
+     */
+    private String img;
+
+    /**
+     * 视频封面
+     */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
+    private String videoCover;
+
+
+    /**
+     * true 上架 / false 下架
+     */
+    private Boolean status;
+
+    /**
+     * true 存在 / false 删除
+     */
+    private Boolean deleted;
+
+    /**
+     * 详情
+     */
+    private String detail;
+
+    /**
+     * 描述
+     */
+    private String remark;
+
+    /**
+     * 1.虚拟，2.实物，3.潮玩，4.租赁
+     */
+    private Integer type;
+
+    /**
+     * 分类
+     * 1、AI  2、流媒体
+     */
+    private Long category;
+
+    @DbIgnore
+    @TableField(exist = false)
+    private List<Long> categoryList;
+
+    /**
+     * 二级分类
+     * 虚物品 1邀请制 2非邀请制
+     */
+    private Integer secondType;
+
+    private String banner;
+
+    /**
+     * 商品搭配图
+     */
+    private String matchImg;
+
+
+    /**
+     * 是否贴片 false
+     */
+    private Boolean isPatch;
+
+    /**
+     * H5标签
+     */
+    private String mobileTags;
+
+    /**
+     * 平台分销比例
+     */
+    private Integer rate;
+
+    /**
+     * 第二分销比例 不包含套餐
+     */
+    private Integer secondRate;
+
+    /**
+     * 排序
+     */
+    private Integer sortBy;
+
+    /**
+     * 虚拟销量
+     */
+    private Integer virtualSold;
+
+    /**
+     * 最小规格价格
+     */
+    private BigDecimal minPrice;
+
+    /**
+     * 最小规格价格月份
+     */
+    private Integer minMonths;
+
+    /**
+     * 最小规格 天数
+     */
+    private Integer minDays;
+
+    /**
+     * 最大规格价格
+     */
+    private BigDecimal maxPrice;
+
+    /**
+     * 最大规格价格月份
+     */
+    private Integer maxMonths;
+
+    /**
+     * 最大规格 天数
+     */
+    private Integer maxDays;
+
+    /**
+     * 付款说明
+     */
+    private String payDesc;
+
+    /**
+     * 购买说明
+     */
+    private String buyDesc;
+
+    /**
+     * 特殊类型
+     */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
+    private SpecialType specialType;
+
+    /**
+     * 视频
+     */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
+    private String video;
+
+    /**
+     * 推荐标题
+     */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
+    private String recommendTitle;
+
+    @TableField(exist = false)
+    @DbIgnore
+    private List<Long> recommendGoodsList;
+
+    /**
+     * 推荐平台
+     */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
+    private String recommendGoods;
+
+    @TableField(exist = false)
+    @DbIgnore
+    private BigDecimal price;
+
+    @TableField(exist = false)
+    @DbIgnore
+    private Integer soldNum;
+
+    @TableField(exist = false)
+    @DbIgnore
+    private Integer accountCount;
+
+    /**
+     * 是否是特定价格 规格平台
+     */
+    private Boolean isSp;
+
+    /**
+     * 是否有专属用户规格属性
+     */
+    private Boolean isOwns;
+
+    /**
+     * 是否参与分销 默认参与
+     */
+    private Boolean isDistribute;
+
+    /**
+     * 是否开启规格分销 默认未开启
+     */
+    private Boolean isSkuDistribute;
+
+    @AllArgsConstructor
+    @Getter
+    public enum SpecialType {
+        recharge("代充"),
+        courseware("课程"),
+        giftCard("礼品卡")
+        ;
+
+        private String desc;
+
+    }
+}

midjourney/src/main/java/com/yhlxj/dao/model/entity/GoodsDonSku.java

@@ -0,0 +1,235 @@
+package com.yhlxj.dao.model.entity;
+
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.cyksj.model.views.DistributeSearchView;
+import com.cyksj.model.views.GoodsDiscountPlusPurchaseRelationFrontView;
+import com.ejlchina.searcher.bean.DbIgnore;
+import com.ejlchina.searcher.bean.SearchBean;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.yhlxj.dao.model.BaseEntity;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * @author chan
+ * @date 2022/9/26 4:58 PM
+ */
+@Getter
+@Setter
+@SearchBean(tables = "goods_don_sku",
+		where = ":condition:")
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class GoodsDonSku extends BaseEntity {
+
+    private Long goodsId;
+
+
+    private String subTitle;
+
+    /**
+     * 商品规格 ids
+     */
+    private String specIds;
+
+    /**
+     * 重复校验规格ids
+     */
+    private String dupSpecIds;
+
+    /**
+     * 商品规格 value
+     */
+    private String specVal;
+
+    /**
+     * 商品规格 json
+     */
+    private String specJson;
+
+    /**
+     * 规格说明信息
+     */
+    private String notifyText;
+
+    /**
+     * H5标签
+     */
+    private String mobileTags;
+
+    /**
+     * 规格背景图
+     */
+    private String img;
+
+    /**
+     * 规格框提示
+     */
+    private String smallMsg;
+
+    /**
+     * 双重验证码次数
+     */
+    private Integer codeNum;
+
+    /**
+     * 商品预览图
+     */
+    private String picture;
+
+    /**
+     * 商品详情图
+     */
+    private String detail;
+
+    /**
+     * 标签
+     */
+    private String tags;
+
+
+    /**
+     * true 上架 / false 下架
+     */
+    private Boolean status;
+
+
+    /**
+     * 车位数
+     */
+    private Integer num;
+
+    /**
+     * 价格
+     */
+    private BigDecimal price;
+
+    /**
+     * 专属用户规格
+     */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
+    private String userOwns;
+
+    /**
+     * 专属用户列表
+     */
+    @DbIgnore
+    @TableField(exist = false)
+    private List<DistributeSearchView> userOwnsList;
+
+    /**
+     * 是否开启实物车票时长权益
+     */
+    private Boolean isBenefits;
+
+    /**
+     * 权益列表
+     */
+    private String benefitsList;
+
+    /**
+     * 月数
+     */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
+    private Integer months;
+
+    /**
+     * 天数
+     */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
+    private Integer days;
+
+//    @DbField("case when spec_val like '%月%' and spec_val not like '%年%' then 0 when spec_val like '%季%' then 1 when spec_val like '%半年%' then 2 when spec_val like '%年%' then 3 else 66 end")
+//    @TableField(exist = false)
+//    private Integer orderBy;
+
+    /**
+     * 加购规格
+     */
+    @DbIgnore
+    @TableField(exist = false)
+    private List<GoodsDiscountPlusPurchaseRelation> dpSku;
+
+    /**
+     * 是否是优惠加购规格
+     */
+    private Boolean isDp;
+
+    /**
+     * 是否是镜像服务
+     */
+    private Boolean isMirror;
+
+    /**
+     * 是否是车队形式
+     */
+    private Boolean isCar;
+
+    /**
+     * 限制次数
+     */
+    private Integer gptLimitNum;
+
+    /**
+     * 限制时间
+     */
+    private Long gptLimitTime;
+
+    /**
+     * mj fast次数
+     */
+    private Integer mjFastNum;
+
+    /**
+     * mj relax次数
+     */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
+    private Integer mjRelaxNum;
+
+    /**
+     * 特定价格
+     */
+    private BigDecimal specificPrice;
+
+    /**
+     * 特定平台购买用户人群
+     */
+    private String specificGoodsIds;
+
+    /**
+     * 优惠加购商品规格展示
+     */
+    @DbIgnore
+    @TableField(exist = false)
+    private List<GoodsDiscountPlusPurchaseRelationFrontView> dpSkuList;
+
+    /**
+     * 前端展示
+     */
+    @DbIgnore
+    @TableField(exist = false)
+    @JsonProperty("gname")
+    private String gName;
+
+    /**
+     * 前端展示
+     */
+    @DbIgnore
+    @TableField(exist = false)
+    @JsonProperty("sname")
+    private String sName;
+
+    @DbIgnore
+    @TableField(exist = false)
+    private BigDecimal yhShopSkuPrice;
+
+    /**
+     * 排序
+     */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
+    private Integer sorted;
+}

midjourney/src/main/java/com/yhlxj/dao/model/entity/GroupsRelation.java

@@ -0,0 +1,133 @@
+package com.yhlxj.dao.model.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.ejlchina.searcher.bean.DbIgnore;
+import com.yhlxj.dao.model.BaseEntity;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.Date;
+
+/**
+ * @author chan
+ * @date 2022/9/26 6:31 PM
+ */
+@Getter
+@Setter
+public class GroupsRelation extends BaseEntity {
+
+    private Long groupsId;
+
+    private Long userId;
+
+    private Date startTime;
+
+    private Date expiryTime;
+
+    private Integer num;
+
+    /**
+     * locking 锁定中
+     * overdue 过期
+     * validity 有效
+     * none 无人
+     */
+    private Status status;
+
+    /**
+     * 账号
+     */
+    private String account;
+
+    /**
+     * 密码
+     */
+    private String password;
+
+    private Date submitTime;
+
+    private Date sendTime;
+
+    private String operator;
+
+    private RechargeStatus rechargeStatus;
+
+    /**
+     * 续费意愿处理状态
+     */
+    private Boolean renewStatus;
+
+    /**
+     * 处理状态
+     */
+    private Boolean isHandle;
+
+    /**
+     * 客服
+     */
+    private String customerService;
+
+    /**
+     * midJourney 登录安全码
+     */
+    private String verifyCode;
+
+    private Long yhsId;
+
+    /**
+     * 获取权益时的订单id
+     */
+    @TableField(exist = false)
+    @DbIgnore
+    private Long orderId;
+
+    /**
+     * 更换车票时,新车票id
+     */
+    @TableField(exist = false)
+    @DbIgnore
+    private Long newRelationId;
+
+
+    /**
+     * 车队目前可用停车数
+     */
+    @TableField(exist = false)
+    @DbIgnore
+    private Integer groupsAvailParkingNum;
+
+    /**
+     * 车队最多可用车位数
+     */
+    @TableField(exist = false)
+    @DbIgnore
+    private Integer maxNum;
+
+
+    @AllArgsConstructor
+    @Getter
+    public enum Status{
+        locking("锁定中"),
+        overdue("过期"),
+        validity("有效"),
+        none("无人"),
+        outside("额外")
+        ;
+
+        private String desc;
+
+    }
+
+    @AllArgsConstructor
+    @Getter
+    public enum RechargeStatus{
+        waiting("待充值"),
+        complete("已完成"),
+        error("账号错误"),
+        ;
+
+        private String desc;
+
+    }
+}

midjourney/src/main/java/com/yhlxj/dao/model/entity/GroupsTrips.java

@@ -0,0 +1,175 @@
+package com.yhlxj.dao.model.entity;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.ejlchina.searcher.bean.DbField;
+import com.ejlchina.searcher.bean.DbIgnore;
+import com.ejlchina.searcher.bean.SearchBean;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.Date;
+
+/**
+ * @author chan
+ * @date 2022/9/26 6:31 PM
+ */
+@Getter
+@Setter
+@SearchBean(tables = "groups_trips gt left join goods_don_sku sku on gt.sku_id = sku.id " +
+        "left join goods_don g on g.id = sku.goods_id " +
+        "left join account a on a.id = gt.account_id ")
+public class GroupsTrips {
+
+    @TableId(value = "id",type = IdType.AUTO)
+    @DbField("gt.id")
+    private Long id;
+
+    @DbField("gt.id")
+    @TableField(exist = false)
+    private Long groupId;
+
+    /**
+     * 商品skuId
+     */
+    @DbField("gt.sku_id")
+    private Long skuId;
+
+    /**
+     * 账号id
+     */
+    @DbField("gt.account_id")
+    private Long accountId;
+
+
+    /**
+     * 账号
+     */
+    @DbField("a.account")
+    @TableField(exist = false)
+    private String account;
+
+    /**
+     * 密码
+     */
+    @DbField("a.password")
+    @TableField(exist = false)
+    private String password;
+
+    /**
+     * 商品id
+     */
+    @DbField("g.id")
+    @TableField(exist = false)
+    private Long goodsId;
+
+    /**
+     * 标题
+     */
+    @DbField("g.title")
+    @TableField(exist = false)
+    private String title;
+
+    /**
+     * 商品规格
+     */
+    @DbField("sku.spec_val")
+    @TableField(exist = false)
+    private String specVal;
+    /**
+     * 录入人
+     */
+    @DbField("gt.writer")
+    private Long writer;
+
+    /**
+     * 车位数量
+     */
+    @DbField("gt.num")
+    private Integer num;
+
+    /**
+     * 可用车位数
+     */
+    @DbField("gt.available_num")
+    private Integer availableNum;
+
+    /**
+     * 状态
+     */
+    @DbField("gt.status")
+    private Status status;
+
+    /**
+     * 备注
+     */
+    @DbField("gt.remark")
+    private String remark;
+
+    /**
+     * 开时间
+     */
+    @DbField("gt.start_time")
+    private Date startTime;
+
+    @DbIgnore
+    @TableField(exist = false)
+    private String verifyCodes;
+
+    @DbField("gt.renewal_time")
+    private Date renewalTime;
+
+    @DbField("a.expiry_time")
+    @TableField(exist = false)
+    private Date expiryTime;
+
+    /**
+     * 车队上是否有人
+     */
+    @DbIgnore
+    @TableField(exist = false)
+    private Boolean isExists;
+
+    /**
+     * 可上车队时间
+     */
+    @DbField("gt.parking_time")
+    private Date parkingTime;
+
+    /**
+     * 目前可停车数目
+     */
+    @DbField("gt.available_parking_num")
+    private Integer availableParkingNum;
+
+    /**
+     * 创建时间
+     */
+
+    @DbField("gt.created_time")
+    @TableField(fill = FieldFill.INSERT)
+    private Date createdTime;
+
+    /**
+     * 修改时间
+     */
+    @DbField("gt.update_time")
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Date updateTime;
+
+
+    @AllArgsConstructor
+    @Getter
+    public enum Status{
+        waiting("等待发车"),
+        validity("已发车"),
+        down("下架"),
+        close("关闭");
+
+        private String desc;
+
+    }
+}

midjourney/src/main/java/com/yhlxj/service/midjourney/impl/MidJourneyAccountServiceImpl.java

@@ -11,10 +11,12 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.cyksj.common.exception.BusinessRuntimeException;
 import com.cyksj.common.util.Jsons;
 import com.cyksj.common.util.StringUtil;
+import com.yhlxj.dao.mapper.GoodsDonSkuMapper;
+import com.yhlxj.dao.mapper.GroupsMapper;
+import com.yhlxj.dao.mapper.GroupsRelationMapper;
 import com.yhlxj.dao.mapper.midjourney.MidjourneyAccountMapper;
 import com.yhlxj.dao.mapper.midjourney.MidjourneyUserMapper;
-import com.yhlxj.dao.model.entity.MidjourneyAccount;
-import com.yhlxj.dao.model.entity.MidjourneyUser;
+import com.yhlxj.dao.model.entity.*;
 import com.yhlxj.redis.RedisService;
 import com.yhlxj.service.midjourney.MidjourneyAccountService;
 import lombok.RequiredArgsConstructor;