From c396d2a1841e4b969ec5f473b1a106ef83286f72 Mon Sep 17 00:00:00 2001 From: hupeng Date: Wed, 19 Dec 2018 13:12:46 +0800 Subject: [PATCH] =?UTF-8?q?[A=E7=AB=AF][=E4=BF=AE=E5=A4=8D]:=E5=88=A0?= =?UTF-8?q?=E9=99=A4=E5=9C=BA=E6=99=AF=E5=8F=91=E5=88=B8=E8=A1=A8=E4=B8=AD?= =?UTF-8?q?=E4=B8=80=E4=BA=9B=E5=86=97=E4=BD=99=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WxCouponSendController.java | 1 - .../schedule/CouponExpiringSchedule.java | 1 - .../com/iformall/domain/po/WxCouponSend.java | 33 ++----------------- .../service/impl/WxCouponSendServiceImpl.java | 2 -- .../resources/mapper/WxCouponSendMapper.xml | 25 +------------- 5 files changed, 4 insertions(+), 58 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxCouponSendController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxCouponSendController.java index a531caaec..6de9b2907 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxCouponSendController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxCouponSendController.java @@ -76,7 +76,6 @@ public class WxCouponSendController extends BaseController { return new ResultData(ErrorCode.COUPON_TYPE_IS_NOT_PASSIVE); } - wxCouponSend.setType(wxCoupon.getType()); wxCouponSend.setTenantId(wxCoupon.getTenantId()); wxCouponSend.setTitle(wxCoupon.getTitle()); wxCouponSend.setCreateDate(new Date()); diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/CouponExpiringSchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/CouponExpiringSchedule.java index 3854d0520..471902c36 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/CouponExpiringSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/CouponExpiringSchedule.java @@ -38,7 +38,6 @@ public class CouponExpiringSchedule { @Scheduled(cron = "0 10 0 * * ?") // 每天凌晨00:10 下架定向发放 //@Scheduled(cron = "*/10 * * * * ?") // 测试10秒中一次 public void couponSendExpiringSchedule() { - wxCouponSendMapper.offExpiriedCouponSendBySendEndTime(); wxCouponSendMapper.offExpiriedCouponSendByCouponStatus(); } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCouponSend.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCouponSend.java index cc316ba18..5ce69d20c 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCouponSend.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCouponSend.java @@ -47,9 +47,7 @@ public class WxCouponSend implements Serializable { /*卡券id**/ @io.swagger.annotations.ApiModelProperty(value="卡券id",name="couponId") private Long couponId; - /*券类型(1.满减券,2.代金券,3.团购券,4.礼品券,5.停车券)**/ - @io.swagger.annotations.ApiModelProperty(value="券类型(1.满减券,2.代金券,3.团购券,4.礼品券,5.停车券)",name="type") - private Integer type; + /*券名称**/ @io.swagger.annotations.ApiModelProperty(value="券名称",name="title") private String title; @@ -59,12 +57,7 @@ public class WxCouponSend implements Serializable { /*0:有效 1:无效**/ @io.swagger.annotations.ApiModelProperty(value="0:有效 1:无效",name="status") private Integer status; - /***/ - @io.swagger.annotations.ApiModelProperty(value="",name="sendStartTime") - private Date sendStartTime; - /***/ - @io.swagger.annotations.ApiModelProperty(value="",name="sendEndTime") - private Date sendEndTime; + /*创建时间**/ @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createDate") private Date createDate; @@ -89,12 +82,6 @@ public class WxCouponSend implements Serializable { public void setCouponId(Long _couponId) { couponId = _couponId; } - public Integer getType() { - return type; - } - public void setType(Integer _type) { - type = _type; - } public String getTitle() { return title; } @@ -113,18 +100,7 @@ public class WxCouponSend implements Serializable { public void setStatus(Integer _status) { status = _status; } - public Date getSendStartTime() { - return sendStartTime; - } - public void setSendStartTime(Date _sendStartTime) { - sendStartTime = _sendStartTime; - } - public Date getSendEndTime() { - return sendEndTime; - } - public void setSendEndTime(Date _sendEndTime) { - sendEndTime = _sendEndTime; - } + public Date getCreateDate() { return createDate; } @@ -151,12 +127,9 @@ public class WxCouponSend implements Serializable { Id_ASC("`id` ASC"),Id_DESC("`id` DESC") ,TenantId_ASC("`tenant_id` ASC"),TenantId_DESC("`tenant_id` DESC") ,CouponId_ASC("`coupon_id` ASC"),CouponId_DESC("`coupon_id` DESC") - ,Type_ASC("`type` ASC"),Type_DESC("`type` DESC") ,Title_ASC("`title` ASC"),Title_DESC("`title` DESC") ,SendType_ASC("`send_type` ASC"),SendType_DESC("`send_type` DESC") ,Status_ASC("`status` ASC"),Status_DESC("`status` DESC") - ,SendStartTime_ASC("`send_start_time` ASC"),SendStartTime_DESC("`send_start_time` DESC") - ,SendEndTime_ASC("`send_end_time` ASC"),SendEndTime_DESC("`send_end_time` DESC") ,CreateDate_ASC("`create_date` ASC"),CreateDate_DESC("`create_date` DESC") ,UpdateDate_ASC("`update_date` ASC"),UpdateDate_DESC("`update_date` DESC") ; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponSendServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponSendServiceImpl.java index 4aeea1902..abd0dc46c 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponSendServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponSendServiceImpl.java @@ -154,6 +154,4 @@ public class WxCouponSendServiceImpl implements WxCouponSendService { wxCouponSend.setUpdateDate(new Date()); wxCouponSendMapper.updateStatusByCouponId(wxCouponSend); } - - } diff --git a/mallinkService/src/main/resources/mapper/WxCouponSendMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponSendMapper.xml index 3089a3de9..bf8c83d94 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponSendMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponSendMapper.xml @@ -5,18 +5,15 @@ - - - - `id`,`tenant_id`,`coupon_id`,`type`,`title`,`send_type`,`status`,`send_start_time`,`send_end_time`,`create_date`,`update_date` + `id`,`tenant_id`,`coupon_id`,`title`,`send_type`,`status`,`create_date`,`update_date` @@ -37,11 +34,6 @@ - - and `type` = #{type} - - - and `title` like concat('%', #{title},'%') @@ -57,16 +49,6 @@ - - and `send_start_time` = #{sendStartTime} - - - - - and `send_end_time` = #{sendEndTime} - - - and `create_date` = #{createDate} @@ -102,11 +84,6 @@ ((c.status = 1) or (c.valid_type = 1 and c.valid_end_date < now())) - - update wx_coupon_send - set status=1, update_date = now() - where status = 0 and send_end_time < now() -