commit

app/admin/controller/finance/UserExtract.php

@@ -143,7 +143,9 @@ class UserExtract extends AuthController
         if ($extract->status == 1) return JsonService::fail('您已提现,请勿重复提现!');
         if ($extract->status == -1) return JsonService::fail('您的提现申请已被拒绝!');
         $res = UserExtractModel::changeSuccess($id);
-        if ($res) {
+        $res1 = json_decode(do_request(' https://api.mall.hqgjsmc.com/service-php-api/member/comfireOrder', ['orderno' => $extract['order_id'], 'confireDate' => date('Y-m-d H:m:s')]));
+        if ($res1->status != 200)  return JsonService::fail($res1->msg);
+        if ($res && $res1) {
             UserExtractModel::commitTrans();
             return JsonService::successful('操作成功!');
         } else {

app/admin/model/user/UserExtract.php

@@ -85,13 +85,23 @@ class UserExtract extends BaseModel
     {
         $fail_time = time();
         $data = self::get($id);
-        $extract_number = $data['extract_price'];
-        $mark = '提现失败,退回佣金' . $extract_number . '元';
+        $extract_number = $data['money'];
+        $mark = '提现失败,退回' . $extract_number . '积分';
         $uid = $data['uid'];
+        if ($data['type'] == 1){
+            $str = 'integral';
+        }else{
+            $str = 'dynamic_integral';
+        }
         $status = -1;
         $User = User::where('uid', $uid)->find()->toArray();
-        UserBill::income('提现失败', $uid, 'now_money', 'extract', $extract_number, $id, bcadd($User['now_money'], $extract_number, 2), $mark);
-        User::bcInc($uid, 'brokerage_price', $extract_number, 'uid');
+        UserBill::income('提现失败', $uid, $str, 'th_extract', $extract_number, $id, bcadd($User['now_money'], $extract_number, 2), $mark);
+        User::bcInc($uid, $str, $extract_number, 'uid');
+        if ($data['type'] == 2){
+            User::bcDec($uid, 'contribution', $extract_number * sys_config('contribution')/100, 'uid');
+            UserBill::expend('提现失败扣回贡献值', $uid, 'contribution', 'th_contribution', $extract_number * sys_config('contribution')/100, $id, bcadd($User['dynamic_integral'], $extract_number * sys_config('contribution')/100, 2), '提现失败扣回贡献值');
+        }
+
         $extract_type = '未知方式';
         switch ($data['extract_type']) {
             case 'alipay':
@@ -123,7 +133,7 @@ class UserExtract extends BaseModel
 
         $data = self::get($id);
         $extractNumber = $data['extract_price'];
-        $mark = '成功提现佣金' . $extractNumber . '元';
+        $mark = '成功提现' . $extractNumber . '元';
         $wechatUserInfo = WechatUser::where('uid', $data['uid'])->field('openid,user_type,routine_openid,nickname')->find();
         $extract_type = '未知方式';
         switch ($data['extract_type']) {
@@ -143,10 +153,10 @@ class UserExtract extends BaseModel
             } else if (strtolower($wechatUserInfo->user_type) == 'wechat') {
                 WechatTemplateService::sendTemplate($wechatUserInfo->openid, WechatTemplateService::USER_BALANCE_CHANGE, [
                     'first' => $mark,
-                    'keyword1' => '佣金提现',
+                    'keyword1' => '提现',
                     'keyword2' => date('Y-m-d H:i:s', time()),
                     'keyword3' => $extractNumber,
-                    'remark' => '点击查看我的佣金明细'
+                    'remark' => '点击查看我的明细'
                 ], Url::buildUrl('/user/cashrecord')->suffix('')->domain(true)->build());
             }
         }

app/models/user/User.php

@@ -766,13 +766,13 @@ class User extends BaseModel
     {
         $user = self::where('uid', $uid)->find();
         if ($user){
-            $release = StoreOrderRelease::where('uid', $uid)->where('status', 0)->select();
-            if (count($release) > 0){
-                if ($to_release <= 750){
+            $release = StoreOrderRelease::where('uid', $uid)->order('to_release DESC')->where('status', 0)->find();
+            if ($release){
+                if ($release['to_release'] <= 750){
                     $number = $number * 0.2;
-                }elseif($to_release > 750 and $to_release <= 4000){
+                }elseif($release['to_release'] > 750 and $release['to_release'] <= 4000){
                     $number = $number * 0.25;
-                }elseif($to_release > 4000){
+                }elseif($release['to_release'] > 4000){
                     $number = $number * 0.3;
                 }
                 User::where('uid', $user['uid'])->inc('dynamic_integral', $number)->update();

app/models/user/UserBill.php

@@ -87,7 +87,7 @@ class UserBill extends BaseModel
         }
         $data['zc'] = self::where('uid', $uid)->where('category', $category)->where('pm', 0)->sum('number');
         $data['sr'] = self::where('uid', $uid)->where('category', $category)->where('pm', 1)->sum('number');
-        foreach ($list as &$v) {
+        foreach ($data['list'] as &$v) {
             $v['add_time'] = date('Y/m/d H:i', $v['add_time']);
             $v['number'] = floatval($v['number']);
         }

app/models/user/UserExtract.php

@@ -82,13 +82,17 @@ class UserExtract extends BaseModel
         $re_integral = sys_config('re_integral')/100;//提现积分比例
         $contribution = sys_config('contribution')/100; // 提现贡献比例
         $charge= sys_config('charge')/100; // 手续费
+        $order_id = $userInfo['uid'].time();
         $insertData = [
             'uid' => $userInfo['uid'],
             'extract_type' => $data['extract_type'],
             'extract_price' => $data['type'] == 1? ($data['money'] - ($data['money'] * $charge)) -2 :(($data['money'] * $re_integral) - ($data['money'] * $charge)) -2 ,
             'add_time' => time(),
             'balance' => $balance,
-            'status' => self::AUDIT_STATUS
+            'status' => self::AUDIT_STATUS,
+            'order_id' => $order_id,
+            'money' => $data['money'],
+            'type' => $data['type']
         ];
         if(isset($data['name']) && strlen(trim($data['name']))) $insertData['real_name'] = $data['name'];
         else $insertData['real_name'] = $userInfo['nickname'];
@@ -117,7 +121,7 @@ class UserExtract extends BaseModel
             $res2 = User::edit([$c=>$balance],$userInfo['uid'],'uid');
             if ($data['type'] == 2){
                 User::where('uid', $userInfo['uid'])->inc('contribution', $data['money'] * $contribution)->update();
-                $res = json_decode(do_request('https://api.mall.hqgjsmc.com/service-php-api/member/addTihuoValue', ['orderno' => time(), 'mobile' => $userInfo['phone'], 'order_money' => $data['money'], 'order_lfz' => $data['money'] * $contribution]));
+                $res = json_decode(do_request('https://api.mall.hqgjsmc.com/service-php-api/member/addTihuoValue', ['orderno' => $order_id, 'mobile' => $userInfo['phone'], 'order_money' => $data['money'], 'order_lfz' => $data['money'] * $contribution]));
                 if ($res->status != 200)  return self::setErrorInfo($res->msg);
                 UserBill::income('提现增加贡献值',$userInfo['uid'],'contribution','tx_contribution',$data['money'] * $contribution,$res1['id'],($userInfo['contribution']+$data['money'] * $contribution),'提现转换%'.sys_config('contribution').'贡献值');
             }