Merge branch 'fhx-prod-兑换优惠券' into master-test

fhx

2023-07-14 81ad1c74ca7ea0c544135cb78d8289e79c61f1fc

Merge branch 'fhx-prod-兑换优惠券' into master-test

 phis-feign/src/main/java/com/hz/phis/dt/consumables/GoodsAssocDt.java

New file
@@ -0,0 +1,30 @@
package com.hz.phis.dt.consumables;

import com.gitee.sunchenbin.mybatis.actable.annotation.Column;
import com.gitee.sunchenbin.mybatis.actable.constants.MySqlTypeConstant;
import lombok.Data;

/**
 * 商品关联组合
 * @USER: fhx
 * @DATE: 2023/7/12
 **/
@Data
public class GoodsAssocDt {

    /** 耗材表标识(Consumables) */
    private String consumableId;
    /** 关联类型 */
    public String commonType;
    /** 关联标识(优惠券id) */
    public String commonId;
    /** 关联名称 */
    public String commonName;
    /** 数量 */
    public Integer quantity;


    //////////////////////////////////
    /** 关联类型 - 优惠券 */
    public static final String COMMON_TYPE_COUPON = "coupon";
}

 phis-feign/src/main/java/com/hz/phis/dt/consumables/GoodsDeLimitDt.java

@@ -3,6 +3,8 @@
import com.hz.phis.dt.limit.LimitDt;
import lombok.Data;

import java.util.List;

/**
 * 商品详情限制实体
 * @author fwq
@@ -14,4 +16,7 @@
    private GoodsDetailDt consumables;
    /**限制信息*/
    private LimitDt limitBo;
    /** 商品关联信息 */
    private List<GoodsAssocDt> assocList;

}