From de88080479cc189bfc97033f24c1139a327536c1 Mon Sep 17 00:00:00 2001 From: xjm Date: Mon, 25 Sep 2023 14:55:42 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E7=BB=9F=E8=AE=A1=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=20=E6=B7=BB=E5=8A=A0=E4=B8=8A=E5=A4=84=E7=BD=AE?= =?UTF-8?q?=E7=A0=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/cowr/ssjygl/overall/OverallService.java | 4 ++-- .../com/cowr/ssjygl/stat/sale/OrderStatService.java | 10 +++++----- .../com/cowr/local/ssjygl/order/LocalOrderService.java | 3 +++ 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/overall/OverallService.java b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/overall/OverallService.java index a4c8e5c..adfb6fb 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/overall/OverallService.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/overall/OverallService.java @@ -175,7 +175,7 @@ group by date " from order_temp t\n" + " where t.sale_type = 0\n" + " and t.state = 5\n" + - " and t.product_id != 4\n" + +// " and t.product_id != 4\n" + " union\n" + " select \n" + " 0 total_weight,\n" + @@ -446,7 +446,7 @@ group by date List data2 = Db.find("select case when t.customer_id is null then 2 else 1 end cid, count(t.sn) day_cnt, sum(t.weight) day_weight, sum(total_price) day_total_price \n" + " from order_temp t\n" + " where t.state = 5\n" + - " and t.product_id != 4\n" + +// " and t.product_id != 4\n" + " and t.create_time like ?\n" + " group by cid", nowdaytm + "%"); 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 412b344..ea88667 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 @@ -2243,7 +2243,7 @@ public class OrderStatService { " ifnull(sum(t.total_price), 0) total_price\n" + " from order_temp t\n" + " where t.state = 5\n" + - " and t.product_id != 4\n" + +// " and t.product_id != 4\n" + saleParam + " and t.supermarket_id = 4\n" + " and (t.create_time < '2021-09-08 00:00:00'\n" + @@ -2261,7 +2261,7 @@ public class OrderStatService { " ifnull(sum(t.total_price), 0) total_price\n" + " from order_temp t\n" + " where t.state = 5\n" + - " and t.product_id != 4\n" + +// " and t.product_id != 4\n" + saleParam + " and t.supermarket_id = 4\n" + " and ((t.create_time >= '2021-09-08 00:00:00' and t.create_time <= '2021-10-15 23:59:59') \n" + @@ -2299,7 +2299,7 @@ public class OrderStatService { " ifnull(sum(t.total_price), 0) total_price\n" + " from order_temp t\n" + " where t.state = 5\n" + - " and t.product_id != 4\n" + +// " and t.product_id != 4\n" + saleParam + " and t.supermarket_id != 4\n" + " and t.create_time>= ? \n" + @@ -2357,7 +2357,7 @@ public class OrderStatService { " select t.customer_id, sum(t.total_price) total_price\n" + " from order_temp t\n" + " where t.customer_id is not null\n" + - " and t.product_id != 4\n" + +// " and t.product_id != 4\n" + " and t.create_time <= ?\n" + " and t.state = 5\n" + " and t.sale_type = 0\n" + @@ -2664,7 +2664,7 @@ public class OrderStatService { " ifnull(sum(t.total_price), 0) total_price\n" + " from order_temp t\n" + " where t.state = 5\n" + - " and t.product_id != 4\n" + +// " and t.product_id != 4\n" + " and t.create_time >= ?\n" + " and t.create_time <= ?\n" + paramsSql + diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/LocalOrderService.java b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/LocalOrderService.java index e428ca5..8661d2a 100644 --- a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/LocalOrderService.java +++ b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/LocalOrderService.java @@ -362,6 +362,9 @@ public class LocalOrderService { remark = "外销订单：" + StrUtil.getRecordStr(order, "old_sn"); } else { remark = "订单号：" + StrUtil.getRecordStr(order, "sn"); + if ("处置砂".equals(StrUtil.getRecordStr(order, "product_name"))){ + remark += " 处置砂"; + } } // if(StrKit.notBlank(origin)){