Merge branch 'master' of http://git.qiniu1314.com/Kirin/shenying

app/controller/api/v1/user/UserController.php

@@ -297,7 +297,7 @@ class UserController
         $password = $request->post('password', '');
         $user = $this->services->get($request->uid());
         if ($user->pwd !== md5((string)$password))
-            return app('json')->success('密码错误');
+            return app('json')->fail('密码错误');
         if (!$info || $info['uid'] != $request->uid()) {
             return app('json')->fail('记录不存在');
         }

app/controller/api/v1/user/UserExtractController.php

@@ -140,4 +140,31 @@ class UserExtractController
         else
             return app('json')->fail('提现失败');
     }
+
+
+    /**
+     * 提现申请
+     * @param Request $request
+     * @return mixed
+     */
+    public function exchange_energy(Request $request)
+    {
+        $extractInfo = $request->postMore([
+            ['energy', 0],
+            ['name', ''],
+            ['bankname', ''],
+            ['cardnum', ''],
+        ]);
+        if (!preg_match('/^[0-9]+(.[0-9]{1,2})?$/', (float)$extractInfo['money'])) return app('json')->fail('转换能量输入有误');
+        if (!$extractInfo['cardnum'] == '')
+            if (!preg_match('/^([1-9]{1})(\d{8}|\d{11}|\d{14}|\d{15}|\d{16}|\d{18})$/', $extractInfo['cardnum']))
+                return app('json')->fail('银行卡号输入有误');
+        if (!$extractInfo['cardnum']) return app('json')->fail('请输入银行卡账号');
+        if (!$extractInfo['bankname']) return app('json')->fail('请输入开户行信息');
+        $uid = (int)$request->uid();
+        if ($this->services->cash($uid, $extractInfo))
+            return app('json')->successful('申请转换成功!');
+        else
+            return app('json')->fail('转换失败');
+    }
 }

app/jobs/integral/IntegralJob.php

@@ -148,6 +148,7 @@ class IntegralJob extends BaseJobs
                 $res = $res && $awardIntegralService->addLake(-$real_out, $info['id'], $mark);
 
                 $to_brokerage = bcdiv(bcmul($real_out, sys_config('extract_brokerage_ratio', 0)), 100, 2);
+                if ($info['type'] == 1) $to_brokerage = bcdiv(bcmul($real_out, sys_config('extract_brokerage_ratio_active', 0)), 100, 2);
                 $to_energy = bcsub($real_out, $to_brokerage, 2);
                 if ($to_energy > 0) {
                     $balance = bcadd($user['energy'], $to_energy, 2);

app/services/system/config/SystemConfigServices.php

@@ -1481,7 +1481,7 @@ WSS;
             'user_extract_wechat_status', 'user_extract_alipay_status', 'user_extract_bank',
             'pay_weixin_client_cert', 'pay_weixin_client_key', 'brokerage_level', 'brokerage_compute_type',
             'action_integral_rate', 'static_integral_rate', 'lake_ratio', 'static_integral_ratio', 'recommend_integral', 'recommend_speed_integral',
-            'extract_ratio', 'extract_ratio_active', 'extract_brokerage_ratio', 'extract_speed_ratio', 'extract_speed_num', 'extract_spread_ratio',
+            'extract_ratio', 'extract_ratio_active', 'extract_brokerage_ratio', 'extract_brokerage_ratio_active', 'extract_speed_ratio', 'extract_speed_num', 'extract_spread_ratio',
             'district_award', 'city_award', 'province_award', 'area_award_time', 'reorder_recommend_integral', 'starts_return_time'
         ]);
 
@@ -1525,6 +1525,7 @@ WSS;
                 Build::inputNum('extract_ratio', $data['extract_ratio']['info'], $data['extract_ratio']['value'])->min(0)->info($data['extract_ratio']['desc']),
                 Build::inputNum('extract_ratio_active', $data['extract_ratio_active']['info'], $data['extract_ratio_active']['value'])->min(0)->info($data['extract_ratio_active']['desc']),
                 Build::inputNum('extract_brokerage_ratio', $data['extract_brokerage_ratio']['info'], $data['extract_brokerage_ratio']['value'])->min(0)->info($data['extract_brokerage_ratio']['desc']),
+                Build::inputNum('extract_brokerage_ratio_active', $data['extract_brokerage_ratio_active']['info'], $data['extract_brokerage_ratio_active']['value'])->min(0)->info($data['extract_brokerage_ratio_active']['desc']),
                 Build::inputNum('extract_speed_ratio', $data['extract_speed_ratio']['info'], $data['extract_speed_ratio']['value'])->min(0)->info($data['extract_speed_ratio']['desc']),
                 Build::inputNum('extract_speed_num', $data['extract_speed_num']['info'], $data['extract_speed_num']['value'])->min(0)->info($data['extract_speed_num']['desc']),
                 Build::inputNum('extract_spread_ratio', $data['extract_spread_ratio']['info'], $data['extract_spread_ratio']['value'])->min(0)->info($data['extract_spread_ratio']['desc']),