diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/order/ordercluster/OrderclusterService.java b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/order/ordercluster/OrderclusterService.java index 3f0cca2..87a1dad 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/order/ordercluster/OrderclusterService.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/order/ordercluster/OrderclusterService.java @@ -170,12 +170,12 @@ public class OrderclusterService extends BaseService { } if (StrKit.notBlank(stm)) { - fromsql += " and t.cutoff_time >= ? \n"; + fromsql += " and t.create_time >= ? \n"; paraList.add(stm); } if (StrKit.notBlank(etm)) { - fromsql += " and t.cutoff_time <= ? \n"; + fromsql += " and t.create_time <= ? \n"; paraList.add(etm); } diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/order/ordercluster/truck/OrderclusterTruckService.java b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/order/ordercluster/truck/OrderclusterTruckService.java index 93e1f44..0791fa3 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/order/ordercluster/truck/OrderclusterTruckService.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/order/ordercluster/truck/OrderclusterTruckService.java @@ -28,7 +28,7 @@ public class OrderclusterTruckService extends BaseService { public Page find(PageParam pp, String stm, String etm, String customer_name, String truck_license, Integer state) { String selectsql = "select t.id, t.truck_license" + - ", c.uuid, c.total_weight, c.avg_weight, c.create_time, c.cutoff_time, c.complete_time" + + ", c.uuid, c.total_weight, c.avg_weight, c.create_time, c.start_time, c.cutoff_time, c.complete_time" + ", c.unit_price, c.state, c.supermarket_id, c.trans_distance, c.pay_type, c.create_user_id" + ", c.create_user_name, c.req_receipt, c.change_time, c.product_id, c.product_name, c.customer_id" + ", c.customer_name, c.customer_texpayer_name, c.customer_texpayer_num, c.customer_address" + @@ -45,12 +45,12 @@ public class OrderclusterTruckService extends BaseService { List paraList = new ArrayList<>(); if (StrKit.notBlank(stm)) { - fromsql += " and c.cutoff_time >= ? \n"; + fromsql += " and c.create_time >= ? \n"; paraList.add(stm); } if (StrKit.notBlank(etm)) { - fromsql += " and c.cutoff_time <= ? \n"; + fromsql += " and c.create_time <= ? \n"; paraList.add(etm); } diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/stat/sale/OrderStatService.java b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/stat/sale/OrderStatService.java index 186f3fd..0c8a8d2 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/stat/sale/OrderStatService.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/stat/sale/OrderStatService.java @@ -95,7 +95,7 @@ public class OrderStatService { temp_sql += " and t.customer_id = ? \n"; paraTempList.add(customer_id); } else { - if (customer_type_id != null && customer_type_id > 0 && customer_type_id != 99) { + if (customer_type_id != null && customer_type_id >= 0 && customer_type_id != 99) { temp_sql += " and c.customer_type_id = ? \n"; paraTempList.add(customer_type_id); } else if(customer_type_id != null && customer_type_id == 99) { // 散户 diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/transport/TransportService.java b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/transport/TransportService.java index e254112..7d26614 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/transport/TransportService.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/transport/TransportService.java @@ -120,12 +120,9 @@ public class TransportService extends BaseService { */ public List inSupermarket(int supermarket_id) { String sql = "SELECT\n" + - " t.*, t.id transport_id,\n" + - " r.req_receipt tp\n" + + " t.*, t.id transport_id\n" + "FROM\n" + " `transport` t\n" + - "LEFT JOIN ordercluster_truck o ON t.truck_license = o.truck_license\n" + - "LEFT JOIN ordercluster r ON o.ordercluster_id = r.id\n" + "WHERE\n" + " t.state < ?\n" + "AND t.supermarket_id = ?\n" + diff --git a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/main/AuthInterceptor.java b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/main/AuthInterceptor.java index a487f74..ec88cd8 100644 --- a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/main/AuthInterceptor.java +++ b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/main/AuthInterceptor.java @@ -42,6 +42,7 @@ public class AuthInterceptor implements Interceptor { add("/prepay/flow"); add("/prepay/prepaydetail"); add("/prepaydetail/find"); + add("/product/list"); add("/orderclustertruck/find"); add("/orderclustertruck/save");