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 aab830a..d7d0058 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 @@ -60,7 +60,7 @@ public class OrderTempService extends BaseService { ", 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 \n" + - ", s.name supermarket_name \n" + + ", case when s.id = 5 then '巴河' else s.name end as supermarket_name \n" + ", case when v.state is not null then 1 end invoice_invalid_verify_state \n" + // 只需要标记是 1,不需要反映 state = 2 ", case when ov.state is not null then 1 end order_invalid_verify_state \n" + // 只需要标记是 1,不需要反映 state = 2 " from order_temp t \n" + @@ -140,8 +140,12 @@ public class OrderTempService extends BaseService { } if (supermarket_id != null) { - fromsql += " and s.id = ? \n"; - paraList.add(supermarket_id); + if(supermarket_id == 4){ + fromsql += " and s.id in (4,5) \n"; + }else{ + fromsql += " and s.id = ? \n"; + paraList.add(supermarket_id); + } } if (supermarket_type != null) { diff --git a/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/prepay/PrepayService.java b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/prepay/PrepayService.java index a891ea0..000be63 100644 --- a/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/prepay/PrepayService.java +++ b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/prepay/PrepayService.java @@ -212,7 +212,7 @@ public class PrepayService { " ,p.type \n" + " ,p.second_weight - p.first_weight net_weight\n" + " ,a.supermarket_id \n" + - " ,s.`name` supermarket_name \n" + + " ,case when a.supermarket_id = 5 then '巴河' else s.`name` end as supermarket_name \n" + " ,a.truck_license \n" + " ,a.weight \n" + " ,a.total_price \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 e885216..be174b7 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 @@ -2980,7 +2980,7 @@ public class OrderStatService { " ifnull( sum( g.weight ), 0 ) weight,\n" + " ifnull( sum( g.total_price ), 0 ) total_price,\n" + " ifnull( sum( CASE WHEN g.supermarket_id = 1 THEN g.weight END ), 0 ) xsl_1,\n" + - " ifnull( sum( CASE WHEN g.supermarket_id = 1 THEN g.total_price END ), 0 ) xse_1\n" + + " ifnull( sum( CASE WHEN g.supermarket_id = 1 THEN g.total_price END ), 0 ) xse_1,\n" + " ifnull( sum( CASE WHEN g.supermarket_id in (4,5) THEN g.weight END ), 0 ) xsl_4,\n" + " ifnull( sum( CASE WHEN g.supermarket_id in (4,5) THEN g.total_price END ), 0 ) xse_4\n" + "FROM\n" + diff --git a/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/supermarket/sandfarmdistance/SupermarketSandfarmDistanceService.java b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/supermarket/sandfarmdistance/SupermarketSandfarmDistanceService.java index bc23983..6ee059b 100644 --- a/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/supermarket/sandfarmdistance/SupermarketSandfarmDistanceService.java +++ b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/supermarket/sandfarmdistance/SupermarketSandfarmDistanceService.java @@ -85,7 +85,7 @@ public class SupermarketSandfarmDistanceService extends BaseService { * @return */ public Record findAllSupermarket(PageParam pp, Integer customer_id, String customer_name) { - List cols = Supermarket.dao.find("select id, name, name2 from supermarket where del = 0 AND TYPE = 0 "); + List cols = Supermarket.dao.find("select id, name, name2 from supermarket where del = 0 AND TYPE = 0 and id != 5"); String selectsql = "select t.*, sr.supermarket_id, sr.distance "; String fromsql = " from supermarket t\n" + " left join (\n" +