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

2021-09-17优化调整

dev
wuwenxiong 2021-09-17 15:04:22 +08:00
parent 20d8f00674
commit 4be1bc4fd2
5 changed files with 8 additions and 10 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/order/ordercluster/OrderclusterService.java
View File

@ -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);
}

6
ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/order/ordercluster/truck/OrderclusterTruckService.java
View File

@ -28,7 +28,7 @@ public class OrderclusterTruckService extends BaseService {
public Page<Record> 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<Object> 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);
}

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

@ -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) { // 散户

5
ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/transport/TransportService.java
View File

@ -120,12 +120,9 @@ public class TransportService extends BaseService {
*/
public List<Record> 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" +

1
ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/main/AuthInterceptor.java
View File

@ -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");