积分商城兑换券校验

order-application-service/src/main/java/cn/freemud/entities/BatchQueryActivityInfoResponse.java

-package cn.freemud.entities;
-
-import java.util.List;
-
-public class BatchQueryActivityInfoResponse {
-
-    /**
-     * 状态码
-     */
-    private String statusCode;
-
-    /**
-     * 状态码描述
-     */
-    private String msg;
-
-    private List<Active> activities;
-
-}
+//package cn.freemud.entities;
+//
+//import java.util.List;
+//
+//public class BatchQueryActivityInfoResponse {
+//
+//    /**
+//     * 状态码
+//     */
+//    private String statusCode;
+//
+//    /**
+//     * 状态码描述
+//     */
+//    private String msg;
+//
+//    private List<Active> activities;
+//
+//}

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

@@ -131,13 +131,15 @@ public class PointsMallOrderServiceImpl implements PointsMallOrderService {
                 return ResponseUtil.error(batchQueryActivityInfoResponseDto.getStatusCode(), "优惠券异常");
             }
             active = batchQueryActivityInfoResponseDto.getActivities().get(0);
+            Date couponValidEnd = getCouponValidEnd(active);
             //券商品查询券活动信息校验券有效
             //只有1和2能发，一般没有2
             List<Integer> canSendCoupon = Arrays.asList(CouponActiveStateEnum.STATE_1.getCode(),CouponActiveStateEnum.STATE_2.getCode());
-            if(!canSendCoupon.contains(active.getState())){
+            if(!canSendCoupon.contains(active.getState()) || couponValidEnd == null){
                 return ResponseUtil.error(ResponseCodeConstant.RESPONSE_ERROR_STR, "优惠券异常");
             }
-            if(getCouponValidEnd(active).after(new Date())){
+            //券已过期
+            if(getCouponValidEnd(active).before(new Date())){
                 return ResponseUtil.error(ResponseCodeConstant.RESPONSE_ERROR_STR, "优惠券已过期，无法兑换");
             }
         }
@@ -574,7 +576,7 @@ public class PointsMallOrderServiceImpl implements PointsMallOrderService {
                 returnDate = DateUtil.addDays(new Date(), (delayTimes + validityPeriod - 1));
             }
         } else {
-            returnDate = activeInfo.getEffectiveEnd();
+            returnDate = activeInfo.getEffectiveEndTime();
         }
         return returnDate;
     }