From 799500ec61f079cb827e36b2a68141d3c731e1b6 Mon Sep 17 00:00:00 2001 From: "Stormeye.Wu" Date: Sat, 8 Sep 2018 17:38:58 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=8F=91=E5=88=B8][=E4=BF=AE=E6=94=B9]:merge?= =?UTF-8?q?=20from=20=E5=85=83=E6=94=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/simple/domain/vo/WxCouponChannelAddVo.java | 1 + .../com/simple/service/impl/WxCouponChannelServiceImpl.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/mallinkService/src/main/java/com/simple/domain/vo/WxCouponChannelAddVo.java b/mallinkService/src/main/java/com/simple/domain/vo/WxCouponChannelAddVo.java index c19e7125f..ca4b8e294 100644 --- a/mallinkService/src/main/java/com/simple/domain/vo/WxCouponChannelAddVo.java +++ b/mallinkService/src/main/java/com/simple/domain/vo/WxCouponChannelAddVo.java @@ -20,6 +20,7 @@ public class WxCouponChannelAddVo implements Serializable { this.couponId = wxCoupon.getId(); this.title = wxCoupon.getTitle(); this.validEndDate = wxCoupon.getValidEndDate(); + this.channelId = channelId; return this; } diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxCouponChannelServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxCouponChannelServiceImpl.java index 6cac84d3b..fbba9611d 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxCouponChannelServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxCouponChannelServiceImpl.java @@ -85,7 +85,7 @@ public class WxCouponChannelServiceImpl implements WxCouponChannelService { if(result) { return new ResultData(errorList); }else { - return new ResultData(Result.ERROR,"请检查券的有效期以及投放截止时间",errorList); + return new ResultData(Result.SUCCESS,"请检查券的有效期以及投放截止时间",errorList); }