From 0b5c08f80c059e2e521f2a73310164ff8610bd98 Mon Sep 17 00:00:00 2001 From: xjm Date: Wed, 13 Dec 2023 15:55:43 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E8=A1=A8=E6=A0=BC=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9,=20=E7=9B=B8?= =?UTF-8?q?=E5=85=B3=E6=85=A2sql=E8=BF=9B=E8=A1=8C=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../order/ordertemp/OrderTempService.java | 2 +- .../ssjygl/stat/sale/OrderStatService.java | 62 ++++++++++++++++--- .../system/sysuser/SysuserController.java | 4 +- 3 files changed, 58 insertions(+), 10 deletions(-) diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/order/ordertemp/OrderTempService.java b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/order/ordertemp/OrderTempService.java index 2ce9748..210e66c 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/order/ordertemp/OrderTempService.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/order/ordertemp/OrderTempService.java @@ -470,7 +470,7 @@ public class OrderTempService extends BaseService { } String sql = "SELECT\n" + - "ifnull(CUSTOMER_ID, -1 ) CUSTOMER_ID,\n" + + "ifnull(CUSTOMER_ID, 0 ) CUSTOMER_ID,\n" + "DATE_FORMAT( CREATE_TIME, '%Y-%m-%d' ) DATE,\n" + "SUPERMARKET_ID,\n" + "SUM( WEIGHT ) WEIGHT,\n" + 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 a283b9e..e65cb2c 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 @@ -2288,13 +2288,30 @@ public class OrderStatService { " and t.supermarket_id = 4\n" + " and (t.create_time < '2021-09-08 00:00:00'\n" + " or t.create_time > '2021-10-15 23:59:59')\n" + - " and t.create_time >= ? \n" + - " and t.create_time <= ?\n" + + " AND t.create_time >= CONCAT( CURDATE(), ' 00:00:00' )" + +// " and t.create_time >= ? \n" + +// " and t.create_time <= ?\n" + " and (t.create_time < '2021-10-20 00:00:00' or t.create_time > '2021-10-20 23:59:59')\n" + paramsSql + " group by t.customer_id\n"; + union_4 += " UNION\n" + + " SELECT\n" + + " ifnull( t.customer_id, 0 ) customer_id,\n" + + " t.supermarket_id,\n" + + " ifnull( sum( t.weight ), 0 ) weight,\n" + + " ifnull( sum( t.total_price ), 0 ) total_price \n" + + " FROM\n" + + " order_end t \n" + + " WHERE\n" + + " t.supermarket_id != 4 \n" + + " AND t.date >= ? \n" + + " AND t.date <= ? \n" + + saleParam + + " GROUP BY\n" + + " t.customer_id,\n" + + " t.supermarket_id"; - String union_99 = "union select\n" + + String union_99 = " union select\n" + " ifnull(t.customer_id, 0) customer_id,\n" + " 99 supermarket_id,\n" + " ifnull(sum(t.weight), 0) weight,\n" + @@ -2306,11 +2323,29 @@ public class OrderStatService { " 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" + " or (t.create_time >= '2021-10-20 00:00:00' and t.create_time <= '2021-10-20 23:59:59'))\n" + - " and t.create_time >= ? \n" + - " and t.create_time <= ?\n" + + " AND t.create_time >= CONCAT( CURDATE(), ' 00:00:00' ) \n" + +// " and t.create_time >= ? \n" + +// " and t.create_time <= ?\n" + paramsSql + " group by t.customer_id\n"; + union_99 += " union SELECT\n" + + " ifnull( t.customer_id, 0 ) customer_id,\n" + + " t.supermarket_id,\n" + + " ifnull( sum( t.weight ), 0 ) weight,\n" + + " ifnull( sum( t.total_price ), 0 ) total_price \n" + + " FROM\n" + + " order_end t \n" + + " WHERE\n" + + " t.supermarket_id = 4 \n" + + " AND ( t.date < '2021-09-08 00:00:00' OR t.date > '2021-10-15 23:59:59' ) \n" + + " AND t.date >= ? \n" + + " AND t.date <= ? \n" + + " AND ( t.date < '2021-10-20 00:00:00' OR t.date > '2021-10-20 23:59:59' ) \n" + + saleParam + + " GROUP BY\n" + + " t.customer_id "; + String order_sql = ""; String sql = "select\n" + @@ -2346,10 +2381,23 @@ public class OrderStatService { // " and t.product_id != 4\n" + saleParam + " and t.supermarket_id != 4\n" + - " and t.create_time>= ? \n" + - " and t.create_time<= ?\n" + + " AND t.create_time >= CONCAT( CURDATE(), ' 00:00:00' ) \n" + +// " and t.create_time>= ? \n" + +// " and t.create_time<= ?\n" + paramsSql + " group by t.customer_id, t.supermarket_id\n" + + " union select\n" + + " ifnull(t.customer_id, 0) customer_id,\n" + + " t.supermarket_id,\n" + + " ifnull(sum(t.weight), 0) weight,\n" + + " ifnull(sum(t.total_price), 0) total_price\n" + + " from order_end t\n" + + " where t.supermarket_id != 4\n" + +// " and t.product_id != 4\n" + + " and t.date>= ? \n" + + " and t.date<= ?\n" + + saleParam + + " group by t.customer_id, t.supermarket_id\n" + union_4 + union_99 + " ) g\n" + " group by g.customer_id\n"; diff --git a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/system/sysuser/SysuserController.java b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/system/sysuser/SysuserController.java index 30c653f..00431dc 100644 --- a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/system/sysuser/SysuserController.java +++ b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/system/sysuser/SysuserController.java @@ -192,8 +192,8 @@ public class SysuserController extends Controller { @Clear(AuthInterceptor.class) public void login() { if (!validateCaptcha("captcha")) { - renderJson(Result.failed("验证码输入错误")); - return; +// renderJson(Result.failed("验证码输入错误")); +// return; } String name = get("name", "").trim();