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

//tt product

release_toaliyun_real
xhxu 4 лет назад
Родитель
Сommit
c49cc57f2b
2 измененных файлов: 6 добавлений и 6 удалений
  1. +2
    -2
      mallinkService/src/main/java/com/iformall/domain/vo/TtCouponVo.java
  2. +4
    -4
      mallinkService/src/main/resources/mapper/WxCouponMapper.xml

+ 2
- 2
mallinkService/src/main/java/com/iformall/domain/vo/TtCouponVo.java Просмотреть файл

@@ -20,8 +20,8 @@ public class TtCouponVo extends WxCoupon implements Serializable {
@io.swagger.annotations.ApiModelProperty(value="spuId",name="spuId")
private String spuId;

@io.swagger.annotations.ApiModelProperty(value="状态:0-审核中,1-上架,2-下架,3-审核拒绝 4-审核通过",name="status")
private Integer status;
@io.swagger.annotations.ApiModelProperty(value="状态:0-审核中,1-上架,2-下架,3-审核拒绝 4-审核通过",name="poiStatus")
private Integer poiStatus;

@io.swagger.annotations.ApiModelProperty(value="描述",name="statusDesc")
private String statusDesc;


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

@@ -1355,7 +1355,7 @@

<result column="coupon_channel_id" jdbcType="BIGINT" property="couponChannelId"/>
<result column="spu_id" jdbcType="VARCHAR" property="spuId"/>
<result column="status" jdbcType="INTEGER" property="status"/>
<result column="poi_status" jdbcType="INTEGER" property="poiStatus"/>
<result column="status_desc" jdbcType="VARCHAR" property="statusDesc"/>
<result column="last_status" jdbcType="INTEGER" property="lastStatus"/>
<result column="last_status_desc" jdbcType="VARCHAR" property="lastStatusDesc"/>
@@ -1370,7 +1370,7 @@
c.`status`,c.`create_date`,c.`update_date`,c.`business`,c.`sub_business`,
c.`auto_refund`,c.`credit_price`,c.`credit_refund`,
c.content_type,c.source_type,c.product_type,c.category_id,
poi.coupon_channel_id,poi.spu_id,poi.status,poi.status_desc,poi.last_status,poi.last_status_desc
poi.coupon_channel_id,poi.spu_id,poi.status poi_status,poi.status_desc,poi.last_status,poi.last_status_desc
from wx_coupon c
left join tt_coupon_channel_poi poi on poi.id = c.id
where c.`type` = #{type}
@@ -1414,8 +1414,8 @@
and poi.`spu_id` = #{spuId}
</if>

<if test=" null != status">
and poi.`status` = #{status}
<if test=" null != poiStatus">
and poi.`status` = #{poiStatus}
</if>

<if test=" null != lastStatus">


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