commit

app/api/controller/user/UserController.php

@@ -698,10 +698,10 @@ class UserController
             User::bcDec($request->uid(), $category, $give, 'uid');
             if ($data['type'] == 3){
                 UserBill::income('接收余额', $user['uid'], 'now_money', 'js_accounts', $receive, '', bcadd($user['now_money'], $receive), '接收余额');
-                UserBill::income('转账余额', $find['uid'], 'now_money', 'zz_accounts', $give, '', bcsub($find['now_money'], $give), '转账余额');
+                UserBill::expend('转账余额', $find['uid'], 'now_money', 'zz_accounts', $give, '', bcsub($find['now_money'], $give), '转账余额');
             }else{
                 UserBill::income('接收转账积分', $user['uid'], $category, 'accounts', $data['price'] * 0.97, '', $data['type']==1?$user['integral']:$user['dynamic_integral'], '接收转账积分');
-                UserBill::income('转账积分', $find['uid'], $category, 'accounts', $data['price'], '', $data['type']==1?$find['integral']:$find['dynamic_integral'], '转账积分');
+                UserBill::expend('转账积分', $find['uid'], $category, 'accounts', $data['price'], '', $data['type']==1?$find['integral']:$find['dynamic_integral'], '转账积分');
             }
 
             cache($request->uid(), 1, 5);

app/models/user/User.php

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