Merge branch 'feature-zxh-20211109-替换券码查询接口-1039131'

order-application-service/src/main/java/cn/freemud/service/impl/SellCouponOrderServiceImpl.java

@@ -637,8 +637,12 @@ public class SellCouponOrderServiceImpl implements OrderFactoryService {
                 return ResponseUtil.error(ResponseResult.COUPON_INVAILD.getCode(),"您需要购买的券包，包含的优惠券券编号"+activeDetailVO.getTemplateCode()+"已过期，请联系门店尽快处理");
             }
             // endDate   领券结束时间 校验  当前时间小鱼endDate
-            if (activeDetailVO.getReceiveEndTime() != null && activeDetailVO.getReceiveEndTime().before(now)) {
-                return ResponseUtil.error(ResponseResult.COUPON_INVAILD.getCode(),"您需要购买的券包，包含的优惠券券编号"+activeDetailVO.getTemplateCode()+"已过期，请联系门店尽快处理");
+
+            if (activeDetailVO.getReceiveStartTime() != null && now.before(activeDetailVO.getReceiveStartTime())) {
+                return ResponseUtil.error(ResponseResult.COUPON_INVAILD.getCode(),"您需要购买的券包，包含的优惠券券编号"+activeDetailVO.getTemplateCode()+"未到领券时间，请联系门店尽快处理");
+            }
+            if (activeDetailVO.getReceiveEndTime() != null && now.before(activeDetailVO.getReceiveEndTime())) {
+                return ResponseUtil.error(ResponseResult.COUPON_INVAILD.getCode(),"您需要购买的券包，包含的优惠券券编号"+activeDetailVO.getTemplateCode()+"领券时间已结束，请联系门店尽快处理");
             }
             // state = 1  ||  2  可以买
             if (activeDetailVO.getStatus() !=null) {