券列表=公有券+私有券;

liquidnet-bus-do/liquidnet-service-candy-do/src/main/java/com/liquidnet/service/candy/dto/CandyCommonCouponBasicDto.java

+package com.liquidnet.service.candy.dto;
+
+import com.liquidnet.service.candy.entity.CandyCommonCoupon;
+import com.liquidnet.service.candy.entity.CandyCoupon;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import java.util.List;
+
+@Data
+public class CandyCommonCouponBasicDto implements Serializable ,Cloneable{
+    private static final long serialVersionUID = 4073256621782131605L;
+
+    /* com.liquidnet.service.candy.entity.CandyCoupon */
+    private String couponId;
+    //private Integer state;
+    private String title;
+    private String label;
+    private String notice;
+    private Integer exclusive;
+    private Integer busiType;
+    private Integer couType;
+    private Integer bindType;
+    private BigDecimal discount;
+    private BigDecimal valFace;
+    private BigDecimal valOver;
+    private BigDecimal valMinus;
+    private Integer overlay;
+    private Integer overlayLevel;
+    private Integer validity;
+    private Integer redeemValidity;
+    private LocalDateTime redeemStart;
+    private LocalDateTime redeemStop;
+    private LocalDateTime effectAt;
+    private LocalDateTime expireAt;
+    //private String operator;
+    //private Date createdAt;
+    //private Date updatedAt;
+    //private String comment;
+
+    /* com.liquidnet.service.candy.entity.CandyCommonCoupon */
+    private String ccouponId;
+    private String mcouponId;
+    //private String couponId;
+    private Integer state;
+    private Integer ranged;
+    //private String comment;
+
+    /* com.liquidnet.service.candy.entity.CandyCouponRule */
+    private List<CandyCouponRuleDto> useRules;
+
+
+    private static final CandyCommonCouponBasicDto obj = new CandyCommonCouponBasicDto();
+
+    public static CandyCommonCouponBasicDto getNew() {
+        try {
+            return (CandyCommonCouponBasicDto) obj.clone();
+        } catch (CloneNotSupportedException e) {
+            return new CandyCommonCouponBasicDto();
+        }
+    }
+
+    public CandyCommonCouponBasicDto copy(CandyCommonCoupon commonCoupon, CandyCoupon coupon, List<CandyCouponRuleDto> couponRuleDtoList) {
+        if (null == commonCoupon) return this;
+        this.setCouponId(coupon.getCouponId());
+        this.setTitle(coupon.getTitle());
+        this.setLabel(coupon.getLabel());
+        this.setNotice(coupon.getNotice());
+        this.setExclusive(coupon.getExclusive());
+        this.setBusiType(coupon.getBusiType());
+        this.setCouType(coupon.getCouType());
+        this.setBindType(coupon.getBindType());
+        this.setDiscount(coupon.getDiscount());
+        this.setValFace(coupon.getValFace());
+        this.setValOver(coupon.getValOver());
+        this.setValMinus(coupon.getValMinus());
+        this.setOverlay(coupon.getOverlay());
+        this.setOverlayLevel(coupon.getOverlayLevel());
+        this.setValidity(coupon.getValidity());
+        this.setRedeemValidity(coupon.getRedeemValidity());
+        this.setRedeemStart(coupon.getRedeemStart());
+        this.setRedeemStop(coupon.getRedeemStop());
+        this.setEffectAt(coupon.getEffectAt());
+        this.setExpireAt(coupon.getExpireAt());
+
+        this.setCcouponId(commonCoupon.getCcouponId());
+        this.setMcouponId(commonCoupon.getMcouponId());
+        this.setState(commonCoupon.getState());
+        this.setRanged(commonCoupon.getRanged());
+
+        this.setUseRules(couponRuleDtoList);
+        return this;
+    }
+}

liquidnet-bus-do/liquidnet-service-candy-do/src/main/java/com/liquidnet/service/candy/dto/CandyUserCouponBasicDto.java

@@ -55,6 +55,9 @@ public class CandyUserCouponBasicDto implements Serializable ,Cloneable{
     /* com.liquidnet.service.candy.entity.CandyCouponRule */
     private List<CandyCouponRuleDto> useRules;
 
+    /* com.liquidnet.service.candy.entity.CandyCommonCoupon */
+    private String ccouponId;
+
 
     private static final CandyUserCouponBasicDto obj = new CandyUserCouponBasicDto();
 

liquidnet-bus-do/liquidnet-service-candy-do/src/main/java/com/liquidnet/service/candy/entity/CandyCommonCoupon.java

+package com.liquidnet.service.candy.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 公有券信息
+ * </p>
+ *
+ * @author liquidnet
+ * @since 2021-08-30
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class CandyCommonCoupon implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "mid", type = IdType.AUTO)
+    private Long mid;
+
+    private String ccouponId;
+
+    /**
+     * ~candy_mgt_coupon.mcoupon_id
+     */
+    private String mcouponId;
+
+    /**
+     * ~candy_coupon.coupon_id
+     */
+    private String couponId;
+
+    /**
+     * 公有券状态[1-可用|2-无效｜3-已过期]
+     */
+    private Integer state;
+
+    /**
+     * 公有券范围[10-全体用户｜20-全体会员]
+     */
+    private Integer ranged;
+
+    private String comment;
+
+
+}

liquidnet-bus-do/liquidnet-service-candy-do/src/main/java/com/liquidnet/service/candy/mapper/CandyCommonCouponMapper.java

+package com.liquidnet.service.candy.mapper;
+
+import com.liquidnet.service.candy.entity.CandyCommonCoupon;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 公有券信息 Mapper 接口
+ * </p>
+ *
+ * @author liquidnet
+ * @since 2021-08-30
+ */
+public interface CandyCommonCouponMapper extends BaseMapper<CandyCommonCoupon> {
+
+}

liquidnet-bus-do/liquidnet-service-candy-do/src/main/resources/com/liquidnet/service/candy/mapper/CandyCommonCouponMapper.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.candy.mapper.CandyCommonCouponMapper">
+
+</mapper>

liquidnet-bus-service/liquidnet-service-candy/liquidnet-service-candy-impl/docu/db_ln_candy_initialdata.sql

@@ -121,6 +121,20 @@ create table candy_user_coupon
 ) engine = InnoDB comment '用户券信息';
 create unique index uidx_candy_user_coupon_id on candy_user_coupon (ucoupon_id);
 create index idx_candy_ucoupon_uid_state on candy_user_coupon (uid, state);
+
+
+# 公有券信息
+drop table if exists candy_common_coupon;
+create table candy_common_coupon
+(
+    mid        bigint unsigned auto_increment primary key,
+    ccoupon_id varchar(64) not null,
+    mcoupon_id varchar(64) not null comment '~candy_mgt_coupon.mcoupon_id',
+    coupon_id  varchar(64) not null comment '~candy_coupon.coupon_id',
+    state      tinyint comment '公有券状态[1-可用|2-无效｜3-已过期]',
+    ranged     tinyint comment '公有券范围[10-全体用户｜20-全体会员]',
+    comment    varchar(255)
+) engine = InnoDB comment '公有券信息';
 -- >>------------------------------------------------------------------------------------
 
 -- >>------------------------------------------------------------------------------------