support multiple promotion at same time

chenchao
Commit ef00bf511a269a359bec2971c7b14002f5f0dbde 1 parent 90ed1ecc
Showing 1 changed file with 4 additions and 2 deletions
coupon/src/main/java/com/yoho/ufo/coupon/service/impl/PromotionServiceImpl.java
--- a/coupon/src/main/java/com/yoho/ufo/coupon/service/impl/PromotionServiceImpl.java
View file @ef00bf5
+++ b/coupon/src/main/java/com/yoho/ufo/coupon/service/impl/PromotionServiceImpl.java
View file @ef00bf5
@@ -201,10 +201,11 @@ public class PromotionServiceImpl implements IPromotionService {
                 log.warn("updateStatusById fail: activity not set businessClient. id is {}, status is {}", id, status);
                 return new ApiResponse.ApiResponseBuilder().code(201).message("该活动未设置购买渠道，请先设置购买渠道！").build();
             }
+            /*
             if (isExistRunningActivity(id, activity.getStartTime(), activity.getEndTime(), activity.getBusinessClient())) {
                 log.warn("updateStatusById fail: exist same promotionType activity. id is {}, status is {}", id, status);
                 return new ApiResponse.ApiResponseBuilder().code(201).message("该时段已经存在相同类型的活动，请修改活动时间").build();
-            }
+            }*/
         }
         PromotionActivity activity = new PromotionActivity();
         activity.setId(id);
@@ -290,11 +291,12 @@ public class PromotionServiceImpl implements IPromotionService {
             log.warn("checkParams fail: endTime less than startTime. req is {}", req);
             return new ApiResponse.ApiResponseBuilder().code(201).message("结束时间必须大于开始时间").build();
         }
+        /*
         if(req.getInitStatus().equals(PromotionStatusEnum.OPEN.getCode())
         &&(isExistRunningActivity(req.getId(), startTime, endTime, req.getBusinessClient()))){
             log.warn("checkParams fail: exist same promotionType activity. req is {}", req);
             return new ApiResponse.ApiResponseBuilder().code(201).message("该时段已经存在相同类型的活动，请修改活动时间").build();
-        }
+        }*/
         for(String params : req.getPromotionProductScopes().split("-")){
             PromotionProductScopeBo scopeBo = JSON.parseObject(params, PromotionProductScopeBo.class);
             if(scopeBo.getProductScopeType().equals(PromotionProductLimitEnum.ALL.getCode())) continue;