结帐

app-ghs/controllers/ClearController.php

@@ -2,6 +2,7 @@
 
 namespace ghs\controllers;
 
+use bizGhs\clear\classes\ClearClass;
 use bizGhs\clear\services\ClearService;
 use common\components\stringUtil;
 use common\components\util;
@@ -19,8 +20,16 @@ class ClearController extends BaseController
             $where['customId'] = $get['customId'];
         }
         $where['status'] = 2;
-        $list = ClearService::getCustomList($where);
+        $list = ClearService::getClearList($where);
         util::success($list);
     }
 
+    //获取基本信息 shish 20210625
+    public function actionGetFullInfo()
+    {
+        $id = Yii::$app->request->get('id');
+        $respond = ClearClass::getFullInfo($id);
+        util::success($respond);
+    }
+
 }

app-ghs/controllers/OrderClearController.php

@@ -8,31 +8,31 @@ use common\components\util;
 
 class OrderClearController extends BaseController
 {
-	
-	//收款 ssh 2021.2.4
-	public function actionClear()
-	{
-		$id = Yii::$app->request->post('id');
-		$customId = Yii::$app->request->post('customId');
-		if (empty($id)) {
-			util::fail('请选择交易记录');
-		}
-		$connection = Yii::$app->db;
-		$transaction = $connection->beginTransaction();
-		$data = [
-			'customId' => $customId,
-			'ghsShopAdminId' => $this->shopAdminId,
-			'ghsShopAdminName' => $this->shopAdmin['name'],
-		];
-		try {
-			OrderClearClass::clear($data, $id, $this->sjId,$this->shopId);
-			$transaction->commit();
-		} catch (\Exception $exception) {
-			$transaction->rollBack();
-			Yii::info("批量收款失败：" . $exception->getMessage());
-			util::fail('操作失败');
-		}
-		util::complete();
-	}
-	
+
+    //收款 ssh 2021.2.4
+    public function actionClear()
+    {
+        $id = Yii::$app->request->post('id');
+        $customId = Yii::$app->request->post('customId');
+        if (empty($id)) {
+            util::fail('请选择交易记录');
+        }
+        $connection = Yii::$app->db;
+        $transaction = $connection->beginTransaction();
+        $data = [
+            'customId' => $customId,
+            'ghsShopAdminId' => $this->shopAdminId,
+            'ghsShopAdminName' => $this->shopAdmin['name'],
+        ];
+        try {
+            OrderClearClass::clear($data, $id, $this->sjId, $this->shopId);
+            $transaction->commit();
+        } catch (\Exception $exception) {
+            $transaction->rollBack();
+            Yii::info("批量收款失败：" . $exception->getMessage());
+            util::fail('操作失败');
+        }
+        util::complete();
+    }
+
 }

biz-ghs/clear/classes/ClearClass.php

@@ -6,6 +6,7 @@ use biz\ghs\classes\GhsClass;
 use biz\shop\classes\ShopClass;
 use bizGhs\base\classes\BaseClass;
 use bizGhs\custom\classes\CustomClass;
+use bizGhs\order\classes\OrderClass;
 use bizGhs\order\classes\PurchaseOrderClass;
 use common\components\dict;
 use common\components\orderSn;
@@ -144,4 +145,21 @@ class ClearClass extends BaseClass
         $customShop->save();
     }
 
+    //完整信息 shish 20210625
+    public static function getFullInfo($id)
+    {
+        $info = self::getById($id);
+        if (empty($info)) {
+            return $info;
+        }
+        $saleIds = $info['saleIds'] ?? [];
+        $saleArr = explode(',', $saleIds);
+        $saleList = OrderClass::getAllByCondition(['id' => ['in', $saleArr]], null, 'id,orderSn,bigNum,smallNum,realPrice', null);
+        $info['orderList'] = $saleList;
+        $info['orderNum'] = count($saleArr);
+        $type = $info['type'] ?? 1;
+        $info['operator'] = $type == 1 ? '客户' : '';
+        return $info;
+    }
+
 }

biz-ghs/clear/services/ClearService.php

@@ -11,15 +11,19 @@ class ClearService extends BaseService
     public static $baseFile = '\bizGhs\clear\classes\ClearClass';
 
     //清单列表 shish 20210625
-    public static function getCustomList($where)
+    public static function getClearList($where)
     {
         $data = ClearClass::getList('*', $where, 'addTime DESC');
         $list = isset($data['list']) && !empty($data['list']) ? $data['list'] : [];
         if (empty($list)) {
             return $data;
         }
+        foreach ($data['list'] as $key => $val) {
+            //操作人
+            $type = $val['type'] ?? 1;
+            $data['list'][$key]['operator'] = $type == 1 ? '客户' : '';
+        }
         return $data;
     }
 
-
 }