Просмотр исходного кода

[储值卡][新增]:添加券是否支持转送

release_toaliyun_real
Stormeye Wu 7 лет назад
Родитель
Сommit
e1199e4ce2
2 измененных файлов: 20 добавлений и 1 удалений
  1. +13
    -0
      mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java
  2. +7
    -1
      mallinkService/src/main/resources/mapper/WxCouponMapper.xml

+ 13
- 0
mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java Просмотреть файл

@@ -135,6 +135,9 @@ public class WxCoupon implements Serializable {
/*业态**/ /*业态**/
@io.swagger.annotations.ApiModelProperty(value="业态",name="business") @io.swagger.annotations.ApiModelProperty(value="业态",name="business")
private Integer business; private Integer business;
/*是否支持转送(0:不支持,1支持)**/
@io.swagger.annotations.ApiModelProperty(value="是否支持转送(0:不支持,1支持)",name="supportTransfer")
private Integer supportTransfer;
public String getTenantId() { public String getTenantId() {
return tenantId; return tenantId;
} }
@@ -273,6 +276,15 @@ public class WxCoupon implements Serializable {
public void setBusiness(Integer _business) { public void setBusiness(Integer _business) {
business = _business; business = _business;
} }

public Integer getSupportTransfer() {
return supportTransfer;
}

public void setSupportTransfer(Integer supportTransfer) {
this.supportTransfer = supportTransfer;
}

public String getSalePriceStr() { public String getSalePriceStr() {
if(salePrice!=null) { if(salePrice!=null) {
salePriceStr = new BigDecimal(salePrice).divide(new BigDecimal(100)).toString(); salePriceStr = new BigDecimal(salePrice).divide(new BigDecimal(100)).toString();
@@ -367,6 +379,7 @@ public class WxCoupon implements Serializable {
,CreateDate_ASC("`create_date` ASC"),CreateDate_DESC("`create_date` DESC") ,CreateDate_ASC("`create_date` ASC"),CreateDate_DESC("`create_date` DESC")
,UpdateDate_ASC("`update_date` ASC"),UpdateDate_DESC("`update_date` DESC") ,UpdateDate_ASC("`update_date` ASC"),UpdateDate_DESC("`update_date` DESC")
,Business_ASC("`business` ASC"),Business_DESC("`business` DESC") ,Business_ASC("`business` ASC"),Business_DESC("`business` DESC")
,SupportTransfer_ASC("`support_transfer` ASC"),SupportTransfer_DESC("`support_transfer` DESC")
; ;
private String value; private String value;
Field(String value){ Field(String value){


+ 7
- 1
mallinkService/src/main/resources/mapper/WxCouponMapper.xml Просмотреть файл

@@ -26,10 +26,11 @@
<result column="create_date" jdbcType="TIMESTAMP" property="createDate"/> <result column="create_date" jdbcType="TIMESTAMP" property="createDate"/>
<result column="update_date" jdbcType="TIMESTAMP" property="updateDate"/> <result column="update_date" jdbcType="TIMESTAMP" property="updateDate"/>
<result column="business" jdbcType="INTEGER" property="business"/> <result column="business" jdbcType="INTEGER" property="business"/>
<result column="support_transfer" jdbcType="INTEGER" property="supportTransfer"/>
</resultMap> </resultMap>


<sql id="allColumns"> <sql id="allColumns">
`id`,`tenant_id`,`type`,`cover_img`,`title`,`sub_title`,`sale_price`,`use_price`,`use_limit_quantity`,`send_type`,`valid_type`,`valid_start_date`,`valid_end_date`,`valid_days`,`detail`,`price`,`unit`,`remain_inventory`,`inventory`,`remark`,`status`,`create_date`,`update_date`,`business`
`id`,`tenant_id`,`type`,`cover_img`,`title`,`sub_title`,`sale_price`,`use_price`,`use_limit_quantity`,`send_type`,`valid_type`,`valid_start_date`,`valid_end_date`,`valid_days`,`detail`,`price`,`unit`,`remain_inventory`,`inventory`,`remark`,`status`,`create_date`,`update_date`,`business`,`support_transfer`
</sql> </sql>


<sql id="dynamicWhereConditions"> <sql id="dynamicWhereConditions">
@@ -131,6 +132,10 @@
and `business` = #{business} and `business` = #{business}
</if> </if>


<if test=" null != supportTransfer ">
and `support_transfer` = #{supportTransfer}
</if>

<if test=" null != ids "> <if test=" null != ids ">
and id in and id in
<foreach collection="ids" index="index" item="idItem" open="(" separator="," close=")"> <foreach collection="ids" index="index" item="idItem" open="(" separator="," close=")">
@@ -172,6 +177,7 @@
<result column="create_date" jdbcType="TIMESTAMP" property="createDate"/> <result column="create_date" jdbcType="TIMESTAMP" property="createDate"/>
<result column="update_date" jdbcType="TIMESTAMP" property="updateDate"/> <result column="update_date" jdbcType="TIMESTAMP" property="updateDate"/>
<result column="business" jdbcType="INTEGER" property="business"/> <result column="business" jdbcType="INTEGER" property="business"/>
<result column="support_transfer" jdbcType="INTEGER" property="supportTransfer"/>


<collection column="{productId=id}" property="merchantVoList" <collection column="{productId=id}" property="merchantVoList"
ofType="com.iformall.domain.vo.WxMerchantVo" ofType="com.iformall.domain.vo.WxMerchantVo"


Загрузка…
Отмена
Сохранить