Merge branch 'master' into dev

app-hd/controllers/PurchaseController.php

@@ -1392,19 +1392,14 @@ class PurchaseController extends BaseController
                 util::fail('错误的供货商.');
             }
         }
-        //0搜索的addTime 1搜索的payTime
-        $searchTimeType = $get['searchTimeType'] ?? 0;
+
         $where = ['ghsId' => $id, 'debt' => PurchaseClass::DEBT_YES];
         $searchTime = $get['searchTime'] ?? '';
         if (!empty($searchTime)) {
             $startTime = $get['startTime'] ?? '';
             $endTime = $get['endTime'] ?? '';
             $period = dateUtil::formatTime($searchTime, $startTime, $endTime);
-            if ($searchTimeType == 0) {
-                $where['addTime'] = ['between', [$period['startTime'], $period['endTime']]];
-            }else{
-                $where['payTime'] = ['between', [$period['startTime'], $period['endTime']]];
-            }
+            $where['addTime'] = ['between', [$period['startTime'], $period['endTime']]];
         }
         $respond = PurchaseService::getDebtList($where);
         util::success($respond);

biz-hd/purchase/services/PurchaseService.php

@@ -129,7 +129,7 @@ class PurchaseService extends BaseService
             'transType' => $transType,
             'sendDistance' => $sendDistance,
         ];
-        $result = OrderClass::addOrder($arr,$custom);
+        $result = OrderClass::addOrder($arr, $custom);
         $respond->saleId = $result['id'];
         $respond->save();
 
@@ -299,7 +299,7 @@ class PurchaseService extends BaseService
         $id = $purchase->id;
         $purchase = PurchaseClass::cancel($id);
         $saleId = $purchase->saleId;
-        
+
         //销售单失效
         OrderClass::cancel($saleId);
         $couponId = $purchase->hbId;
@@ -574,7 +574,10 @@ class PurchaseService extends BaseService
 
         $info->payStatus = 1;
         $payTime = date("Y-m-d H:i:s");
-        $info->payTime = $payTime;
+        if (empty($info->payTime) || $info->payTime == '0000-00-00 00:00:00') {
+            //如果外面没有设置支付时间，即账单时间，则赋值支付时间
+            $info->payTime = $payTime;
+        }
 
         if ($payWay == dict::getDict('payWay', 'debtPay')) {
             //欠款支付（批发开单若销售单已 payAfter，沿用其待结，支持开单余额抵挂账）