sunxbiao месяцев назад: 6
Родитель
Сommit
0e991e15b9

+ 2 - 1
app/common/enum/CommonEnum.php

@@ -51,7 +51,8 @@ class CommonEnum
51 51
         'PARTNER_DIVIDEND' => ['code' => 11, 'name' => '合伙人分红'],
52 52
         'JOINT_CREATOR_DIVIDEND' => ['code' => 12, 'name' => '联创分红'],
53 53
         'EQUITY_DIVIDEND' => ['code' => 13, 'name' => '股权分红'],
54
-        'SHARE_EARNINGS' => ['code' => 20, 'name' => '分享收益']
54
+        'SHARE_EARNINGS' => ['code' => 20, 'name' => '分享收益'],
55
+        'COMMISSION_RECORD_V1.0' => ['code' => 21, 'name' => '1.0佣金记录'],
55 56
     ];
56 57
 
57 58
     const USER_GROUP = [

+ 1 - 1
app/common/repositories/finance/FinanceRepository.php

@@ -1049,7 +1049,7 @@ class FinanceRepository extends BaseRepository
1049 1049
                 $query->where('ub.commission_type', 5);
1050 1050
             }, function ($query) use ($params) {
1051 1051
                 // 非养老金
1052
-                $query->whereIn('ub.commission_type', [3, 16, 14, 10, 12, 20, 15, 7, 19, 8, 11, 12]);
1052
+                $query->whereIn('ub.commission_type', [3, 16, 14, 10, 12, 20, 15, 7, 19, 8, 11, 12, 21]);
1053 1053
             })
1054 1054
             ->when(isset($params['uid']) && $params['uid'] != '', function ($query) use ($params) {
1055 1055
                 $query->where('ub.uid', $params['uid']);