|
@@ -28,14 +28,7 @@ import org.springframework.stereotype.Service;
|
|
|
|
|
|
import java.math.BigDecimal;
|
|
|
import java.math.RoundingMode;
|
|
|
-import java.util.ArrayList;
|
|
|
-import java.util.Arrays;
|
|
|
-import java.util.Collections;
|
|
|
-import java.util.Comparator;
|
|
|
-import java.util.Date;
|
|
|
-import java.util.HashMap;
|
|
|
-import java.util.List;
|
|
|
-import java.util.Map;
|
|
|
+import java.util.*;
|
|
|
|
|
|
|
|
|
/**
|
|
@@ -463,7 +456,7 @@ public class KuaishouItemCollectSamplesServiceImpl implements IKuaishouItemColle
|
|
|
JSONObject order = new JSONObject();
|
|
|
|
|
|
//当前小时
|
|
|
- Integer hour2 = DateUtils.getNowHour() - 1;
|
|
|
+ Integer hour2 = DateUtils.getNowHour() ;
|
|
|
//当天 yyyy-MM-dd
|
|
|
String today = DateUtils.getNowDateStr();
|
|
|
|
|
@@ -608,7 +601,7 @@ public class KuaishouItemCollectSamplesServiceImpl implements IKuaishouItemColle
|
|
|
if (Check.isNotNull(itemIds)) {
|
|
|
JSONObject order = null;
|
|
|
//当前小时
|
|
|
- Integer hour2 = DateUtils.getNowHour() - 1;
|
|
|
+ Integer hour2 = DateUtils.getNowHour();
|
|
|
//当天
|
|
|
String today = DateUtils.getNowDateStr();
|
|
|
//根据本阶段日期 获取上阶段 开始 和 截至 日期
|