| @@ -51,7 +51,7 @@ public class CouponInjectController extends BaseController | |||||
| public ResultData add(@RequestBody CouponInject couponInject) { | public ResultData add(@RequestBody CouponInject couponInject) { | ||||
| couponInject.setTenantId(getUser().getTenantId()); | couponInject.setTenantId(getUser().getTenantId()); | ||||
| couponInject.setModelId(getUser().getId()); | |||||
| couponInject.setMUserId(getUser().getId()); | |||||
| if(couponInject.getSendType()==0){ | if(couponInject.getSendType()==0){ | ||||
| couponInject.setSendTime(new Date()); | couponInject.setSendTime(new Date()); | ||||
| } | } | ||||
| @@ -59,7 +59,7 @@ public class CouponInject implements Serializable { | |||||
| private String name; | private String name; | ||||
| /***/ | /***/ | ||||
| @io.swagger.annotations.ApiModelProperty(value="",name="mUserId") | @io.swagger.annotations.ApiModelProperty(value="",name="mUserId") | ||||
| private String mUserId; | |||||
| private Long mUserId; | |||||
| /*发送方式0:立即发送 1:定时发送**/ | /*发送方式0:立即发送 1:定时发送**/ | ||||
| @io.swagger.annotations.ApiModelProperty(value="发送方式0:立即发送 1:定时发送",name="sendType") | @io.swagger.annotations.ApiModelProperty(value="发送方式0:立即发送 1:定时发送",name="sendType") | ||||
| private Integer sendType; | private Integer sendType; | ||||
| @@ -105,10 +105,10 @@ public class CouponInject implements Serializable { | |||||
| public void setName(String _name) { | public void setName(String _name) { | ||||
| name = _name; | name = _name; | ||||
| } | } | ||||
| public String getMUserId() { | |||||
| public Long getMUserId() { | |||||
| return mUserId; | return mUserId; | ||||
| } | } | ||||
| public void setMUserId(String _mUserId) { | |||||
| public void setMUserId(Long _mUserId) { | |||||
| mUserId = _mUserId; | mUserId = _mUserId; | ||||
| } | } | ||||
| public Integer getSendType() { | public Integer getSendType() { | ||||
| @@ -79,6 +79,7 @@ public class CouponInjectServiceImpl implements CouponInjectService { | |||||
| record.setId(idWorker.nextId()); | record.setId(idWorker.nextId()); | ||||
| if(record.getSendType()==0){ | if(record.getSendType()==0){ | ||||
| record.setStatus(1); | record.setStatus(1); | ||||
| record.setSendTime(new Date()); | |||||
| }else{ | }else{ | ||||
| record.setStatus(0); | record.setStatus(0); | ||||
| } | } | ||||
| @@ -5,7 +5,7 @@ | |||||
| <id column="id" jdbcType="BIGINT" property="id" /> | <id column="id" jdbcType="BIGINT" property="id" /> | ||||
| <result column="tenant_id" jdbcType="VARCHAR" property="tenantId" /> | <result column="tenant_id" jdbcType="VARCHAR" property="tenantId" /> | ||||
| <result column="name" jdbcType="VARCHAR" property="name" /> | <result column="name" jdbcType="VARCHAR" property="name" /> | ||||
| <result column="m_user_id" jdbcType="VARCHAR" property="mUserId" /> | |||||
| <result column="m_user_id" jdbcType="BIGINT" property="mUserId" /> | |||||
| <result column="send_type" jdbcType="INTEGER" property="sendType" /> | <result column="send_type" jdbcType="INTEGER" property="sendType" /> | ||||
| <result column="coupon_id" jdbcType="BIGINT" property="couponId" /> | <result column="coupon_id" jdbcType="BIGINT" property="couponId" /> | ||||
| <result column="coupon_name" jdbcType="VARCHAR" property="couponName" /> | <result column="coupon_name" jdbcType="VARCHAR" property="couponName" /> | ||||