diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxCouponChannelController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxCouponChannelController.java index 167c1a6da..97e7bb0e2 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxCouponChannelController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxCouponChannelController.java @@ -58,7 +58,7 @@ public class WxCouponChannelController extends BaseController { }); } - return new ResultData(); + return new ResultData(page); } } diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxCouponController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxCouponController.java index 71f9eea20..243f4f9ce 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxCouponController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxCouponController.java @@ -4,6 +4,8 @@ import com.iformall.common.ErrorCode; import com.iformall.common.ResultData; import com.iformall.domain.po.WxCouponChannel; import com.iformall.domain.vo.WxCouponCVo; +import com.iformall.enums.EnumCouponChannelActivityStatus; +import com.iformall.enums.EnumCouponChannelType; import com.iformall.service.WxCouponChannelService; import io.swagger.annotations.Api; @@ -18,6 +20,8 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import java.util.Date; + @RestController @RequestMapping("/api/wxCoupon") @Api(description = "券类型相关接口") @@ -48,6 +52,19 @@ public class WxCouponController extends BaseController { if (wxCouponCVo == null) return new ResultData(ErrorCode.COUPON_IS_EMPTY); + if (wxCouponCVo.getTargetAd()!= null && + wxCouponCVo.getTargetAd().equals(EnumCouponChannelType.COUPON_CHANNEL_ID_TIMED.getCode())) { + Date now = new Date(); + + if (wxCouponCVo.getBeginTime().getTime() > now.getTime()) { + wxCouponCVo.setActivityStatus(EnumCouponChannelActivityStatus.PREPARED.getCode()); + } else if (wxCouponCVo.getEndTime().getTime() < now.getTime()) { + wxCouponCVo.setActivityStatus(EnumCouponChannelActivityStatus.ENDED.getCode()); + } else { + wxCouponCVo.setActivityStatus(EnumCouponChannelActivityStatus.STARTED.getCode()); + } + } + return new ResultData(wxCouponCVo); } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCouponChannel.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCouponChannel.java index 265cfb6ea..d883f5ee0 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCouponChannel.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCouponChannel.java @@ -40,9 +40,6 @@ public class WxCouponChannel implements Serializable { this.ids = ids; } - @Transient - private Integer activityStatus; - @Transient private Date startdate; @@ -100,13 +97,6 @@ public class WxCouponChannel implements Serializable { @io.swagger.annotations.ApiModelProperty(value="子频道ID",name="subTargetId") private Long subTargetId; - public Integer getActivityStatus() { - return activityStatus; - } - - public void setActivityStatus(Integer activityStatus) { - this.activityStatus = activityStatus; - } public String getTenantId() { return tenantId; diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponCVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponCVo.java index 86bc1c5b2..3de61a95b 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponCVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponCVo.java @@ -34,6 +34,19 @@ public class WxCouponCVo extends WxCoupon implements Serializable { @Transient private String priceStr; + + @Transient + private Integer activityStatus; + + public Integer getActivityStatus() { + return activityStatus; + } + + public void setActivityStatus(Integer activityStatus) { + this.activityStatus = activityStatus; + } + + /*券ID**/ @io.swagger.annotations.ApiModelProperty(value="券ID",name="couponId") private Long couponId; diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponChannelVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponChannelVo.java index cfd8751ba..c2d030200 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponChannelVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponChannelVo.java @@ -15,6 +15,19 @@ import java.util.List; public class WxCouponChannelVo extends WxCouponChannel implements Serializable { private static final long serialVersionUID = 1L; + @Transient + private Integer activityStatus; + + public Integer getActivityStatus() { + return activityStatus; + } + + public void setActivityStatus(Integer activityStatus) { + this.activityStatus = activityStatus; + } + + + /*总库存**/ @io.swagger.annotations.ApiModelProperty(value="总库存",name="inventory") private Integer inventory; @@ -74,6 +87,8 @@ public class WxCouponChannelVo extends WxCouponChannel implements Serializable { private Integer pressLimitNum; + + public Integer getGameWeight() { return gameWeight; }