|
|
|
@@ -13,7 +13,7 @@ import com.iformall.domain.po.WxMerchant; |
|
|
|
import com.iformall.domain.po.WxMiniappThemeValue; |
|
|
|
import com.iformall.enums.EnumCouponType; |
|
|
|
import com.iformall.enums.EnumMerchantStatus; |
|
|
|
import com.iformall.utils.RedisCacheUtils; |
|
|
|
import com.iformall.utils.*; |
|
|
|
import org.apache.commons.beanutils.BeanUtils; |
|
|
|
import org.apache.commons.lang3.StringUtils; |
|
|
|
import org.slf4j.Logger; |
|
|
|
@@ -39,9 +39,7 @@ import com.iformall.service.WxCouponChannelService; |
|
|
|
import com.iformall.service.WxCouponService; |
|
|
|
import com.iformall.service.WxMerchantService; |
|
|
|
import com.iformall.service.util.CouponCacheUtils; |
|
|
|
import com.iformall.utils.Constant; |
|
|
|
import com.iformall.utils.RedisCacheUtils; |
|
|
|
import com.iformall.utils.RedisLock; |
|
|
|
|
|
|
|
import io.swagger.annotations.Api; |
|
|
|
import io.swagger.annotations.ApiImplicitParam; |
|
|
|
@@ -566,6 +564,10 @@ public class WxCouponController extends BaseController { |
|
|
|
) { |
|
|
|
Date now = new Date(); |
|
|
|
|
|
|
|
logger.info("系统时间"+ now.getTime()); |
|
|
|
logger.info("开始时间"+ wxCouponCVo.getBeginTime().getTime()); |
|
|
|
logger.info("结束时间"+ wxCouponCVo.getEndTime().getTime()); |
|
|
|
|
|
|
|
if (wxCouponCVo.getBeginTime().getTime() > now.getTime()) { |
|
|
|
wxCouponCVo.setActivityStatus(EnumCouponChannelActivityStatus.PREPARED.getCode()); |
|
|
|
} else if (wxCouponCVo.getEndTime().getTime() < now.getTime()) { |
|
|
|
|