收支明细

app/business/controllers/MerchantCapitalController.php

@@ -0,0 +1,23 @@
+<?php
+
+namespace business\controllers;
+
+use biz\merchant\services\MerchantCapitalService;
+use Yii;
+use common\components\util;
+
+class MerchantCapitalController extends BaseController
+{
+
+	//列表 shish 2020.1.8
+	public function actionList()
+	{
+		$get = Yii::$app->request->get();
+		$status = isset($get['status']) ? $get['status'] : 0;
+		$search = isset($get['search']) ? $get['search'] : '';
+		$where = ['merchantId' => $this->merchantId, 'status' => $status];
+		$list = MerchantCapitalService::getCapitalList($where);
+		util::success($list);
+	}
+
+}

biz/merchant/services/MerchantCapitalService.php

@@ -32,5 +32,39 @@ class MerchantCapitalService extends BaseService
 		//用途增加资金
 		StatIncomeUsageService::replaceData($data);
 	}
-	
+
+	//收入流水 shish 2020.1.8
+	public static function getCapitalList($where)
+	{
+		$data = self::getList('*', $where, 'addTime DESC');
+		if (isset($data['list']) == false || empty($data['list'])) {
+			return $data;
+		}
+		
+		$orderIds = array_column($data['list'], 'id');
+		
+		//获取订单的商品信息
+		$goodsList = OrderGoodsService::getGoodsListByOrderIds($orderIds);
+		
+		//获取订花人的用户信息
+		$orderUserIds = array_column($data['list'], 'userId');
+		$orderUserIds = array_unique($orderUserIds);
+		$userInfoList = UserService::getUserByIds($orderUserIds);
+		
+		$merchantIdList = array_column($data['list'], 'merchantId');
+		$merchantIdList = array_filter(array_unique($merchantIdList));
+		$merchantList = MerchantService::getByIds($merchantIdList, null, 'id');
+		
+		foreach ($data['list'] as $key => $val) {
+			$id = $val['id'];
+			$userId = $val['userId'];
+			$data['list'][$key]['goodsInfoList'] = isset($goodsList[$id]) ? $goodsList[$id] : [];
+			//订花人头像
+			$data['list'][$key]['bookAvatar'] = isset($userInfoList[$userId]['avatar']) ? $userInfoList[$userId]['avatar'] : '';
+			$merchantId = $val['merchantId'];
+			$data['list'][$key]['merchantName'] = isset($merchantList[$merchantId]['merchantName']) ? $merchantList[$merchantId]['merchantName'] : '';
+		}
+		return $data;
+	}
+
 }