提交 部分vo

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/vo/GoblinMixDetailsItemVo.java

+package com.liquidnet.service.goblin.dto.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+@Data
+public class GoblinMixDetailsItemVo implements Serializable, Cloneable {
+    @ApiModelProperty(value = "spuId")
+    private String spuId;
+    @ApiModelProperty(value = "skuId")
+    private String skuId;
+    @ApiModelProperty(value = "sku名称")
+    private String skuName;
+    @ApiModelProperty(value = "sku原价")
+    private BigDecimal skuPrice;
+    @ApiModelProperty(value = "总库存")
+    private Integer stock;
+    @ApiModelProperty(value = "可配置库存")
+    private Integer surplusStock;
+
+    @ApiModelProperty(value = "组合价格")
+    private BigDecimal price;
+    @ApiModelProperty(value = "苹果价格")
+    private BigDecimal priceV;
+    @ApiModelProperty(value = "苹果价格id")
+    private String productId;
+    @ApiModelProperty(value = "组合件数[数字藏品不能大于1]")
+    private Integer count;
+    @ApiModelProperty(value = "是否支持退款[0-否|1-是]")
+    private Integer canRefund;
+
+    private static final GoblinMixDetailsItemVo obj = new GoblinMixDetailsItemVo();
+
+    public static GoblinMixDetailsItemVo getNew() {
+        try {
+            return (GoblinMixDetailsItemVo) obj.clone();
+        } catch (CloneNotSupportedException e) {
+            e.printStackTrace();
+        }
+        return new GoblinMixDetailsItemVo();
+    }
+}

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/vo/GoblinMixDetailsVo.java

+package com.liquidnet.service.goblin.dto.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+import java.util.List;
+
+@Data
+@EqualsAndHashCode
+public class GoblinMixDetailsVo implements Serializable, Cloneable {
+    @ApiModelProperty(position = 0, value = "活动id")
+    private String mixId;
+
+    @ApiModelProperty(position = 1, value = "活动名称")
+    private String name;
+    @ApiModelProperty(position = 2, value = "开始时间")
+    private String timeStart;
+    @ApiModelProperty(position = 3, value = "结束时间")
+    private String timeEnd;
+    @ApiModelProperty(position = 4, value = "展示位置[1-商城|2-数字藏品]")
+    private String showPosition;
+    @ApiModelProperty(position = 5, value = "组合名称")
+    private String sellName;
+    @ApiModelProperty(position = 6, value = "平台一级分类")
+    private String cateFName;
+    @ApiModelProperty(position = 7, value = "平台二级分类")
+    private String cateSName;
+    @ApiModelProperty(position = 8, value = "平台三级分类")
+    private String cateTNAME;
+    @ApiModelProperty(position = 9, value = "商品简介/购买须知")
+    private String intro;
+    @ApiModelProperty(position = 10, value = "封面图片地址")
+    private String coverPic;
+    @ApiModelProperty(position = 11, value = "商品视频地址/数字昌平视频地址")
+    private String video;
+    @ApiModelProperty(position = 12, value = "商品详情/藏品详情")
+    private String details;
+    @ApiModelProperty(position = 13, value = "展示文件类型[1-图片|2-视频")
+    private String watchType;
+    @ApiModelProperty(position = 14, value = "数字藏品图片地址")
+    private String detailUrl;
+    @ApiModelProperty(position = 14, value = "设置库存")
+    private String stock;
+    @ApiModelProperty(position = 15, value = "锁定库存")
+    private String stockLock;
+    @ApiModelProperty(position = 16, value = "是否锁定[0-否|1-是]")
+    private String isLock;
+    @ApiModelProperty(position = 17, value = "限购数量[0-无限]")
+    private String limit;
+    @ApiModelProperty(position = 18, value = "白名单类型[0-会员|1-指定用户|2-全部用户]")
+    private String whiteType;
+    @ApiModelProperty(position = 19, value = "白名单xls地址")
+    private String whiteUrl;
+    @ApiModelProperty(position = 20, value = "配置详情")
+    private List<GoblinMixDetailsItemVo> item;
+
+
+    private static final GoblinMixDetailsVo obj = new GoblinMixDetailsVo();
+
+    public static GoblinMixDetailsVo getNew() {
+        try {
+            return (GoblinMixDetailsVo) obj.clone();
+        } catch (CloneNotSupportedException e) {
+            return new GoblinMixDetailsVo();
+        }
+    }
+}

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/vo/GoblinMixManageListVo.java

+package com.liquidnet.service.goblin.dto.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+
+@Data
+@EqualsAndHashCode
+public class GoblinMixManageListVo implements Serializable, Cloneable {
+    @ApiModelProperty(position = 0, value = "活动id")
+    private String mixId;
+    @ApiModelProperty(position = 1, value = "活动名称")
+    private String name;
+    @ApiModelProperty(position = 2, value = "状态[6-活动中|7-停用|9-等待开始|10-活动结束]")
+    private Integer status;
+    @ApiModelProperty(position = 3, value = "活动开始时间")
+    private String timeStart;
+    @ApiModelProperty(position = 4, value = "活动结束时间")
+    private String timeEnd;
+    @ApiModelProperty(position = 5, value = "活动创建时间")
+    private String createddAt;
+
+    private static final GoblinMixManageListVo obj = new GoblinMixManageListVo();
+
+    public static GoblinMixManageListVo getNew() {
+        try {
+            return (GoblinMixManageListVo) obj.clone();
+        } catch (CloneNotSupportedException e) {
+            return new GoblinMixManageListVo();
+        }
+    }
+}

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/service/manage/IGoblinMixService.java

+package com.liquidnet.service.goblin.service.manage;
+
+import com.liquidnet.service.base.ResponseDto;
+import com.liquidnet.service.goblin.dto.vo.GoblinMixDetailsVo;
+import com.liquidnet.service.goblin.dto.vo.GoblinMixManageListVo;
+
+/**
+ * <p>
+ * 商城-搭售活动 服务类
+ * </p>
+ *
+ * @author liquidnet
+ * @since 2022-06-30
+ */
+public interface IGoblinMixService {
+
+    ResponseDto<GoblinMixManageListVo> mixList(String mixName, Integer status, String st, String et);
+
+    ResponseDto<GoblinMixDetailsVo> mixDetails(String mixId);
+
+    ResponseDto<Boolean> mixInsert();
+
+    ResponseDto<Boolean> mixUpdate();
+
+    ResponseDto<Boolean> mixLine(String mixId, Integer status);
+}

liquidnet-bus-do/liquidnet-service-goblin-do/src/main/java/com/liquidnet/service/goblin/entity/GoblinMix.java

+package com.liquidnet.service.goblin.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 商城-搭售活动
+ * </p>
+ *
+ * @author liquidnet
+ * @since 2022-06-30
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class GoblinMix implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "mid", type = IdType.AUTO)
+    private Long mid;
+
+    /**
+     * 混合id
+     */
+    private String mixId;
+
+    /**
+     * 用户id
+     */
+    private String uid;
+
+    /**
+     * 混合名称
+     */
+    private String name;
+
+    /**
+     * 开始时间
+     */
+    private LocalDateTime timeStart;
+
+    /**
+     * 结束时间
+     */
+    private LocalDateTime timeEnd;
+
+    /**
+     * 状态[6-启用|7-停用]
+     */
+    private Integer status;
+
+    /**
+     * 展示位置[1-商城|2-数字藏品]
+     */
+    private Integer showPosition;
+
+    /**
+     * 售卖名称
+     */
+    private String sellName;
+
+    /**
+     * 平台一级分类id
+     */
+    private String cateFid;
+
+    /**
+     * 平台二级分类id
+     */
+    private String cateSid;
+
+    /**
+     * 平台三级分类id
+     */
+    private String cateTid;
+
+    /**
+     * 商品简介/购买须知
+     */
+    private String intro;
+
+    /**
+     * 封面图片地址
+     */
+    private String coverPic;
+
+    /**
+     * 商品视频地址/数字昌平视频地址
+     */
+    private String video;
+
+    /**
+     * 商品详情/藏品详情
+     */
+    private String details;
+
+    /**
+     * 展示文件类型[1-图片|2-视频|3-模型]
+     */
+    private String watchType;
+
+    /**
+     * 数字藏品图片地址
+     */
+    private String detailUrl;
+
+    /**
+     * 库存
+     */
+    private Integer stock;
+
+    /**
+     * 锁定库存
+     */
+    private Integer stockLock;
+
+    /**
+     * 是否锁定库存[0-否|1-是]
+     */
+    private Integer isLock;
+
+    /**
+     * 限购数量[0-不限购]
+     */
+    private Integer limit;
+
+    /**
+     * 白名单类型[0-会员|1-指定用户|2-全部用户]
+     */
+    private Integer whiteType;
+
+    /**
+     * 白名单xls地址
+     */
+    private String whiteUrl;
+
+    /**
+     * 是否删除[0-否|1-是]
+     */
+    private Integer delTag;
+
+    /**
+     * 补充字段
+     */
+    private String comment;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createdAt;
+
+    /**
+     * 更新时间
+     */
+    private LocalDateTime updatedAt;
+
+
+}

liquidnet-bus-do/liquidnet-service-goblin-do/src/main/java/com/liquidnet/service/goblin/entity/GoblinMixDetails.java

+package com.liquidnet.service.goblin.entity;
+
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 商城-搭售活动详情
+ * </p>
+ *
+ * @author liquidnet
+ * @since 2022-06-30
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class GoblinMixDetails implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "mid", type = IdType.AUTO)
+    private Long mid;
+
+    /**
+     * 混合id
+     */
+    private String mixId;
+
+    /**
+     * 商品类型[1-商城|2-数字藏品]
+     */
+    private Integer position;
+
+    /**
+     * 售卖商品id
+     */
+    private String sellId;
+
+    /**
+     * 单品现价
+     */
+    private BigDecimal price;
+
+    /**
+     * 苹果商品价格
+     */
+    private BigDecimal priceV;
+
+    /**
+     * 苹果商品价格ID
+     */
+    private String productId;
+
+    /**
+     * 数量[数字藏品默认为1]
+     */
+    private Integer count;
+
+    /**
+     * 是否支持退款[0-否|1-是]
+     */
+    private Integer canRefund;
+
+    /**
+     * 是否删除[0-否|1-是]
+     */
+    private Integer delTag;
+
+    /**
+     * 补充字段
+     */
+    private String comment;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createdAt;
+
+    /**
+     * 更新时间
+     */
+    private LocalDateTime updatedAt;
+
+
+}

liquidnet-bus-do/liquidnet-service-goblin-do/src/main/java/com/liquidnet/service/goblin/mapper/GoblinMixDetailsMapper.java

+package com.liquidnet.service.goblin.mapper;
+
+import com.liquidnet.service.goblin.entity.GoblinMixDetails;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 商城-搭售活动详情 Mapper 接口
+ * </p>
+ *
+ * @author liquidnet
+ * @since 2022-06-30
+ */
+public interface GoblinMixDetailsMapper extends BaseMapper<GoblinMixDetails> {
+
+}

liquidnet-bus-do/liquidnet-service-goblin-do/src/main/java/com/liquidnet/service/goblin/mapper/GoblinMixMapper.java

+package com.liquidnet.service.goblin.mapper;
+
+import com.liquidnet.service.goblin.entity.GoblinMix;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 商城-搭售活动 Mapper 接口
+ * </p>
+ *
+ * @author liquidnet
+ * @since 2022-06-30
+ */
+public interface GoblinMixMapper extends BaseMapper<GoblinMix> {
+
+}

liquidnet-bus-do/liquidnet-service-goblin-do/src/main/resources/com.liquidnet.service.goblin.mapper/GoblinMixDetailsMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.liquidnet.service.goblin.mapper.GoblinMixDetailsMapper">
+
+</mapper>

liquidnet-bus-do/liquidnet-service-goblin-do/src/main/resources/com.liquidnet.service.goblin.mapper/GoblinMixMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.liquidnet.service.goblin.mapper.GoblinMixMapper">
+
+</mapper>

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/MybatisPlusCodeGenerator.java

@@ -96,7 +96,7 @@ public class MybatisPlusCodeGenerator {
         String resourcePath = "/Users/hujiachen/Downloads/tmp";
         String directory = "com.liquidnet.service.goblin";
         String[] dbTableArray = new String[]{
-               "goblin_marketing_zhengzai_relation"
+               "goblin_mix","goblin_mix_details"
         };
 
         doGenerator(resourcePath, dsc, directory, dbTableArray);

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/service/impl/manage/GoblinMixServiceImpl.java

+package com.liquidnet.service.goblin.service.impl.manage;
+
+import com.liquidnet.service.base.ResponseDto;
+import com.liquidnet.service.goblin.dto.vo.*;
+import com.liquidnet.service.goblin.service.manage.IGoblinMixService;
+import com.liquidnet.service.goblin.util.*;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 商城-名单表 服务实现类
+ * </p>
+ *
+ * @author liquidnet
+ * @since 2022-04-29
+ */
+@Service
+@Slf4j
+public class GoblinMixServiceImpl implements IGoblinMixService {
+
+    @Autowired
+    GoblinRedisUtils redisUtils;
+    @Autowired
+    GoblinMongoUtils mongoUtils;
+    @Autowired
+    QueueUtils queueUtils;
+    @Autowired
+    GoblinNftBoxUtils nftBoxUtils;
+
+
+    @Override
+    public ResponseDto<GoblinMixManageListVo> mixList(String mixName, Integer status, String st, String et) {
+        return null;
+    }
+
+    @Override
+    public ResponseDto<GoblinMixDetailsVo> mixDetails(String mixId) {
+        return null;
+    }
+
+    @Override
+    public ResponseDto<Boolean> mixInsert() {
+        return null;
+    }
+
+    @Override
+    public ResponseDto<Boolean> mixUpdate() {
+        return null;
+    }
+
+    @Override
+    public ResponseDto<Boolean> mixLine(String mixId, Integer status) {
+        return null;
+    }
+}