From a85024cfad9ad6ec8987b4e998ddc126989811d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9B=B7=E6=AC=A7=EF=BC=88=E6=9E=97=E5=B9=B3=E5=87=A1?= =?UTF-8?q?=EF=BC=89?= Date: Tue, 29 Jul 2025 15:44:54 +0800 Subject: [PATCH 1/3] 1 --- .../java/cn/van/business/util/JDUtil.java | 51 ++++++++++++++----- 1 file changed, 37 insertions(+), 14 deletions(-) diff --git a/src/main/java/cn/van/business/util/JDUtil.java b/src/main/java/cn/van/business/util/JDUtil.java index 55962aa..364644a 100644 --- a/src/main/java/cn/van/business/util/JDUtil.java +++ b/src/main/java/cn/van/business/util/JDUtil.java @@ -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"); + * /** * 密钥配置 */ @@ -1420,10 +1425,10 @@ public class JDUtil { finallyMessage.put("priceList", priceList); } catch (Exception ignored) { } - }else { + } else { XbMessage xbMessage = new XbMessage(); xbMessage.setCreateDate(LocalDate.now()); - xbMessage.setTipOriginalMessage( message); + xbMessage.setTipOriginalMessage(message); xbMessage = xbMessageRepository.save(xbMessage); xbMessageId = xbMessage.getId(); } @@ -1440,11 +1445,11 @@ public class JDUtil { continue; } long totalCount = productInfo.getTotalCount(); - if (isCj){ - if (totalCount == 0){ - // 优惠券 - }else { - // 商品信息 + if (isCj) { + if (totalCount == 0) { + // 优惠券 + } else { + // 商品信息 XbMessageItem xbMessageItem = new XbMessageItem(); xbMessageItem.setCreateDate(LocalDate.now()); xbMessageItem.setXbMessageId(String.valueOf(xbMessageId)); @@ -1578,7 +1583,8 @@ public class JDUtil { return finallyMessage; } - private void cjToDB(){ + + private void cjToDB() { new Date(); } @@ -2300,7 +2306,24 @@ public class JDUtil { String dateStr = input.replaceAll("慢单|录单", "").trim(); logger.info("解析出的日期 {}", dateStr); if (!dateStr.isEmpty()) { - List dateFromLD = getDateFromLD(dateStr); + List 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) { From 60777dda32876bf3b5a96081259610ebd090535f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9B=B7=E6=AC=A7=EF=BC=88=E6=9E=97=E5=B9=B3=E5=87=A1?= =?UTF-8?q?=EF=BC=89?= Date: Tue, 29 Jul 2025 17:03:26 +0800 Subject: [PATCH 2/3] 1 --- src/main/java/cn/van/business/util/JDUtil.java | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/main/java/cn/van/business/util/JDUtil.java b/src/main/java/cn/van/business/util/JDUtil.java index 364644a..8b89830 100644 --- a/src/main/java/cn/van/business/util/JDUtil.java +++ b/src/main/java/cn/van/business/util/JDUtil.java @@ -9,7 +9,6 @@ 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; @@ -27,14 +26,12 @@ import com.jd.open.api.sdk.request.kplunion.UnionOpenPromotionBysubunionidGetReq 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 org.slf4j.Logger; -import org.slf4j.LoggerFactory; import lombok.Getter; import lombok.Setter; import lombok.extern.slf4j.Slf4j; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; 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; From 4db21ffd8df63ab588926689d547c9c2ed185ba7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9B=B7=E6=AC=A7=EF=BC=88=E6=9E=97=E5=B9=B3=E5=87=A1?= =?UTF-8?q?=EF=BC=89?= Date: Tue, 29 Jul 2025 17:06:31 +0800 Subject: [PATCH 3/3] 1 --- src/main/java/cn/van/business/util/JDUtil.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/cn/van/business/util/JDUtil.java b/src/main/java/cn/van/business/util/JDUtil.java index 8b89830..e2a1e86 100644 --- a/src/main/java/cn/van/business/util/JDUtil.java +++ b/src/main/java/cn/van/business/util/JDUtil.java @@ -20,6 +20,7 @@ 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.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;