This commit is contained in:
雷欧(林平凡)
2025-07-29 15:44:54 +08:00
parent a573d71a4f
commit a85024cfad

View File

@@ -1,6 +1,5 @@
package cn.van.business.util;
import cn.hutool.http.HttpRequest;
import cn.hutool.http.HttpResponse;
import cn.van.business.model.cj.XbMessage;
@@ -10,6 +9,7 @@ import cn.van.business.model.jd.OrderRow;
import cn.van.business.model.pl.Comment;
import cn.van.business.model.pl.TaobaoComment;
import cn.van.business.repository.*;
import cn.van.business.util.ds.DataSourceConfig;
import cn.van.business.util.ds.DeepSeekClientUtil;
import cn.van.business.util.ds.GPTClientUtil;
import com.alibaba.fastjson2.JSON;
@@ -21,19 +21,20 @@ import com.jd.open.api.sdk.JdClient;
import com.jd.open.api.sdk.domain.kplunion.CouponService.request.get.CreateGiftCouponReq;
import com.jd.open.api.sdk.domain.kplunion.GoodsService.request.query.GoodsReq;
import com.jd.open.api.sdk.domain.kplunion.GoodsService.response.query.GoodsQueryResult;
import com.jd.open.api.sdk.domain.kplunion.GoodsService.response.query.UrlInfo;
import com.jd.open.api.sdk.domain.kplunion.promotionbysubunioni.PromotionService.request.get.PromotionCodeReq;
import com.jd.open.api.sdk.request.kplunion.UnionOpenCouponGiftGetRequest;
import com.jd.open.api.sdk.request.kplunion.UnionOpenGoodsQueryRequest;
import com.jd.open.api.sdk.request.kplunion.UnionOpenPromotionBysubunionidGetRequest;
import com.jd.open.api.sdk.response.kplunion.UnionOpenCouponGiftGetResponse;
import com.jd.open.api.sdk.response.kplunion.UnionOpenGoodsQueryResponse;
import com.jd.open.api.sdk.response.kplunion.UnionOpenPromotionBysubunionidGetResponse;
import lombok.Getter;
import lombok.Setter;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import lombok.Getter;
import lombok.Setter;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.data.redis.core.StringRedisTemplate;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
@@ -66,9 +67,13 @@ import static cn.van.business.util.WXUtil.*;
* @description
*/
@Component
@Slf4j
public class JDUtil {
static final DateTimeFormatter DATE_TIME_FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
/**
* static final DateTimeFormatter DATE_TIME_FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
* /**
* 密钥配置
*/
@@ -1578,6 +1583,7 @@ public class JDUtil {
return finallyMessage;
}
private void cjToDB() {
new Date();
@@ -2300,7 +2306,24 @@ public class JDUtil {
String dateStr = input.replaceAll("慢单|录单", "").trim();
logger.info("解析出的日期 {}", dateStr);
if (!dateStr.isEmpty()) {
List<LocalDate> dateFromLD = getDateFromLD(dateStr);
List<LocalDate> dateFromLD = null;
// 处理特殊关键词:昨日、三日、七日
if ("昨日".equals(dateStr)) {
LocalDate yesterday = LocalDate.now().minusDays(1);
dateFromLD = Arrays.asList(yesterday, yesterday);
} else if ("三日".equals(dateStr)) {
LocalDate endDate = LocalDate.now().minusDays(1); // 昨天
LocalDate startDate = LocalDate.now().minusDays(3); // 三天前
dateFromLD = Arrays.asList(startDate, endDate);
} else if ("七日".equals(dateStr)) {
LocalDate endDate = LocalDate.now().minusDays(1); // 昨天
LocalDate startDate = LocalDate.now().minusDays(7); // 七天前
dateFromLD = Arrays.asList(startDate, endDate);
} else {
dateFromLD = getDateFromLD(dateStr);
}
if (dateFromLD != null && !dateFromLD.isEmpty()) {
// 如果只有一个日期,复制一份形成范围
if (dateFromLD.size() == 1) {