From 9ab9bfe8e13953c8698b3845a8d35f4e25448f8b Mon Sep 17 00:00:00 2001
From: wuwenxiong <646448316@qq.com>
Date: Fri, 17 Sep 2021 09:42:07 +0800
Subject: [PATCH] aa

---
 .../java/com/cowr/ssjygl/stat/sale/OrderStatService.java | 9 +--------
 .../cowr/local/ssjygl/stat/sale/OrderStatController.java | 3 ---
 .../service/ssjygl/stat/sale/OrderStatController.java    | 3 ---
 3 files changed, 1 insertion(+), 14 deletions(-)

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 9382542..9cba8bc 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
@@ -29,7 +29,6 @@ public class OrderStatService {
      * @param supermarket_id 砂站id
      * @param trans_co_id    物流公司id
      * @param customer_id    客户id
-     * @param customer_name  客户名称
      * @param type           订单类型 1 销售（配送）订单， 3 外销（临时）订单
      * @param truck_license  车牌号
      * @param isprepaid      是否预付费
@@ -40,7 +39,6 @@ public class OrderStatService {
             Integer supermarket_id,
             Integer trans_co_id,
             Integer customer_id,
-            String customer_name,
             Integer type,
             String truck_license,
             Integer isprepaid,
@@ -100,11 +98,8 @@ public class OrderStatService {
             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) {
+            } else if(customer_type_id != null && customer_type_id == 99) { // 散户
                 temp_sql += " and t.customer_id is null \n";
-            } else if (StrKit.notBlank(customer_name) && customer_type_id == null) {
-                temp_sql += " and t.customer_name like ? \n";
-                paraTempList.add("%" + customer_name.trim() + "%");
             }
         }
 
@@ -165,7 +160,6 @@ public class OrderStatService {
             Integer supermarket_id,
             Integer trans_co_id,
             Integer customer_id,
-            String customer_name,
             Integer type,
             String truck_license,
             Integer isprepaid,
@@ -177,7 +171,6 @@ public class OrderStatService {
                 supermarket_id,
                 trans_co_id,
                 customer_id,
-                customer_name,
                 type,
                 truck_license,
                 isprepaid,
diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/stat/sale/OrderStatController.java b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/stat/sale/OrderStatController.java
index f6a3ae5..0bac123 100644
--- a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/stat/sale/OrderStatController.java
+++ b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/stat/sale/OrderStatController.java
@@ -18,7 +18,6 @@ public class OrderStatController extends BaseController {
     @Before(DayValidator.class)
     public void daydetail() {
         String  tm             = get("tm");
-        String  customer_name  = get("customer_name");
         String  truck_license  = getUpperCaseVal("truck_license");
         String  sn             = get("sn");
         Integer supermarket_id = getInt("supermarket_id");
@@ -37,7 +36,6 @@ public class OrderStatController extends BaseController {
                     supermarket_id,
                     trans_co_id,
                     customer_id,
-                    customer_name,
                     type,
                     truck_license,
                     isprepaid,
@@ -51,7 +49,6 @@ public class OrderStatController extends BaseController {
                     supermarket_id,
                     trans_co_id,
                     customer_id,
-                    customer_name,
                     type,
                     truck_license,
                     isprepaid,
diff --git a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/stat/sale/OrderStatController.java b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/stat/sale/OrderStatController.java
index 89e3fdf..c688104 100644
--- a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/stat/sale/OrderStatController.java
+++ b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/stat/sale/OrderStatController.java
@@ -24,7 +24,6 @@ public class OrderStatController extends BaseController {
     @Before(DayValidator.class)
     public void daydetail() {
         String  tm             = get("tm");
-        String  customer_name  = get("customer_name");
         String  truck_license  = getUpperCaseVal("truck_license");
         String  sn             = get("sn");
         Integer supermarket_id = getInt("supermarket_id");
@@ -54,7 +53,6 @@ public class OrderStatController extends BaseController {
                     supermarket_id,
                     trans_co_id,
                     customer_id,
-                    customer_name,
                     type,
                     truck_license,
                     isprepaid,
@@ -68,7 +66,6 @@ public class OrderStatController extends BaseController {
                     supermarket_id,
                     trans_co_id,
                     customer_id,
-                    customer_name,
                     type,
                     truck_license,
                     isprepaid,