Merge branch 'cooperation_video_candidate_pool_improved_lld_0509' into test

api-module/src/main/java/com/tzld/piaoquan/api/service/contentplatform/impl/ContentPlatformPlanServiceImpl.java

@@ -2257,7 +2257,8 @@ public class ContentPlatformPlanServiceImpl implements ContentPlatformPlanServic
                 && !Objects.equals(loginUser.getType(), ContentPlatformAccountTypeEnum.AGENT.getVal())) {
             throw new CommonException(ExceptionEnum.XCX_PLAN_INTERNAL_ONLY);
         }
-        Long now = System.currentTimeMillis();
+        long baseNow = System.currentTimeMillis();
+        long offset = 0L;
         List<ContentPlatformXcxPlan> list = new ArrayList<>();
         for (XcxPlanSaveVideoParam videoParam : param.getVideoList()) {
             int count = (videoParam.getCount() == null || videoParam.getCount() <= 0)
@@ -2266,6 +2267,7 @@ public class ContentPlatformPlanServiceImpl implements ContentPlatformPlanServic
                 throw new CommonException(ExceptionEnum.PARAM_ERROR);
             }
             for (int i = 0; i < count; i++) {
+                long ts = baseNow + offset++;
                 ContentPlatformXcxPlan xcxPlan = new ContentPlatformXcxPlan();
                 xcxPlan.setAudiencePackage(param.getAudiencePackage());
                 xcxPlan.setRemark(param.getRemark());
@@ -2280,8 +2282,8 @@ public class ContentPlatformPlanServiceImpl implements ContentPlatformPlanServic
                 xcxPlan.setRootSourceId(rootSourceId);
                 xcxPlan.setStatus(PlanStatusEnum.NORMAL.getVal());
                 xcxPlan.setCreateAccountId(loginUser.getId());
-                xcxPlan.setCreateTimestamp(now);
-                xcxPlan.setUpdateTimestamp(now);
+                xcxPlan.setCreateTimestamp(ts);
+                xcxPlan.setUpdateTimestamp(ts);
                 planMapperExt.insertXcxPlanReturnId(xcxPlan);
                 list.add(xcxPlan);
                 // 保存视频内容
@@ -2331,10 +2333,11 @@ public class ContentPlatformPlanServiceImpl implements ContentPlatformPlanServic
         }
         ContentPlatformXcxPlanVideo srcVideo = srcVideoList.get(0);
 
-        Long now = System.currentTimeMillis();
+        long baseNow = System.currentTimeMillis();
         List<ContentPlatformXcxPlan> created = new ArrayList<>();
         try {
             for (int i = 0; i < param.getCount(); i++) {
+                long ts = baseNow + i;
                 ContentPlatformXcxPlan xcxPlan = new ContentPlatformXcxPlan();
                 xcxPlan.setAudiencePackage(src.getAudiencePackage());
                 xcxPlan.setRemark(src.getRemark());
@@ -2348,8 +2351,8 @@ public class ContentPlatformPlanServiceImpl implements ContentPlatformPlanServic
                 xcxPlan.setRootSourceId(rootSourceId);
                 xcxPlan.setStatus(PlanStatusEnum.NORMAL.getVal());
                 xcxPlan.setCreateAccountId(loginUser.getId());
-                xcxPlan.setCreateTimestamp(now);
-                xcxPlan.setUpdateTimestamp(now);
+                xcxPlan.setCreateTimestamp(ts);
+                xcxPlan.setUpdateTimestamp(ts);
                 planMapperExt.insertXcxPlanReturnId(xcxPlan);
                 created.add(xcxPlan);