用户页面对接收益数据

lib/constants/api_v2.dart

@@ -90,6 +90,9 @@ class BenefitAPI {
 
   ///月团队推荐平台预估收益
   String get monthExpectExtra => '/v2/app/user/income/month_expect_team';
+
+  ///会员收益数据
+  String get incomeData => '/v2/app/user/member/income_data';
 }
 
 class _OrderAPI {

lib/pages/user/model/user_income_data_model.dart

@@ -0,0 +1,64 @@
+class UseerIncomeDataModel {
+  Purchase purchase;
+  Purchase guide;
+  Purchase team;
+  int hasTeam;
+
+  bool get hasTeamValue => hasTeam == 1;
+
+  UseerIncomeDataModel({this.purchase, this.guide, this.team, this.hasTeam});
+
+  UseerIncomeDataModel.fromJson(Map<String, dynamic> json) {
+    purchase = json['purchase'] != null
+        ? new Purchase.fromJson(json['purchase'])
+        : null;
+    guide = json['guide'] != null ? new Purchase.fromJson(json['guide']) : null;
+    team = json['team'] != null ? new Purchase.fromJson(json['team']) : null;
+    hasTeam = json['hasTeam'];
+  }
+
+  Map<String, dynamic> toJson() {
+    final Map<String, dynamic> data = new Map<String, dynamic>();
+    if (this.purchase != null) {
+      data['purchase'] = this.purchase.toJson();
+    }
+    if (this.guide != null) {
+      data['guide'] = this.guide.toJson();
+    }
+    if (this.team != null) {
+      data['team'] = this.team.toJson();
+    }
+    data['hasTeam'] = this.hasTeam;
+    return data;
+  }
+}
+
+class Purchase {
+  num expectAmount;
+  num expectCount;
+  num amount;
+  num count;
+
+  String get expectAmountValue => (expectAmount ?? 0.0).toStringAsFixed(2);
+  String get expectCountValue => (expectCount ?? 0).toString();
+  String get amountValue => (amount ?? 0.0).toStringAsFixed(2);
+  String get countValue => (count ?? 0).toString();
+
+  Purchase({this.expectAmount, this.expectCount, this.amount, this.count});
+
+  Purchase.fromJson(Map<String, dynamic> json) {
+    expectAmount = json['expectAmount'];
+    expectCount = json['expectCount'];
+    amount = json['amount'];
+    count = json['count'];
+  }
+
+  Map<String, dynamic> toJson() {
+    final Map<String, dynamic> data = new Map<String, dynamic>();
+    data['expectAmount'] = this.expectAmount;
+    data['expectCount'] = this.expectCount;
+    data['amount'] = this.amount;
+    data['count'] = this.count;
+    return data;
+  }
+}

lib/pages/user/user_page.dart

@@ -25,6 +25,7 @@ import 'package:recook/models/shop_summary_model.dart';
 import 'package:recook/models/user_brief_info_model.dart';
 import 'package:recook/models/user_model.dart';
 import 'package:recook/pages/user/functions/user_benefit_func.dart';
+import 'package:recook/pages/user/model/user_income_data_model.dart';
 import 'package:recook/pages/user/order/order_after_sale_page.dart';
 import 'package:recook/pages/user/order/order_center_page.dart';
 import 'package:recook/pages/user/user_history_benefit_page.dart';
@@ -67,7 +68,7 @@ class _UserPageState extends BaseStoreState<UserPage> {
 
   GlobalKey<ShopBenefitViewState> _shopBenefitKey =
       GlobalKey<ShopBenefitViewState>();
-
+  UseerIncomeDataModel _userIncomeDataModel;
   @override
   bool get wantKeepAlive => true;
 
@@ -161,7 +162,6 @@ class _UserPageState extends BaseStoreState<UserPage> {
   _updateAllAmount() {
     UserBenefitFunc.accmulate().then((value) {
       _allBenefitAmount = value.data.allAmount;
-      setState(() {});
     });
   }
 
@@ -175,7 +175,13 @@ class _UserPageState extends BaseStoreState<UserPage> {
       _amount = result.data['amount'] ?? 0;
       _target = result.data['need_amount'] ?? 100;
     }
-    setState(() {});
+  }
+
+  _updateNewBenefit() async {
+    ResultData result = await HttpManager.post(APIV2.benefitAPI.incomeData, {});
+    if (result.data != null && result.data['data'] != null) {
+      _userIncomeDataModel = UseerIncomeDataModel.fromJson(result.data['data']);
+    }
   }
 
   Widget _buildRefreshScrollView(
@@ -190,12 +196,14 @@ class _UserPageState extends BaseStoreState<UserPage> {
           releaseText: "松开更新个人数据",
           idleText: "下拉更新个人数据",
           refreshingText: "正在更新个人数据...",
-          onRefresh: () {
+          onRefresh: () async {
             VersionTool.checkVersionInfo(context);
-            _shopBenefitKey.currentState.updateBenefit();
+            // _shopBenefitKey.currentState.updateBenefit();
             _updateUserBriefInfo();
             _updateAllAmount();
             _updateCheck();
+            await _updateNewBenefit();
+            setState(() {});
           },
           body: ListView(
             physics: AlwaysScrollableScrollPhysics(),
@@ -226,10 +234,12 @@ class _UserPageState extends BaseStoreState<UserPage> {
                   alertContent: '您本人下单并确认收货后，您获得的佣金。',
                   title1: '未到账收益(瑞币)',
                   title3: '已到账收益(瑞币)',
-                  content1: '1514.1',
-                  content2: '12',
-                  content3: '12312.1',
-                  content4: '123',
+                  content1:
+                      _userIncomeDataModel?.purchase?.expectAmountValue ?? '0',
+                  content2:
+                      _userIncomeDataModel?.purchase?.expectCountValue ?? '0',
+                  content3: _userIncomeDataModel?.purchase?.amountValue ?? '0',
+                  content4: _userIncomeDataModel?.purchase?.countValue ?? '0',
                 ),
                 _renderBenefitCard(
                   leadingPath: R.ASSETS_USER_PINK_SHARE_PNG,
@@ -238,26 +248,31 @@ class _UserPageState extends BaseStoreState<UserPage> {
                   alertContent: '会员通过您导购的商品链接，购买并确认收货的佣金收益',
                   title1: '未到账收益(瑞币)',
                   title3: '已到账收益(瑞币)',
-                  content1: '1514.1',
-                  content2: '12',
-                  content3: '12312.1',
-                  content4: '123',
-                ),
-                _renderBenefitCard(
-                  leadingPath: R.ASSETS_USER_PINK_GROUP_PNG,
-                  title: '店铺补贴',
-                  alertTitle: '店铺补贴',
-                  alertContent: 'TODO',
-                  title1: '未到账补贴(瑞币)',
-                  title3: '已到账补贴(瑞币)',
-                  content1: '1514.1',
-                  content2: '12',
-                  content3: '12312.1',
-                  content4: '123',
+                  content1:
+                      _userIncomeDataModel?.guide?.expectAmountValue ?? '0',
+                  content2:
+                      _userIncomeDataModel?.guide?.expectCountValue ?? '0',
+                  content3: _userIncomeDataModel?.guide?.amountValue ?? '0',
+                  content4: _userIncomeDataModel?.guide?.countValue ?? '0',
                 ),
+                if (_userIncomeDataModel?.hasTeamValue ?? false)
+                  _renderBenefitCard(
+                    leadingPath: R.ASSETS_USER_PINK_GROUP_PNG,
+                    title: '店铺补贴',
+                    alertTitle: '店铺补贴',
+                    alertContent: 'TODO',
+                    title1: '未到账补贴(瑞币)',
+                    title3: '已到账补贴(瑞币)',
+                    content1:
+                        _userIncomeDataModel?.team?.expectAmountValue ?? '0',
+                    content2:
+                        _userIncomeDataModel?.team?.expectCountValue ?? '0',
+                    content3: _userIncomeDataModel?.team?.amountValue ?? '0',
+                    content4: _userIncomeDataModel?.team?.countValue ?? '0',
+                  ),
               ].sepWidget(separate: 10.hb),
               10.hb,
-              ShopBenefitView(key: _shopBenefitKey),
+              // ShopBenefitView(key: _shopBenefitKey),
               UserLevelTool.currentRoleLevelEnum() == UserRoleLevel.Gold ||
                       UserLevelTool.currentRoleLevelEnum() ==
                           UserRoleLevel.Silver