收支明细

app/business/controllers/MerchantCapitalController.php

@@ -13,9 +13,7 @@ class MerchantCapitalController extends BaseController
 	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];
+		$where = ['merchantId' => $this->merchantId];
 		$list = MerchantCapitalService::getCapitalList($where);
 		util::success($list);
 	}

biz/merchant/services/MerchantCapitalService.php

@@ -32,39 +32,25 @@ 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'] : '';
+			$data['list'][$key]['event'] = '出售商品-门店';
 		}
 		return $data;
 	}
-
+	
 }

sql.txt

@@ -3,6 +3,7 @@ ALTER TABLE `xhMerchantCapital` CHANGE `affectBalance` `withdraw` TINYINT NOT NU
 ALTER TABLE `xhMerchantCapital` MODIFY `capitalType` TINYINT NOT NULL DEFAULT 0 COMMENT '流水类型';
 ALTER TABLE `xhMerchantCapital` MODIFY `payWay` TINYINT NOT NULL DEFAULT 0 COMMENT '付款方式；支付方式';
 ALTER TABLE `xhMerchantCapital` MODIFY `sourceType` TINYINT NOT NULL DEFAULT 0 COMMENT '来源';
+ALTER TABLE `xhMerchantCapital` MODIFY `io` TINYINT NOT NULL DEFAULT 0 COMMENT '收支类型 0支出 1收入';
 
 2020.1.5 shish 平台管理表名称变更
 RENAME TABLE `xhWxOpenAdmin` TO `xhStaff`;