From be0a8771a279cfd4b920fb902875da038d71380f Mon Sep 17 00:00:00 2001 From: xhxu Date: Wed, 16 Jun 2021 18:03:07 +0800 Subject: [PATCH] tt --- .../src/main/java/com/iformall/domain/po/tt/TtCoupon.java | 2 ++ .../com/iformall/service/tt/impl/TtCouponServiceImpl.java | 1 + mallinkService/src/main/resources/mapper/TtCouponMapper.xml | 6 ++++-- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/domain/po/tt/TtCoupon.java b/mallinkService/src/main/java/com/iformall/domain/po/tt/TtCoupon.java index 2bc34cab8..a90c58292 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/tt/TtCoupon.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/tt/TtCoupon.java @@ -104,6 +104,8 @@ public class TtCoupon extends TenantEntity { private Date createDate; @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate") private Date updateDate; + @io.swagger.annotations.ApiModelProperty(value="上架",name="putonDate") + private Date putonDate; @io.swagger.annotations.ApiModelProperty(value="浏览数",name="seeCount") private Integer seeCount; diff --git a/mallinkService/src/main/java/com/iformall/service/tt/impl/TtCouponServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/tt/impl/TtCouponServiceImpl.java index 110852522..f88988ebe 100644 --- a/mallinkService/src/main/java/com/iformall/service/tt/impl/TtCouponServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/tt/impl/TtCouponServiceImpl.java @@ -175,6 +175,7 @@ public class TtCouponServiceImpl implements TtCouponService { return new ResultData(ErrorCode.SYS_PARAMETER_ERROR,"此课程状态不允许上架或者已上架"); } byId.setStatus(EnumTtCouponStatus.TTCOUPON_STATUS_SHELFING.getCode()); + byId.setPutonDate(new Date()); byId.setUpdateDate(new Date()); ttCouponMapper.updateById(byId); return new ResultData(); diff --git a/mallinkService/src/main/resources/mapper/TtCouponMapper.xml b/mallinkService/src/main/resources/mapper/TtCouponMapper.xml index b3d1520a1..0d88db6b3 100644 --- a/mallinkService/src/main/resources/mapper/TtCouponMapper.xml +++ b/mallinkService/src/main/resources/mapper/TtCouponMapper.xml @@ -32,6 +32,8 @@ + + @@ -55,7 +57,7 @@ c.`id`, c.`tenant_id`, c.`parent_tenant_id`, c.`type`, c.`cover_img`, c.`cover_picture`, c.`detail_picture`, c.`title`, c.`sub_title`, c.`count_class`, c.`video_id`, c.`video_time`,c.`video_url`, c.`html`, c.`is_landscape`, c.`is_payment`, c.`sale_price`, c.`orig_price`, c.`is_preview`, c.`preview_duration`, c.`detail`, c.`false_sell_count`, - c.`dy_title`, c.`inventory`, c.`remark`, c.`status`, c.`create_date`, c.`update_date`, + c.`dy_title`, c.`inventory`, c.`remark`, c.`status`, c.`create_date`, c.`update_date`, c.`puton_date`, c.`see_count`, c.`sell_count`, c.`assess_count`, c.`collect_count`, c.`mark`,c.mark_time, c.`is_del`, c.`column_id`, c.`popularity`, c.`merchant_id`, c.`business_id`, c.`business_name`, m.name merchant_name, m.img_url merchant_pic @@ -108,7 +110,7 @@ - and (c.`mark` is null or m.`mark` <> 1) + and (c.`mark` is null or c.`mark` <> 1) and c.`mark` = 1