From a0bc0282f7b63b505a7c2b59196f919d31eaad8e Mon Sep 17 00:00:00 2001 From: xjm Date: Mon, 17 Jun 2024 11:12:27 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E4=BB=BB=E5=8A=A1=E4=BF=AE?= =?UTF-8?q?=E6=94=B9,=E9=80=90=E6=97=A5=E6=95=B0=E6=8D=AE=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cowr/ssjygl/order/orderend/OrderEndService.java | 3 +++ .../com/cowr/ssjygl/stat/sale/OrderStatService.java | 12 ++++++++++-- .../com/cowr/service/ssjygl/jobs/OrderEndJob.java | 3 ++- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/order/orderend/OrderEndService.java b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/order/orderend/OrderEndService.java index 1961d5d..adbb457 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/order/orderend/OrderEndService.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/order/orderend/OrderEndService.java @@ -101,6 +101,9 @@ public class OrderEndService extends BaseService { + public void queryList(String stm,String etm,String supermarketId) { + queryList(null,null,null,stm,etm); + } public void queryList(String tm,String customerId,String supermarketId,String stm,String etm) { diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/stat/sale/OrderStatService.java b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/stat/sale/OrderStatService.java index 0ccfed9..28ee222 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/stat/sale/OrderStatService.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/stat/sale/OrderStatService.java @@ -968,8 +968,16 @@ public class OrderStatService { String productParams = ""; if (supermarket_id != null && supermarket_id > 0) { - productParams += " and t.supermarket_id = ?\n"; - paramsArray.add(supermarket_id); + if (6 == supermarket_id){ + productParams += " and (t.supermarket_id = ? OR t.supermarket_id = ? OR t.supermarket_id = ?)\n"; + paramsArray.add(6); + paramsArray.add(8); + paramsArray.add(10); + }else{ + productParams += " and t.supermarket_id = ?\n"; + paramsArray.add(supermarket_id); + } + } if (stat_product) { if (product_id != null && product_id > 0) { diff --git a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/jobs/OrderEndJob.java b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/jobs/OrderEndJob.java index a2c1ffe..efc7b3a 100644 --- a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/jobs/OrderEndJob.java +++ b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/jobs/OrderEndJob.java @@ -16,7 +16,8 @@ public class OrderEndJob implements Job { public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException { // 获取前一天的数据 log.info("开始同步"); - OrderEndService.me.syncOrderTemp(LocalDate.now().minusDays(1).toString()); // 每天早上更新数据 + LocalDate localDate = LocalDate.now().minusDays(1); + OrderEndService.me.queryList(localDate.minusDays(60).toString(),localDate.toString()); // 最近60天的数据 }