条件优化

app-ghs/controllers/ExpendController.php

@@ -41,7 +41,8 @@ class ExpendController extends BaseController
         $timeType = isset($get['timeType']) ? strval($get['timeType']) : 'pay';
         $timeField = ($timeType === 'send') ? 'sendTime' : 'payTime';
         $where[$timeField] = ['between', [$currentStartTime, $currentEndTime]];
-        $where['delStatus'] = 0; //过滤掉已删除的
+        // 未删除才计入；sendTime 不代表单据有效，发货/发生口径同样必须带 delStatus=0
+        $where['delStatus'] = 0;
         $list = ExpendClass::getAllByCondition($where, null, '*', null);
         $arr = [];
         $cat = [];
@@ -210,6 +211,7 @@ class ExpendController extends BaseController
         if ($bx != -1) {
             $where['bx'] = $bx;
         }
+        // 未删除才列出；按 sendTime 筛时同样必须带，sendTime 不代表单据有效
         $where['delStatus'] = 0;
         $searchTime = isset($get['searchTime']) && !empty($get['searchTime']) ? $get['searchTime'] : 'thisYear';
         $startTime = $get['startTime'] ?? '';

app-ghs/controllers/StatCgGhsController.php

@@ -47,6 +47,10 @@ class StatCgGhsController extends BaseController
         $timeType = isset($get['timeType']) ? strval($get['timeType']) : 'bill';
         $cgTimeField = ($timeType === 'send') ? 'sendTime' : 'entryTime';
         $where[$cgTimeField] = ['between', [$currentStartTime, $currentEndTime]];
+        // sendTime 不代表已入库，发货口径只统计已完成采购单
+        if ($timeType === 'send') {
+            $where['status'] = 4;
+        }
         $orderList = PurchaseOrderClass::getAllByCondition($where, null, '*');
         $list = [];
         $totalActPrice = 0;

app-ghs/controllers/StatController.php

@@ -30,7 +30,7 @@ class StatController extends BaseController
             $period = dateUtil::formatTime($searchTime, $startTime, $endTime, true);
             $start = date("Y-m-d 00:00:00", strtotime($period['startTime']));
             $end = date("Y-m-d 23:59:59", strtotime($period['endTime']));
-            // timeType=bill（默认记账 entryTime）/ send（发货 sendTime）
+            // timeType=bill（默认记账 entryTime）/ send（发货 sendTime）；上方 status=4，发货口径同样只统计已入库
             $timeType = isset($get['timeType']) ? strval($get['timeType']) : 'bill';
             $cgTimeField = ($timeType === 'send') ? 'sendTime' : 'entryTime';
             $where[$cgTimeField] = ['between', [$start, $end]];

app-ghs/controllers/StatItemController.php

@@ -70,6 +70,10 @@ class StatItemController extends BaseController
         $timeType = isset($get['timeType']) ? strval($get['timeType']) : 'bill';
         $saleTimeField = ($timeType === 'send') ? 'sendTime' : 'payTime';
         $where[$saleTimeField] = ['between', [$currentStartTime, $currentEndTime]];
+        // sendTime 不代表成交，发货口径只统计已确认付款（xhGhsOrder.payStatus=1）
+        if ($timeType === 'send') {
+            $where['payStatus'] = 1;
+        }
         // includeNextDay=1（默认）计入跨天售后通过日扣减；=0 不含售后历史
         $includeNextDay = !isset($get['includeNextDay']) || intval($get['includeNextDay']) === 1;
 

biz-ghs/stat/classes/StatCgClass.php

@@ -51,6 +51,7 @@ class StatCgClass extends BaseClass
         $productInfo = ProductClass::getAllByCondition(['mainId' => $mainId], null, 'id,name,py', 'id');
 
         // timeType=bill（默认记账 entryTime）/ send（发货 sendTime）
+        // status=4 已入库；发货口径也必须带，因为 sendTime 不代表已入库
         $timeType = isset($get['timeType']) ? strval($get['timeType']) : 'bill';
         $cgTimeField = ($timeType === 'send') ? 'sendTime' : 'entryTime';
 
@@ -270,6 +271,7 @@ class StatCgClass extends BaseClass
         $currentEndTime = $currentEndDate . ' 23:59:59';
 
         // timeType=bill（默认记账 entryTime）/ send（发货 sendTime）
+        // status=4 已入库；发货口径也必须带，因为 sendTime 不代表已入库
         $timeType = isset($get['timeType']) ? strval($get['timeType']) : 'bill';
         $cgTimeField = ($timeType === 'send') ? 'sendTime' : 'entryTime';
 

biz-ghs/stat/classes/StatKdClass.php

@@ -170,6 +170,10 @@ class StatKdClass extends BaseClass
         //批发开单
         $where = ['mainId' => $mainId, 'status' => ['in', [OrderClass::ORDER_STATUS_UN_SEND, OrderClass::ORDER_STATUS_SENDING, OrderClass::ORDER_STATUS_COMPLETE]]];
         $where[$saleTimeField] = ['between', [$currentStartTime, $currentEndTime]];
+        // sendTime 不代表成交，发货口径只统计已确认付款
+        if ($timeType === 'send') {
+            $where['payStatus'] = 1;
+        }
 
         $ghsOrderList = OrderClass::getAllByCondition($where, null, '*');
         if (!empty($ghsOrderList)) {
@@ -284,6 +288,10 @@ class StatKdClass extends BaseClass
         $lsAfterSale = 0;
         $hdWhere = ['mainId' => $mainId, 'status' => ['in', [HdOrderClass::ORDER_STATUS_UN_SEND, HdOrderClass::ORDER_STATUS_SENDING, HdOrderClass::ORDER_STATUS_COMPLETE]]];
         $hdWhere[$saleTimeField] = ['between', [$currentStartTime, $currentEndTime]];
+        // sendTime 不代表成交，发货口径只统计已确认付款（xhOrder.payStatus=1）
+        if ($timeType === 'send') {
+            $hdWhere['payStatus'] = 1;
+        }
         $hdOrderList = HdOrderClass::getAllByCondition($hdWhere, null, '*');
         foreach ($hdOrderList as $hdKey => $hdOrder) {
             $payWay = $hdOrder['payWay'] ?? 0;

biz-ghs/stat/classes/StatSaleClass.php

@@ -146,6 +146,10 @@ class StatSaleClass extends BaseClass
 
         $where = ['mainId' => $mainId, 'status' => ['in', [OrderClass::ORDER_STATUS_UN_SEND, OrderClass::ORDER_STATUS_SENDING, OrderClass::ORDER_STATUS_COMPLETE]]];
         $where[$saleTimeField] = ['between', [$currentStartTime, $currentEndTime]];
+        // sendTime 不代表成交，发货口径只统计已确认付款
+        if ($timeType === 'send') {
+            $where['payStatus'] = 1;
+        }
 
         $customList = CustomClass::getAllByCondition(['ownMainId' => $mainId], null, 'id,name,py', 'id');
 
@@ -260,6 +264,8 @@ class StatSaleClass extends BaseClass
      * 采购跨天售后：不改「花材采购」入库口径；通过日单独「采购隔天退货」（退货并退款+仅退款合计）计入收入。
      * timeType=bill（默认）：销售按 payTime、采购按 entryTime、支出按 payTime；
      * timeType=send：销售/采购/支出均按 sendTime。
+     * 发货口径须补成功态：xhGhsOrder/xhOrder 加 payStatus=1，xhGhsCgOrder 加 status=4，xhExpend 加 delStatus=0
+     * （sendTime 开单即可写入，不代表成交；payTime/entryTime 本身即成功时间）。
      * 仅切换 xhGhsOrder / xhOrder / xhGhsCgOrder / xhExpend，其它统计项时间字段不变。
      */
     public static function profile($mainId)
@@ -297,7 +303,7 @@ class StatSaleClass extends BaseClass
         //出库
         $stockOut = StatStockOutClass::getSum($where);
 
-        //采购入库（xhGhsCgOrder）
+        //采购入库（xhGhsCgOrder）：status=4 已入库；发货口径也必须带，因为 sendTime 不代表已入库
         $cgWhere = ['mainId' => $mainId, 'status' => 4];
         $cgWhere[$cgTimeField] = ['between', [$currentStartTime, $currentEndTime]];
         $cgList = PurchaseOrderClass::getAllByCondition($cgWhere, null, '*');
@@ -366,6 +372,10 @@ class StatSaleClass extends BaseClass
         $pfPack = 0;
         $where = ['mainId' => $mainId, 'status' => ['in', [OrderClass::ORDER_STATUS_UN_SEND, OrderClass::ORDER_STATUS_SENDING, OrderClass::ORDER_STATUS_COMPLETE]]];
         $where[$saleTimeField] = ['between', [$currentStartTime, $currentEndTime]];
+        // sendTime 不代表成交，发货口径只统计已确认付款
+        if ($useSendTime) {
+            $where['payStatus'] = 1;
+        }
 
         $ghsOrderList = OrderClass::getAllByCondition($where, null, '*');
         if (!empty($ghsOrderList)) {
@@ -406,6 +416,10 @@ class StatSaleClass extends BaseClass
         $lsServiceFee = 0;
         $hdWhere = ['mainId' => $mainId, 'status' => ['in', [HdOrderClass::ORDER_STATUS_UN_SEND, HdOrderClass::ORDER_STATUS_SENDING, HdOrderClass::ORDER_STATUS_COMPLETE]]];
         $hdWhere[$saleTimeField] = ['between', [$currentStartTime, $currentEndTime]];
+        // sendTime 不代表成交，发货口径只统计已确认付款（xhOrder.payStatus=1）
+        if ($useSendTime) {
+            $hdWhere['payStatus'] = 1;
+        }
         $hdOrderList = HdOrderClass::getAllByCondition($hdWhere, null, '*');
         foreach ($hdOrderList as $hdKey => $hdOrder) {
             $actPrice = $hdOrder['mainPay'] ?? 0;
@@ -454,6 +468,7 @@ class StatSaleClass extends BaseClass
             }
         }
 
+        // 支出：delStatus=0 未删除；发货口径也必须带，因为 sendTime 不代表单据有效
         $condition = [
             'mainId' => $mainId,
             $expendTimeField => ['between', [$currentStartTime, $currentEndTime]],
@@ -887,6 +902,7 @@ class StatSaleClass extends BaseClass
         }
 
         // timeType=bill：销售 payTime、采购 entryTime；send：均按 sendTime
+        // 发货口径销售须补 payStatus=1、采购须 status=4（sendTime 不代表成交/入库）
         $timeType = isset($get['timeType']) ? strval($get['timeType']) : 'bill';
         $useSendTime = ($timeType === 'send');
         $saleTimeField = $useSendTime ? 'sendTime' : 'payTime';
@@ -905,7 +921,7 @@ class StatSaleClass extends BaseClass
         $totalDiscountAmount = 0;
         $totalLabourCost = 0;
 
-        //采购入库
+        //采购入库：status=4 已入库；发货口径也必须带，sendTime 不代表已入库
         $tbCgIncome = [];
         $tbCgIncomeStaff = [];
         $cgWhere = ['mainId' => $mainId, 'status' => 4];
@@ -1051,6 +1067,10 @@ class StatSaleClass extends BaseClass
         $tbSaleIncomeStaff = [];
         $where = ['mainId' => $mainId, 'status' => ['in', [OrderClass::ORDER_STATUS_UN_SEND, OrderClass::ORDER_STATUS_SENDING, OrderClass::ORDER_STATUS_COMPLETE]]];
         $where[$saleTimeField] = ['between', [$currentStartTime, $currentEndTime]];
+        // sendTime 不代表成交，发货口径只统计已确认付款
+        if ($useSendTime) {
+            $where['payStatus'] = 1;
+        }
         $ghsOrderList = OrderClass::getAllByCondition($where, null, '*');
         if (!empty($ghsOrderList)) {
             foreach ($ghsOrderList as $ghsKey => $ghsOrder) {
@@ -1180,6 +1200,10 @@ class StatSaleClass extends BaseClass
         $lsIncome = 0;
         $hdWhere = ['mainId' => $mainId, 'status' => ['in', [HdOrderClass::ORDER_STATUS_UN_SEND, HdOrderClass::ORDER_STATUS_SENDING, HdOrderClass::ORDER_STATUS_COMPLETE]]];
         $hdWhere[$saleTimeField] = ['between', [$currentStartTime, $currentEndTime]];
+        // sendTime 不代表成交，发货口径只统计已确认付款（xhOrder.payStatus=1）
+        if ($useSendTime) {
+            $hdWhere['payStatus'] = 1;
+        }
         $hdOrderList = HdOrderClass::getAllByCondition($hdWhere, null, '*');
         foreach ($hdOrderList as $hdKey => $hdOrder) {
             $actPrice = $hdOrder['mainPay'] ?? 0;
@@ -1659,6 +1683,10 @@ class StatSaleClass extends BaseClass
 
         $where = ['mainId' => $mainId, 'status' => ['in', [OrderClass::ORDER_STATUS_UN_SEND, OrderClass::ORDER_STATUS_SENDING, OrderClass::ORDER_STATUS_COMPLETE]]];
         $where[$saleTimeField] = ['between', [$currentStartTime, $currentEndTime]];
+        // sendTime 不代表成交，发货口径只统计已确认付款
+        if ($timeType === 'send') {
+            $where['payStatus'] = 1;
+        }
 
         $customList = CustomClass::getAllByCondition(['ownMainId' => $mainId], null, 'id,name,distId', 'id');
 

biz-ghs/stat/classes/StatYjClass.php

@@ -37,12 +37,17 @@ class StatYjClass extends BaseClass
         $arr = [];
 
         // timeType=bill（默认记账 payTime）/ send（发货 sendTime）
+        // 发货口径须补 payStatus=1：sendTime 不代表成交
         $timeType = isset($get['timeType']) ? strval($get['timeType']) : 'bill';
         $saleTimeField = ($timeType === 'send') ? 'sendTime' : 'payTime';
 
         //批发开单
         $where = ['mainId' => $mainId];
         $where[$saleTimeField] = ['between', [$currentStartTime, $currentEndTime]];
+        // sendTime 不代表成交，发货口径只统计已确认付款
+        if ($timeType === 'send') {
+            $where['payStatus'] = 1;
+        }
         $ghsOrderList = OrderClass::getAllByCondition($where, null, '*');
         if (!empty($ghsOrderList)) {
             foreach ($ghsOrderList as $ghsKey => $ghsOrder) {
@@ -68,6 +73,10 @@ class StatYjClass extends BaseClass
 
         $hdWhere = ['mainId' => $mainId];
         $hdWhere[$saleTimeField] = ['between', [$currentStartTime, $currentEndTime]];
+        // sendTime 不代表成交，发货口径只统计已确认付款（xhOrder.payStatus=1）
+        if ($timeType === 'send') {
+            $hdWhere['payStatus'] = 1;
+        }
         $hdOrderList = \bizHd\order\classes\OrderClass::getAllByCondition($hdWhere, null, '*');
         if (!empty($hdOrderList)) {
             foreach ($hdOrderList as $hdKey => $hdOrder) {