| @@ -7,6 +7,7 @@ import java.util.List; | |||||
| import java.util.Map; | import java.util.Map; | ||||
| import java.util.concurrent.TimeUnit; | import java.util.concurrent.TimeUnit; | ||||
| import com.iformall.enums.EnumCouponType; | |||||
| import org.apache.commons.beanutils.BeanUtils; | import org.apache.commons.beanutils.BeanUtils; | ||||
| import org.apache.commons.lang3.StringUtils; | import org.apache.commons.lang3.StringUtils; | ||||
| import org.slf4j.Logger; | import org.slf4j.Logger; | ||||
| @@ -244,8 +245,9 @@ public class WxCouponController extends BaseController { | |||||
| } | } | ||||
| private void updateActivityStatus(WxCouponCVo wxCouponCVo) { | private void updateActivityStatus(WxCouponCVo wxCouponCVo) { | ||||
| if (wxCouponCVo.getTargetAd() != null && | |||||
| wxCouponCVo.getTargetAd().equals(EnumCouponChannelType.COUPON_CHANNEL_ID_TIMED.getCode())) { | |||||
| if (wxCouponCVo.getType().equals(EnumCouponType.COUPON_PREORDER.getCode()) || | |||||
| (wxCouponCVo.getTargetAd() != null && wxCouponCVo.getTargetAd().equals(EnumCouponChannelType.COUPON_CHANNEL_ID_TIMED.getCode())) | |||||
| ) { | |||||
| Date now = new Date(); | Date now = new Date(); | ||||
| if (wxCouponCVo.getBeginTime().getTime() > now.getTime()) { | if (wxCouponCVo.getBeginTime().getTime() > now.getTime()) { | ||||