xjm
/
ssjygl-xsct-service
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

.

dev
lisai17@sina.com 2021-02-01 22:56:27 +08:00
parent 1fcde5cf7e
commit 9c8ca0d912
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/stat/customer/CustomerStatService.java
View File

@ -72,7 +72,10 @@ public class CustomerStatService {
" left join(\n" + " left join(\n" +
" select t.customer_id, sum(t.amount) amount from refund_detail t\n" + " select t.customer_id, sum(t.amount) amount from refund_detail t\n" +
" left join (\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" + " ) a on t.id = a.refund_detail_id\n" +
" where t.state = 3\n" + " where t.state = 3\n" +
" and a.confirm_time <= ?\n" + " and a.confirm_time <= ?\n" +
@ -116,7 +119,10 @@ public class CustomerStatService {
" left join(\n" + " left join(\n" +
" select t.customer_id, sum(t.amount) amount from refund_detail t\n" + " select t.customer_id, sum(t.amount) amount from refund_detail t\n" +
" left join (\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" + " ) a on t.id = a.refund_detail_id\n" +
" where t.state = 3\n" + " where t.state = 3\n" +
" and a.confirm_time <= ?\n" + " and a.confirm_time <= ?\n" +

2
ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/main/Config.java
View File

@ -95,7 +95,7 @@ public class Config extends JFinalConfig {
public static DeviceThread deviceThread = new DeviceThread(); public static DeviceThread deviceThread = new DeviceThread();
public static SocketIOService socketio = null; public static SocketIOService socketio = null;
private static boolean client_run = true; private static boolean client_run = true;
public static final String CLINET_VERSION = "20210128"; public static final String CLINET_VERSION = "20210201";
public static String getRootPath() { public static String getRootPath() {
return PathKit.getWebRootPath() return PathKit.getWebRootPath()