From 9c8ca0d91209c63568d77c8ae769d941438cd514 Mon Sep 17 00:00:00 2001 From: "lisai17@sina.com" Date: Mon, 1 Feb 2021 22:56:27 +0800 Subject: [PATCH] . --- .../cowr/ssjygl/stat/customer/CustomerStatService.java | 10 ++++++++-- .../main/java/com/cowr/local/ssjygl/main/Config.java | 2 +- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/stat/customer/CustomerStatService.java b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/stat/customer/CustomerStatService.java index 7517eb6..cdb5c59 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/stat/customer/CustomerStatService.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/stat/customer/CustomerStatService.java @@ -72,7 +72,10 @@ public class CustomerStatService { " left join(\n" + " select t.customer_id, sum(t.amount) amount from refund_detail t\n" + " left join (\n" + - " select max(t.change_time) confirm_time, t.refund_detail_id from refund_detail_state_history t where t.state = 3\n" + + " select max(t.change_time) confirm_time, t.refund_detail_id \n" + + " from refund_detail_state_history t \n" + + " where t.state = 3 \n" + + " group by t.refund_detail_id\n" + " ) a on t.id = a.refund_detail_id\n" + " where t.state = 3\n" + " and a.confirm_time <= ?\n" + @@ -116,7 +119,10 @@ public class CustomerStatService { " left join(\n" + " select t.customer_id, sum(t.amount) amount from refund_detail t\n" + " left join (\n" + - " select max(t.change_time) confirm_time, t.refund_detail_id from refund_detail_state_history t where t.state = 3\n" + + " select max(t.change_time) confirm_time, t.refund_detail_id \n" + + " from refund_detail_state_history t \n" + + " where t.state = 3 \n" + + " group by t.refund_detail_id\n" + " ) a on t.id = a.refund_detail_id\n" + " where t.state = 3\n" + " and a.confirm_time <= ?\n" + diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/main/Config.java b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/main/Config.java index 2514359..639fb2b 100644 --- a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/main/Config.java +++ b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/main/Config.java @@ -95,7 +95,7 @@ public class Config extends JFinalConfig { public static DeviceThread deviceThread = new DeviceThread(); public static SocketIOService socketio = null; private static boolean client_run = true; - public static final String CLINET_VERSION = "20210128"; + public static final String CLINET_VERSION = "20210201"; public static String getRootPath() { return PathKit.getWebRootPath()