cps5期新人满单返活动

@@ -1529,7 +1529,16 @@ public class UnionShareServiceImpl implements IUnionShareService,IBusinessExport
     public void dealWithCpsNewUserActivity(UnionShareOrdersActivity activity,int beginTime,int endTime,int orderEndTime) {
         logger.info("dealWithCpsNewUserActivity,activity is {},beginTime is {},endTime is {},orderEndTime is {}.",activity,beginTime,endTime,orderEndTime);
         //查询可以参与活动的uid
-        Set<Integer> uids=unionShareUserApplyMapper.selectUidListByTime(activity.getStartTime(), activity.getEndTime());
+        if (activity.getStartTime() > beginTime) {
+            beginTime = activity.getStartTime();
+        }
+        if (activity.getEndTime() < endTime) {
+            endTime = activity.getEndTime();
+        }
+        if (endTime <= beginTime) {
+            return;
+        }
+        Set<Integer> uids=unionShareUserApplyMapper.selectUidListByTime(beginTime, endTime);
         logger.info("dealWithCpsNewUserActivity,activity is {},beginTime is {},endTime is {},orderEndTime is {},selectUidListByTime, uids is {}",activity,beginTime,endTime,orderEndTime,uids);
         if (CollectionUtils.isEmpty(uids)) {
             return;