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

首页统计修改 添加上处置砂

dev
徐杰盟 2023-09-25 14:55:42 +08:00
parent c42ee62ec8
commit de88080479
3 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/overall/OverallService.java
View File

@ -175,7 +175,7 @@ group by date
" from order_temp t\n" +
" where t.sale_type = 0\n" +
" and t.state = 5\n" +
" and t.product_id != 4\n" +
// " and t.product_id != 4\n" +
" union\n" +
" select \n" +
" 0 total_weight,\n" +
@ -446,7 +446,7 @@ group by date
List<Record> data2 = Db.find("select case when t.customer_id is null then 2 else 1 end cid, count(t.sn) day_cnt, sum(t.weight) day_weight, sum(total_price) day_total_price \n" +
" from order_temp t\n" +
" where t.state = 5\n" +
" and t.product_id != 4\n" +
// " and t.product_id != 4\n" +
" and t.create_time like ?\n" +
" group by cid", nowdaytm + "%");

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

@ -2243,7 +2243,7 @@ public class OrderStatService {
" ifnull(sum(t.total_price), 0) total_price\n" +
" from order_temp t\n" +
" where t.state = 5\n" +
" and t.product_id != 4\n" +
// " and t.product_id != 4\n" +
saleParam +
" and t.supermarket_id = 4\n" +
" and (t.create_time < '2021-09-08 00:00:00'\n" +
@ -2261,7 +2261,7 @@ public class OrderStatService {
" ifnull(sum(t.total_price), 0) total_price\n" +
" from order_temp t\n" +
" where t.state = 5\n" +
" and t.product_id != 4\n" +
// " and t.product_id != 4\n" +
saleParam +
" 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" +
@ -2299,7 +2299,7 @@ public class OrderStatService {
" ifnull(sum(t.total_price), 0) total_price\n" +
" from order_temp t\n" +
" where t.state = 5\n" +
" and t.product_id != 4\n" +
// " and t.product_id != 4\n" +
saleParam +
" and t.supermarket_id != 4\n" +
" and t.create_time>= ? \n" +
@ -2357,7 +2357,7 @@ public class OrderStatService {
" select t.customer_id, sum(t.total_price) total_price\n" +
" from order_temp t\n" +
" where t.customer_id is not null\n" +
" and t.product_id != 4\n" +
// " and t.product_id != 4\n" +
" and t.create_time <= ?\n" +
" and t.state = 5\n" +
" and t.sale_type = 0\n" +
@ -2664,7 +2664,7 @@ public class OrderStatService {
" ifnull(sum(t.total_price), 0) total_price\n" +
" from order_temp t\n" +
" where t.state = 5\n" +
" and t.product_id != 4\n" +
// " and t.product_id != 4\n" +
" and t.create_time >= ?\n" +
" and t.create_time <= ?\n" +
paramsSql +

3
ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/LocalOrderService.java
View File

@ -362,6 +362,9 @@ public class LocalOrderService {
remark = "外销订单：" + StrUtil.getRecordStr(order, "old_sn");
} else {
remark = "订单号：" + StrUtil.getRecordStr(order, "sn");
if ("处置砂".equals(StrUtil.getRecordStr(order, "product_name"))){
remark += " 处置砂";
}
}
// if(StrKit.notBlank(origin)){