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

优化-5

dev
wuwenxiong 2022-01-04 03:52:10 +08:00
parent 6e08312df8
commit c456fef6fb
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2946,12 +2946,15 @@ public class OrderStatService {
List<Object> shParamsList = new ArrayList<>(); List<Object> shParamsList = new ArrayList<>();
shParamsList.add(OrderStateEnum.RECEIVED.getStateid()); shParamsList.add(OrderStateEnum.RECEIVED.getStateid());
List<Object> yhParamsList = new ArrayList<>();
yhParamsList.add(OrderStateEnum.RECEIVED.getStateid());
String shParams = ""; String shParams = "";
String yhParams = ""; String yhParams = "";
if (!StrKit.isBlank(tm)) { if (!StrKit.isBlank(tm)) {
shParams += " and t.create_time like ? \n"; shParams += " and t.create_time like ? \n";
yhParams += " and t.create_time like '" + tm + "%'\n"; yhParams += " and t.create_time like ? \n";
shParamsList.add(tm + "%"); shParamsList.add(tm + "%");
yhParamsList.add(tm + "%");
} }
// 实售 // 实售
List<Record> shList = Db.find( List<Record> shList = Db.find(
@ -2962,7 +2965,8 @@ public class OrderStatService {
" from (\n" + " from (\n" +
" select t.supermarket_id as id, t.paid, t.total_price, t.weight, t.product_id\n" + " select t.supermarket_id as id, t.paid, t.total_price, t.weight, t.product_id\n" +
" from order_temp t \n" + " from order_temp t \n" +
" where t.state = ? \n" + " where t.sale_type = 0 \n" +
" and t.state = ? \n" +
shParams + shParams +
" ) t\n" + " ) t\n" +
" group by t.id, t.product_id\n" + " group by t.id, t.product_id\n" +
@ -2978,10 +2982,10 @@ public class OrderStatService {
" `order_temp` t\n" + " `order_temp` t\n" +
"WHERE\n" + "WHERE\n" +
" t.sale_type = 1\n" + " t.sale_type = 1\n" +
" and t.state = 5\n" + " and t.state = ?\n" +
yhParams + yhParams +
" GROUP BY\n" + " GROUP BY\n" +
" t.supermarket_id"); " t.supermarket_id", yhParamsList.toArray());
List<Record> retChildren = new ArrayList<>(); List<Record> retChildren = new ArrayList<>();
List<Record> retList = new ArrayList<>(); List<Record> retList = new ArrayList<>();