From a3746222e9b4faf05fb89840d45177f92ef392cc Mon Sep 17 00:00:00 2001 From: wany <13995595726@qq.com> Date: Wed, 16 Jul 2025 14:30:48 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BD=A6=E8=BE=86=E8=BF=9B=E5=87=BA=E6=97=A5?= =?UTF-8?q?=E5=BF=97=EF=BC=8C=E8=BD=A6=E7=89=8C=E5=88=86=E9=85=8D=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=E7=AD=89=E6=9F=A5=E8=AF=A2=E6=8E=A5=E5=8F=A3=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ordercluster/OrderclusterService.java | 18 ++++++++++++++---- .../truck/OrderclusterTruckService.java | 2 +- .../order/ordertemp/OrderTempService.java | 2 +- .../ssjygl/stat/sale/OrderStatService.java | 2 ++ .../ssjygl/transport/TransportService.java | 11 ++++++++--- .../supermarket/SupermarketController.java | 4 ++++ 6 files changed, 30 insertions(+), 9 deletions(-) diff --git a/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/order/ordercluster/OrderclusterService.java b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/order/ordercluster/OrderclusterService.java index bca30b8..a5a8577 100644 --- a/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/order/ordercluster/OrderclusterService.java +++ b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/order/ordercluster/OrderclusterService.java @@ -76,8 +76,13 @@ public class OrderclusterService extends BaseService { List paraList = new ArrayList<>(); if (supermarket_id != null) { - fromsql += " and t.supermarket_id = ? \n"; - paraList.add(supermarket_id); + if(supermarket_id == 4){ + fromsql += " and t.supermarket_id in (4,5) \n"; + } else{ + fromsql += " and t.supermarket_id = ? \n"; + paraList.add(supermarket_id); + } + } if (state != null) { @@ -244,8 +249,13 @@ public class OrderclusterService extends BaseService { List paraList = new ArrayList<>(); if (supermarket_id != null) { - fromsql += " and t.supermarket_id = ? \n"; - paraList.add(supermarket_id); + if(supermarket_id == 4){ + fromsql += " and t.supermarket_id in (4,5) \n"; + } else{ + fromsql += " and t.supermarket_id = ? \n"; + paraList.add(supermarket_id); + } + } if (trans_co_id != null) { diff --git a/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/order/ordercluster/truck/OrderclusterTruckService.java b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/order/ordercluster/truck/OrderclusterTruckService.java index 0fd2e1b..09b49e7 100644 --- a/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/order/ordercluster/truck/OrderclusterTruckService.java +++ b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/order/ordercluster/truck/OrderclusterTruckService.java @@ -36,7 +36,7 @@ public class OrderclusterTruckService extends BaseService { ", c.customer_receiver_lttd, c.trans_co_id, c.trans_co_name, c.trans_co_texpayer_name" + ", c.trans_co_texpayer_num, c.trans_co_address, c.trans_co_phone, c.trans_co_bank_name" + ", c.trans_co_bank_account, c.time_interval, c.mini_truck" + - ", s.name supermarket_name "; + ", case when c.supermarket_id = 5 then '巴河' else s.name end as supermarket_name "; String fromsql = "from ordercluster_truck t \n" + " left join ordercluster c on c.id = t.ordercluster_id \n" + " left join supermarket s on s.id = c.supermarket_id \n" + diff --git a/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/order/ordertemp/OrderTempService.java b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/order/ordertemp/OrderTempService.java index d7d0058..15d3a19 100644 --- a/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/order/ordertemp/OrderTempService.java +++ b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/order/ordertemp/OrderTempService.java @@ -105,7 +105,7 @@ public class OrderTempService extends BaseService { ", p.in_time, p.out_time, p.in_which, p.out_which, p.in_mode, p.out_mode \n" + ", p.first_weight, p.second_weight, p.first_weigh_mode, p.second_weight_mode \n" + ", p.first_pic, p.first_weight_which, p.second_weight_which, p.second_pic \n" + - ", p.arrive_time, p.type, p.memo transport_memo, s.name supermarket_name \n" + + ", p.arrive_time, p.type, p.memo transport_memo, case when t.supermarket_id = 5 then '巴河' else s.name end as supermarket_name \n" + ", ot.trans_price in_trans_price, ot.weight in_weight \n"; String fromsql = "from order_temp t \n" + " left join transport p on p.order_sn = t.sn \n" + diff --git a/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/stat/sale/OrderStatService.java b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/stat/sale/OrderStatService.java index be174b7..dc47cd7 100644 --- a/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/stat/sale/OrderStatService.java +++ b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/stat/sale/OrderStatService.java @@ -3196,6 +3196,8 @@ public class OrderStatService { total_price += DataUtil.getDefaultByRecord(r, "total_price"); xsl_1 += DataUtil.getDefaultByRecord(r, "xsl_1"); xse_1 += DataUtil.getDefaultByRecord(r, "xse_1"); + xsl_4 += DataUtil.getDefaultByRecord(r, "xsl_4"); + xse_4 += DataUtil.getDefaultByRecord(r, "xse_4"); all_prepay_total_amount += DataUtil.getDefaultByRecord(r, "prepay_total_amount"); all_refund_total_amount += DataUtil.getDefaultByRecord(r, "refund_total_amount"); diff --git a/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/transport/TransportService.java b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/transport/TransportService.java index e974627..83b606f 100644 --- a/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/transport/TransportService.java +++ b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/transport/TransportService.java @@ -55,15 +55,20 @@ public class TransportService extends BaseService { * @return */ public Page find(PageParam pp, String order_sn, String stm, String etm, String truck_license, Integer supermarket_id, Integer trans_co_id, Integer state, Integer supermarket_type) { - String selectsql = "select t.*, s.name supermarket_name "; + String selectsql = "select t.*, case when t.supermarket_id = 4 then '巴河' else s.name end as supermarket_name "; String fromsql = "from transport t \n" + " left join supermarket s on s.id = t.supermarket_id \n" + " where 1=1 "; // 只显示未删除的 List paraList = new ArrayList<>(); if (supermarket_id != null && supermarket_id > 0) { - fromsql += " and t.supermarket_id = ? \n"; - paraList.add(supermarket_id); + if(supermarket_id == 4){ + fromsql += " and t.supermarket_id in (4,5) \n"; + } else{ + fromsql += " and t.supermarket_id = ? \n"; + paraList.add(supermarket_id); + } + } if (supermarket_type != null) { fromsql += " and s.type = ? \n"; diff --git a/ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/supermarket/SupermarketController.java b/ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/supermarket/SupermarketController.java index 9ab3701..79aeeab 100644 --- a/ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/supermarket/SupermarketController.java +++ b/ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/supermarket/SupermarketController.java @@ -61,4 +61,8 @@ public class SupermarketController extends Controller { public void list() { renderJson(Result.object(SupermarketService.me.list())); } + + public void newlist() { + renderJson(Result.object(SupermarketService.me.newlist())); + } }