commit

app/admin/model/user/UserExtract.php

@@ -85,13 +85,17 @@ 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'];
         $status = -1;
         $User = User::where('uid', $uid)->find()->toArray();
-        UserBill::income('提现失败', $uid, 'white_integral', 'extract', $extract_number, $id, bcadd($User['now_money'], $extract_number, 2), $mark.$fail_msg);
+        UserBill::income('提现失败', $uid, 'white_integral', 'extract_sb', $extract_number, $id, bcadd($User['now_money'], $extract_number, 2), $mark.$fail_msg);
         User::bcInc($uid, 'white_integral', $extract_number, 'uid');
+        if ($data['integral'] > 0){
+            UserBill::income('提现失败退回阳光', $uid, 'integral', 'extract_sb', $data['integral'], $id, bcadd($User['integral'], $data['integral'], 2), '提现失败退回阳光');
+            User::bcInc($uid, 'integral', $data['integral'], 'uid');
+        }
         $extract_type = '未知方式';
         switch ($data['extract_type']) {
             case 'alipay':

app/models/user/UserExtract.php

@@ -90,7 +90,9 @@ class UserExtract extends BaseModel
             if($dk > $sxf){
                 $ydk = ($dk - $sxf) * $tx;
                 $money = $data['money'];
+                $inte = $sxf;
             }else{
+                $inte = $sxf - $dk;
                 $ydk = 0;
                 $money = $data['money'] - ($sxf - $dk);
             }
@@ -104,7 +106,9 @@ class UserExtract extends BaseModel
             'extract_price' => $money,
             'add_time' => time(),
             'balance' => $balance,
-            'status' => self::AUDIT_STATUS
+            'status' => self::AUDIT_STATUS,
+            'money' => $data['money'],
+            'integral' => $data['status'] == 1? $inte : 0
         ];
         if(isset($data['name']) && strlen(trim($data['name']))) $insertData['real_name'] = $data['name'];
         else $insertData['real_name'] = $userInfo['nickname'];