结账订单

app-ghs/controllers/ClearController.php

@@ -4,7 +4,7 @@ namespace ghs\controllers;
 
 use bizGhs\clear\classes\ClearClass;
 use bizGhs\clear\services\ClearService;
-use common\components\stringUtil;
+use bizGhs\custom\classes\CustomClass;
 use common\components\util;
 use Yii;
 
@@ -15,11 +15,11 @@ class ClearController extends BaseController
     public function actionList()
     {
         $get = Yii::$app->request->get();
-        $where = ['sjId' => $this->sjId, 'shopId' => $this->shopId];
-        if (isset($get['customId'])) {
-            $where['customId'] = $get['customId'];
-        }
         $where['status'] = 2;
+        $customId = $get['customId'] ?? 0;
+        $custom = CustomClass::getById($customId, true);
+        CustomClass::valid($custom, $this->shopId);
+        $where['customId'] = $customId;
         $list = ClearService::getClearList($where);
         util::success($list);
     }
@@ -28,7 +28,7 @@ class ClearController extends BaseController
     public function actionGetFullInfo()
     {
         $id = Yii::$app->request->get('id');
-        $respond = ClearClass::getFullInfo($id);
+        $respond = ClearClass::getSaleInfo($id);
         util::success($respond);
     }
 

app-hd/controllers/ClearController.php

@@ -0,0 +1,35 @@
+<?php
+
+namespace hd\controllers;
+
+use biz\ghs\classes\GhsClass;
+use bizGhs\clear\classes\ClearClass;
+use bizGhs\clear\services\ClearService;
+use common\components\util;
+use Yii;
+
+class ClearController extends BaseController
+{
+
+    //结款单 shish 20210625
+    public function actionList()
+    {
+        $get = Yii::$app->request->get();
+        $where['status'] = 2;
+        $ghsId = $get['ghsId'] ?? 0;
+        $ghs = GhsClass::getById($ghsId, true);
+        GhsClass::valid($ghs, $this->shopId);
+        $where['ghsId'] = $ghsId;
+        $list = ClearService::getClearList($where);
+        util::success($list);
+    }
+
+    //获取基本信息 shish 20210625
+    public function actionGetFullInfo()
+    {
+        $id = Yii::$app->request->get('id');
+        $respond = ClearClass::getCgInfo($id);
+        util::success($respond);
+    }
+
+}

biz-ghs/clear/classes/ClearClass.php

@@ -8,6 +8,7 @@ use bizGhs\base\classes\BaseClass;
 use bizGhs\custom\classes\CustomClass;
 use bizGhs\order\classes\OrderClass;
 use bizGhs\order\classes\PurchaseOrderClass;
+use bizHd\purchase\classes\PurchaseClass;
 use common\components\dict;
 use common\components\orderSn;
 use common\components\util;
@@ -146,7 +147,7 @@ class ClearClass extends BaseClass
     }
 
     //完整信息 shish 20210625
-    public static function getFullInfo($id)
+    public static function getSaleInfo($id)
     {
         $info = self::getById($id);
         if (empty($info)) {
@@ -162,4 +163,21 @@ class ClearClass extends BaseClass
         return $info;
     }
 
+    //完整信息 shish 20210625
+    public static function getCgInfo($id)
+    {
+        $info = self::getById($id);
+        if (empty($info)) {
+            return $info;
+        }
+        $purchaseIds = $info['purchaseIds'] ?? [];
+        $cgArr = explode(',', $purchaseIds);
+        $cgList = PurchaseClass::getAllByCondition(['id' => ['in', $cgArr]], null, 'id,orderSn,bigNum,smallNum,realPrice', null);
+        $info['orderList'] = $cgList;
+        $info['orderNum'] = count($cgArr);
+        $type = $info['type'] ?? 1;
+        $info['operator'] = $type == 2 ? '商家' : '';
+        return $info;
+    }
+
 }