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 ab952d9..d2e0ccc 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 @@ -2051,7 +2051,7 @@ public class OrderStatService { " LEFT JOIN product p ON p.id = t.product_id " + " left join customer c on c.id = t.customer_id\n" + // " where t.state = 5\n" + - " where 1 = 1\n" + + " where 1 = 1 and t.sale_type != 3 \n" + saleParams + // " and t.create_time like ? \n"; // " and t.create_time between ? and ? \n"; @@ -2088,7 +2088,7 @@ public class OrderStatService { " from order_end t\n" + " left join customer c on c.id = t.customer_id\n" + // " where t.state = 5\n" + - " where 1 = 1\n" + + " where 1 = 1 and t.sale_type != 3 \n" + saleParams + // " and t.create_time like ? \n"; // " and t.create_time between ? and ? \n"; @@ -2129,7 +2129,7 @@ public class OrderStatService { " LEFT JOIN product p ON p.id = t.product_id " + " left join customer c on c.id = t.customer_id\n" + // " where t.state = 5\n" + - " where 1 = 1\n" + saleParams; + " where 1 = 1 and t.sale_type != 3 \n" + saleParams; if (customer_id != null) { sql += " and c.id = ? \n"; @@ -2160,7 +2160,7 @@ public class OrderStatService { " from order_end t\n" + " left join customer c on c.id = t.customer_id\n" + // " where t.state = 5\n" + - " where 1 = 1\n" + saleParams; + " where 1 = 1 and t.sale_type != 3 \n" + saleParams; if (customer_id != null) { sql += " and c.id = ? \n"; diff --git a/ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/order/ordertemp/OrderTempSyncService.java b/ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/order/ordertemp/OrderTempSyncService.java index de673b9..236af9d 100644 --- a/ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/order/ordertemp/OrderTempSyncService.java +++ b/ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/order/ordertemp/OrderTempSyncService.java @@ -493,6 +493,7 @@ public class OrderTempSyncService { order.setSettlementUserId(sysuser.getId()); order.setSettlementUserName(sysuser.getName()); + order.setSaleType(ordercluster.getSaleType()); order.setState(OrderStateEnum.RECEIVED.getStateid()); // 直接完成,没有前面的过程 order.setCreateTime(now); order.setMemo(memo); // 备注