git

app/models/store/Package.php

@@ -126,15 +126,13 @@ class Package extends BaseModel
         $data['paid'] = 1;
         self::beginTrans();
         try {
-            $package_income = bcmul($info['price'],bcdiv(sys_config('package_income'),100,3),2);
-            $confirm_receipt = bcmul($info['price'],bcdiv(sys_config('confirm_receipt'),100,3),2);
             $gold_bond = bcmul($info['price'],bcdiv(sys_config('gold_bond'),100,3),2);
-            User::where('uid',$info['uid'])->inc('brokerage_price',$package_income)->inc('integral',$gold_bond)->update();
+            User::where('uid',$info['uid'])->inc('integral',$gold_bond)->update();
             $user = User::where('uid',$info['uid'])->find();
-            UserBill::income('订单收益',$info['uid'],'now_money','brokerage',$package_income,$info['id'],$user['brokerage_price'],'订单收益'.$package_income);
             UserBill::income('订单金券收益',$info['uid'],'integral','package',$gold_bond,$info['id'],$user['gold'],'订单金券收益'.$gold_bond);
-            /*
             $res = self::edit($data,$id);
+            /*
+
             User::where('uid',$info['to_uid'])->inc('brokerage_price',$confirm_receipt)->update();
             $to_user = User::where('uid',$info['to_uid'])->find();
             UserBill::income('订单确认收益',$info['to_uid'],'now_money','brokerage',$confirm_receipt,$info['id'],$to_user['brokerage_price'],'订单确认收益'.$confirm_receipt);
@@ -193,11 +191,16 @@ class Package extends BaseModel
         self::beginTrans();
         try {
             foreach ($list as $info) {
-                $package_income = bcmul($info['price'], bcdiv(sys_config('package_income'), 100, 3), 2);
-                User::where('uid', $info['to_uid'])->dec('gold', $package_income)->update();
+                $gold_bond = bcmul($info['price'],bcdiv(sys_config('gold_bond'),100,3),2);
+                User::where('uid',$info['uid'])->inc('integral',$gold_bond)->update();
+                $user = User::where('uid',$info['uid'])->find();
+                UserBill::income('订单金券收益',$info['uid'],'integral','package',$gold_bond,$info['id'],$user['gold'],'订单金券收益'.$gold_bond);
+                $res = self::edit($data,$info['id']);
                 $to_user = User::where('uid', $info['to_uid'])->find();
                 if ($info['last_id'] > 0) self::edit(['status' => 4], $info['last_id']);
                 self::edit($data, $info['id']);
+                $package_income = bcmul($info['price'], bcdiv(sys_config('package_income'), 100, 3), 2);
+                User::where('uid', $info['to_uid'])->dec('gold', $package_income)->update();
                 if($to_user['gold']<=0)
                 {
                       User::where('uid', $info['to_uid'])->update(['gold'=>0]);