Merge branch 'develop' into 'test'

fix bug

See merge request bp/pay!20

application/modules/Pay/controllers/Callback.php

@@ -76,7 +76,7 @@ class CallbackController extends Base
         $end = date('Y-m-d', $timestamp + 86400);
 
         $where['can_notify_account'] = 1;
-        $where['notify_account_times[<]'] = 5;
+        $where['notify_account_times[<]'] = 10;
         $where['can_notify_account_time[<>]'] = [$start, $end];
         $where['ORDER'] = ['can_notify_account_time'=>'ASC'];
         $where['LIMIT'] = [0, 100];

application/services/pay/PayService.php

@@ -521,6 +521,7 @@ class PayService
                     'pay_amount' => $u['amount'],
                     'pay_type' => 1, //收入
                     'pay_sub_type' => 105, //团长佣金收入
+                    'remark' => '',
                     'need_recorded' => 1,
                 ];