ソースを参照

结尾款操作

shish 4 年 前
コミット
dc65fc5b5f

+ 2 - 1
app-hd/controllers/SettleController.php

@@ -24,10 +24,11 @@ class SettleController extends BaseController
             util::fail('没有找到订单');
         }
         OrderClass::valid($order, $this->mainId);
+        $staff = $this->shopAdmin;
         $connection = Yii::$app->db;
         $transaction = $connection->beginTransaction();
         try {
-            SettleClass::confirmSettle($order, $payWay);
+            SettleClass::confirmSettle($order, $payWay, $staff);
             $transaction->commit();
             util::complete();
         } catch (\Exception $exception) {

+ 1 - 0
biz-ghs/stat/classes/StatKdClass.php

@@ -336,6 +336,7 @@ class StatKdClass extends BaseClass
         $settleWhere = ['shopId' => $lsShopId, 'status' => 2];
         $settleWhere['payTime'] = ['between', [$todayStartTime, $todayEndTime]];
         $settleList = SettleClass::getAllByCondition($settleWhere, null, '*');
+
         if (!empty($settleList)) {
             foreach ($settleList as $sKey => $settle) {
                 $payWay = $settle['payWay'] ?? 0;

+ 6 - 1
biz-hd/order/classes/SettleClass.php

@@ -13,7 +13,7 @@ class SettleClass extends BaseClass
     public static $baseFile = '\bizHd\order\models\Settle';
 
     //结清尾款 ssh 20220708
-    public static function confirmSettle($order, $payWay)
+    public static function confirmSettle($order, $payWay, $staff)
     {
         $orderId = $order->id ?? 0;
         $settleId = $order->settleId ?? 0;
@@ -27,6 +27,8 @@ class SettleClass extends BaseClass
         $shopId = $order->shopId ?? 0;
         $customId = $order->customId ?? 0;
         $customName = $order->customName ?? '';
+        $staffId = $staff->id ?? 0;
+        $staffName = $staff->name ?? '';
         $settleData = [
             'prePrice' => $remainDebtPrice,
             'actPrice' => $remainDebtPrice,
@@ -40,6 +42,9 @@ class SettleClass extends BaseClass
             'status' => 2,
             'customId' => $customId,
             'customName' => $customName,
+            'payTime' => date("Y-m-d H:i:s"),
+            'hdShopAdminId' => $staffId,
+            'hdShopName' => $staffName,
         ];
         $return = self::addData($settleData);
         $settleId = $return->id ?? 0;