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

Merge branch 'master' into ls-dev

dev
xiaocui 2021-03-30 21:15:46 +08:00
parent e024cdcb0a 69edf63a52
commit a3dfaf0c6b
1 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/stat/sale/OrderStatService.java
View File

@ -2178,33 +2178,24 @@ public class OrderStatService {
"(\n" +
"SELECT\n" +
"t.supermarket_id AS id,\n" +
"t.customer_id,\n" +
"t.customer_name,\n" +
"t.weight,\n" +
"t.total_price,\n" +
"t.product_id,\n" +
"t.product_name \n" +
"FROM\n" +
"t.total_price FROM\n" +
"order_sale t \n" +
"WHERE\n" +
"t.state = 5 \n" +
"AND t.create_time >=?\n" +
"AND t.create_time <=?\n" +
"AND t.create_time >=? \n" +
"AND t.create_time <=? \n" +
"AND t.isprepaid = 0 UNION\n" +
"SELECT\n" +
"t.supermarket_id AS id,\n" +
"t.customer_id,\n" +
"t.customer_name,\n" +
"t.weight,\n" +
"t.total_price,\n" +
"t.product_id,\n" +
"t.product_name \n" +
"t.total_price\n" +
"FROM\n" +
"order_temp t \n" +
"WHERE\n" +
"t.state = 5 \n" +
"AND t.create_time >=?\n" +
"AND t.create_time <=?\n" +
"AND t.create_time >=? \n" +
"AND t.create_time <=? \n" +
"AND t.isprepaid = 0 ) n on m.id=n.id\n" +
") g";
Record record = Db.findFirst(sql, stm,etm, stm,etm);