付款订单数

app/business/controllers/OrderController.php

@@ -17,7 +17,6 @@ class OrderController extends BaseController
 	public function actionList()
 	{
 		$get = Yii::$app->request->get();
-		//组建where
 		$status = isset($get['status']) ? $get['status'] : 0;
 		$search = isset($get['search']) ? $get['search'] : '';
 		$where = ['merchantId' => $this->merchantId, 'status' => $status];
@@ -28,11 +27,11 @@ class OrderController extends BaseController
 				$where['id'] = $search;
 			}
 		}
-		
 		$list = OrderService::getOrderList($where);
+		$list['asset'] = $this->merchantAsset;
 		util::success($list);
 	}
-	
+
 	//订单详情 shish 2019.12.16
 	public function actionDetail()
 	{
@@ -112,5 +111,5 @@ class OrderController extends BaseController
 		}
 		util::success($order);
 	}
-
+	
 }

sql.txt

@@ -1,3 +1,7 @@
+2019.12.19 20:14 商家相关再更新
+ALTER TABLE `xhMerchantAsset` MODIFY `totalOrder` INT NOT NULL DEFAULT 0 COMMENT '订单总数，包括所有的';
+ALTER TABLE `xhMerchantAsset` ADD `payOrder` INT NOT NULL DEFAULT 0 COMMENT '付款订单数' AFTER `totalOrder`;
+
 2019.12.19 商家资产更新 shish
 ALTER TABLE `xhMerchantAsset` MODIFY `totalOrder` INT NOT NULL DEFAULT 0 COMMENT '订单数；已付款订单数';
 ALTER TABLE `xhMerchantAsset` ADD cancelOrder INT NOT NULL DEFAULT 0 COMMENT '已取消订单数' AFTER `totalOrder`;