diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/TtCouponVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/TtCouponVo.java index 059c519b5..a583d30cf 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/TtCouponVo.java +++ b/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; diff --git a/mallinkService/src/main/resources/mapper/WxCouponMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponMapper.xml index 736e593f6..4863bd466 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponMapper.xml @@ -1355,7 +1355,7 @@ - + @@ -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} - - and poi.`status` = #{status} + + and poi.`status` = #{poiStatus}