收支金额

app-ghs/controllers/ShopCapitalController.php

@@ -13,10 +13,9 @@ class ShopCapitalController extends BaseController
 
     public function actionList()
     {
-        $get = Yii::$app->request->get();
-        $shopId = $get['shopId'] ?? 0;
         $where = [];
-        $where['shopId'] = $shopId;
+        $where['sjId'] = $this->sjId;
+        $where['shopId'] = $this->shopId;
         $list = ShopCapitalClass::getCapitalList($where);
         util::success($list);
     }

app-hd/controllers/ShopCapitalController.php

@@ -13,10 +13,9 @@ class ShopCapitalController extends BaseController
 
     public function actionList()
     {
-        $get = Yii::$app->request->get();
-        $shopId = $get['shopId'] ?? 0;
         $where = [];
-        $where['shopId'] = $shopId;
+        $where['sjId'] = $this->sjId;
+        $where['shopId'] = $this->shopId;
         $list = ShopCapitalClass::getCapitalList($where);
         util::success($list);
     }

biz-ghs/order/services/OrderService.php

@@ -450,6 +450,7 @@ class OrderService extends BaseService
             'capitalType' => $capitalType,
             'relateId' => $orderId,
             'io' => 1,
+            'amount' => $amount,
             'totalIncome' => $currentTotalIncome,
             'payWay' => $payWay,
             'event' => $event,