Merge branch '订单C端，校验券状态+有效期-zxh-1039062' into qa

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

@@ -21,6 +21,7 @@ import cn.freemud.entities.dto.promotion.CalculationDiscountGoodsDto;
 import cn.freemud.entities.dto.promotion.CalculationDiscountRequestDto;
 import cn.freemud.entities.vo.*;
 import cn.freemud.enums.*;
+import cn.freemud.enums.integralproduct.IntegralProductStatusEnum;
 import cn.freemud.interceptor.ServiceException;
 import cn.freemud.manager.BuyProductOnceManager;
 import cn.freemud.redis.RedisCache;
@@ -531,6 +532,13 @@ public class SellCouponOrderServiceImpl implements OrderFactoryService {
         if (CollectionUtils.isEmpty(productBindingCoupons)) {
             return ResponseUtil.error(ResponseResult.STORE_ITEM_CHECK_INVAILD);
         }
+        List<GetMenuCategoryInfoResponse.RootNodeBean.ChildrenBeanFirst.ChildrenBeanSecond.ProductBean> products = productInfosByIds.getData().getProducts();
+        for (GetMenuCategoryInfoResponse.RootNodeBean.ChildrenBeanFirst.ChildrenBeanSecond.ProductBean product : products) {
+            Integer status = product.getStatus();
+            if (!Objects.equals(status, IntegralProductStatusEnum.STATUS_2.getCode())) {
+                return ResponseUtil.error(ResponseResult.COUPON_INVAILD.getCode(),"您需要购买的券包，包含的优惠券券编号"+skuId+"包含的商品已失效，请联系门店尽快处理");
+            }
+        }
         List<String> activityCodes = new ArrayList<>();
         for (ProductBindingCouponType productBindingCouponType : productBindingCoupons) {
             activityCodes.add(productBindingCouponType.getActivityCode());
@@ -544,7 +552,18 @@ public class SellCouponOrderServiceImpl implements OrderFactoryService {
         Date now = new Date();
         for (ActiveDetailVO activeDetailVO : activeDetailVOS) {
             if (activeDetailVO.getEffectiveEndTime() != null && activeDetailVO.getEffectiveEndTime().before(now)) {
-                return ResponseUtil.error(ResponseResult.COUPON_INVAILD);
+                return ResponseUtil.error(ResponseResult.COUPON_INVAILD.getCode(),"您需要购买的券包，包含的优惠券券编号"+activeDetailVO.getActiveCode()+"已过期，请联系门店尽快处理");
+            }
+            // endDate   领券结束时间 校验  当前时间小鱼endDate
+            if (activeDetailVO.getEndDate() != null && activeDetailVO.getEndDate().before(now)) {
+                return ResponseUtil.error(ResponseResult.COUPON_INVAILD.getCode(),"您需要购买的券包，包含的优惠券券编号"+activeDetailVO.getActiveCode()+"已过期，请联系门店尽快处理");
+            }
+            // state = 1  ||  2  可以买
+            if (activeDetailVO.getState() !=null) {
+                Integer state = activeDetailVO.getState();
+                if (!Objects.equals(state,1) && !Objects.equals(state,2)) {
+                    return ResponseUtil.error(ResponseResult.COUPON_INVAILD.getCode(),"您需要购买的券包，包含的优惠券券编号"+activeDetailVO.getActiveCode()+"已失效，请联系门店尽快处理");
+                }
             }
         }
         //转换CreateOrderRequest对象