From 0e4d4b35657647c1fb6f33409907bd9be84c9609 Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Thu, 4 Jul 2019 11:37:55 +0800 Subject: [PATCH] =?UTF-8?q?[=E6=B6=88=E6=81=AF][=E4=BF=AE=E6=94=B9]:?= =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E6=B6=88=E6=81=AF=E6=A3=80=E6=9F=A5?= =?UTF-8?q?formId=E5=8F=8AprepayId=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/WxCouponOrderServiceImpl.java | 23 +++++++++++++------ 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java index 799282200..d5eb0afa1 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java @@ -20,6 +20,7 @@ import com.iformall.exception.MallinkException; import com.iformall.mapper.*; import com.iformall.mq.MqBaseProducer; import com.iformall.service.*; +import com.iformall.utils.DateUtils; import com.iformall.utils.PayUtils; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; @@ -571,10 +572,6 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { logger.error("找不到订单信息"); throw new MallinkException(ErrorCode.ORDER_IS_NOT_FIND); } - String formId = null; - if(StringUtils.isNotBlank(order.getFormId())) { - formId = order.getFormId(); - } // 2. get coupon info WxCoupon coupon = wxCouponMapper.selectByPrimaryKey(couponOrder.getCouponId()); if (coupon == null) { @@ -626,6 +623,15 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { doVerifyAppUniformMsg(couponOrder, coupon, merchant, user, dateFormat, gotopage); } + // 小程序 消息 + String formId = null; + Date curDate = new Date(); + Date dateAfter7Day = DateUtils.getHourTimeAfter(7, order.getCreateDate()); + if(StringUtils.isNotBlank(order.getFormId()) && curDate.before(dateAfter7Day) + && !order.getFormId().equalsIgnoreCase("undefined")) { + formId = order.getFormId(); + } + // 6. get payOrder info int formType = EnumMsgLimitType.WEAPP_FORMID.getCode(); if(StringUtils.isBlank(order.getFormId()) || order.getFormId().equalsIgnoreCase("undefined")) { @@ -647,12 +653,15 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { logger.error("payOrder信息中,prepay_id为空"); throw new MallinkException(ErrorCode.PREPAY_ID_IS_EMPTY); } - formId = payOrder.getPrepayId(); - formType = EnumMsgLimitType.WEAPP_PREPAYID.getCode(); + dateAfter7Day = DateUtils.getHourTimeAfter(7, payOrder.getCreateTime()); + if(curDate.before(dateAfter7Day)) { + formId = payOrder.getPrepayId(); + formType = EnumMsgLimitType.WEAPP_PREPAYID.getCode(); + } } if(StringUtils.isBlank(formId)) { - logger.error("formId为空"); + logger.error("无可用formId, 不能发小程序模板消息"); return; }