From fbc3e1380e6944a4cb0435307bb256085ded184b Mon Sep 17 00:00:00 2001 From: masterspirit Date: Sun, 19 Aug 2018 17:52:14 +0800 Subject: [PATCH] =?UTF-8?q?[=E7=B2=BE=E5=87=86=E6=8A=95=E6=94=BE][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9]=E7=B2=BE=E5=87=86=E6=8A=95=E6=94=BE?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/simple/controller/CouponInjectController.java | 2 +- .../src/main/java/com/simple/domain/po/CouponInject.java | 6 +++--- .../com/simple/service/impl/CouponInjectServiceImpl.java | 1 + .../src/main/resources/mapper/CouponInjectMapper.xml | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/simple/controller/CouponInjectController.java b/mallinkAdmin/src/main/java/com/simple/controller/CouponInjectController.java index a6e7c959f..c94eaef23 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/CouponInjectController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/CouponInjectController.java @@ -51,7 +51,7 @@ public class CouponInjectController extends BaseController public ResultData add(@RequestBody CouponInject couponInject) { couponInject.setTenantId(getUser().getTenantId()); - couponInject.setModelId(getUser().getId()); + couponInject.setMUserId(getUser().getId()); if(couponInject.getSendType()==0){ couponInject.setSendTime(new Date()); } diff --git a/mallinkService/src/main/java/com/simple/domain/po/CouponInject.java b/mallinkService/src/main/java/com/simple/domain/po/CouponInject.java index 311277eb5..42f4dce8b 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/CouponInject.java +++ b/mallinkService/src/main/java/com/simple/domain/po/CouponInject.java @@ -59,7 +59,7 @@ public class CouponInject implements Serializable { private String name; /***/ @io.swagger.annotations.ApiModelProperty(value="",name="mUserId") - private String mUserId; + private Long mUserId; /*发送方式0:立即发送 1:定时发送**/ @io.swagger.annotations.ApiModelProperty(value="发送方式0:立即发送 1:定时发送",name="sendType") private Integer sendType; @@ -105,10 +105,10 @@ public class CouponInject implements Serializable { public void setName(String _name) { name = _name; } - public String getMUserId() { + public Long getMUserId() { return mUserId; } - public void setMUserId(String _mUserId) { + public void setMUserId(Long _mUserId) { mUserId = _mUserId; } public Integer getSendType() { diff --git a/mallinkService/src/main/java/com/simple/service/impl/CouponInjectServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/CouponInjectServiceImpl.java index ee3e4bfbe..62f8e9acb 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/CouponInjectServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/CouponInjectServiceImpl.java @@ -79,6 +79,7 @@ public class CouponInjectServiceImpl implements CouponInjectService { record.setId(idWorker.nextId()); if(record.getSendType()==0){ record.setStatus(1); + record.setSendTime(new Date()); }else{ record.setStatus(0); } diff --git a/mallinkService/src/main/resources/mapper/CouponInjectMapper.xml b/mallinkService/src/main/resources/mapper/CouponInjectMapper.xml index fb07c5e56..0a22d3866 100644 --- a/mallinkService/src/main/resources/mapper/CouponInjectMapper.xml +++ b/mallinkService/src/main/resources/mapper/CouponInjectMapper.xml @@ -5,7 +5,7 @@ - +