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

bug修改

dev
wany 2025-03-08 13:18:49 +08:00
parent e86cf024c6
commit f2d93a8cb2
5 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/order/ordercluster/OrderclusterService.java
View File

@ -235,7 +235,7 @@ public class OrderclusterService extends BaseService {
Integer product_id,
Integer sale_type
) {
String selectsql = "select t.*, s.name supermarket_name,c.customer_type_id ";
String selectsql = "select t.*, s.name supermarket_name,c.customer_type_id, c.name customer_name ";
String fromsql = "from ordercluster t \n" +
" left join supermarket s on s.id = t.supermarket_id \n " +
" left join customer c on c.id = t.customer_id \n " +
@ -263,7 +263,7 @@ public class OrderclusterService extends BaseService {
}
if (StrKit.notBlank(customer_name)) {
fromsql += " and t.customer_name like ? \n";
fromsql += " and c.customer_name like ? \n";
paraList.add("%" + customer_name.trim() + "%");
}

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

@ -25,7 +25,7 @@ import java.util.List;
public class OrderclusterTruckService extends BaseService {
public static final OrderclusterTruckService me = new OrderclusterTruckService();
public Page<Record> find(PageParam pp, String stm, String etm, String customer_name, String truck_license, Integer state, Integer supermarket_type) {
public Page<Record> find(PageParam pp, String stm, String etm, String customer_name, String truck_license, Integer state, Integer supermarket_type,Integer supermarket_id) {
String selectsql = "select t.id, t.truck_license" +
", 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" +
@ -67,6 +67,11 @@ public class OrderclusterTruckService extends BaseService {
paraList.add("%" + truck_license.trim() + "%");
}
if(supermarket_id != null){
fromsql += " and (c.supermarket_id = ? or c.customer_id = ?) \n";
paraList.add(supermarket_id);
}
if (state != null) {
fromsql += " and c.state = ? \n";
paraList.add(state);

7
ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/stat/sale/OrderStatService.java
View File

@ -561,7 +561,7 @@ public class OrderStatService {
" group by t.id, t.product_id\n" +
" ) a on a.id = t.supermarket_id and a.product_id = t.product_id\n" +
" left join supermarket s on s.id = t.supermarket_id\n" +
" left join product p on p.id = t.product_id AND p.del = 0";
" left join product p on p.id = t.product_id AND p.del = 0 where s.type = 0 ";
List<Record> dblist = Db.find(sql, params.toArray());
@ -3952,8 +3952,9 @@ public class OrderStatService {
"FROM\n" +
" supermarket t\n"
+ "WHERE\n" +
" id <= 6\n" +
"OR id = 11 or id = 12 "
// " id <= 6\n" +
// "OR id = 11 or id = 12 "
" t.type = 0"
);
List<Object> shParamsList = new ArrayList<>();

3
ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/order/ordercluster/truck/OrderclusterTruckController.java
View File

@ -42,7 +42,8 @@ public class OrderclusterTruckController extends Controller {
String truck_license = get("truck_license");
Integer supermarket_type = getInt("supermarket_type");
Integer state = getInt("state");
renderJson(Result.object(OrderclusterTruckService.me.find(pp, stm, etm, customer_name, truck_license, state, supermarket_type)));
Integer supermarket_id = getInt("supermarket_id");
renderJson(Result.object(OrderclusterTruckService.me.find(pp, stm, etm, customer_name, truck_license, state, supermarket_type, supermarket_id)));
}
/**

3
ssjygl-xsct-service/src/main/java/com/cowr/service/ssjygl/order/ordercluster/truck/OrderclusterTruckController.java
View File

@ -80,7 +80,8 @@ public class OrderclusterTruckController extends Controller {
String truck_license = get("truck_license");
Integer state = getInt("state");
Integer supermarket_type = getInt("supermarket_type");
renderJson(Result.object(OrderclusterTruckService.me.find(pp, stm, etm, customer_name, truck_license, state,supermarket_type)));
Integer supermarket_id = getInt("supermarket_id");
renderJson(Result.object(OrderclusterTruckService.me.find(pp, stm, etm, customer_name, truck_license, state,supermarket_type,supermarket_id)));
}
/**