git

app/models/store/Package.php

@@ -133,11 +133,12 @@ class Package extends BaseModel
             $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);
+            */
             if($info['last_id']>0) self::edit(['status'=>4],$info['last_id']);
             self::commitTrans();
         }
@@ -192,16 +193,10 @@ class Package extends BaseModel
         self::beginTrans();
         try {
             foreach ($list as $info) {
-                $confirm_receipt = bcmul($info['price'], bcdiv(sys_config('confirm_receipt'), 100, 3), 2);
                 $package_income = bcmul($info['price'], bcdiv(sys_config('package_income'), 100, 3), 2);
-                $confirm_receipt1 = bcmul($info['price'], bcdiv(bcsub(sys_config('confirm_receipt'), sys_config('not_confirm_receipt', 2.2), 2), 100, 3), 2);
-                User::where('uid', $info['uid'])->inc('brokerage_price', $package_income)->update();
-                $user = User::where('uid', $info['uid'])->find();
-                UserBill::income('订单收益', $info['uid'], 'now_money', 'brokerage', $package_income, $info['id'], $user['brokerage_price'], '订单收益' . $package_income);
-                $res = self::edit($data, $info['id']);
-                User::where('uid', $info['to_uid'])->inc('brokerage_price', $confirm_receipt1)->update();
+                User::where('uid', $info['to_uid'])->dec('gold', $package_income)->update();
                 $to_user = User::where('uid', $info['to_uid'])->find();
-                UserBill::income('订单确认收益', $info['to_uid'], 'now_money', 'brokerage', $confirm_receipt1, $info['id'], $to_user['brokerage_price'], '订单确认收益' . $confirm_receipt1 . '，未确认收货系统确认，扣除收益' . bcsub($confirm_receipt, $confirm_receipt1, 2));
+                UserBill::income('扣除收益', $info['to_uid'], 'gold', 'dec', $package_income, $info['id'], $to_user['gold'], '订单未确认收货系统确认，扣除收益' .$package_income );
                 if ($info['last_id'] > 0) self::edit(['status' => 4], $info['last_id']);
             }
         } catch (Exception $e) {
@@ -220,17 +215,11 @@ class Package extends BaseModel
             $data['paid'] = 1;
             self::beginTrans();
             try {
-                $confirm_receipt = bcmul($info['price'],bcdiv(sys_config('confirm_receipt'),100,2),2);
-                $package_income = bcmul($info['price'],bcdiv(sys_config('package_income'),100,2),2);
-                $confirm_receipt1 = bcmul($info['price'],bcdiv(bcsub(sys_config('confirm_receipt'),sys_config('not_confirm_receipt',2.2),2),100,2),2);
-                User::where('uid',$info['uid'])->inc('brokerage_price',$package_income)->update();
-                $user = User::where('uid',$info['uid'])->find();
-                UserBill::income('订单收益',$info['uid'],'now_money','brokerage',$package_income,$info['id'],$user['brokerage_price'],'订单收益'.$package_income);
-                $res = self::edit($data,$id);
-                User::where('uid',$info['to_uid'])->inc('brokerage_price',$confirm_receipt1)->update();
-                $to_user = User::where('uid',$info['to_uid'])->find();
-                UserBill::income('订单确认收益',$info['to_uid'],'now_money','brokerage',$confirm_receipt1,$info['id'],$to_user['brokerage_price'],'订单确认收益'.$confirm_receipt1.'，未确认收货系统确认，扣除收益'.bcsub($confirm_receipt,$confirm_receipt1,2));
-                if($info['last_id']>0) self::edit(['status'=>4],$info['last_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();
+                $to_user = User::where('uid', $info['to_uid'])->find();
+                UserBill::income('扣除收益', $info['to_uid'], 'gold', 'dec', $package_income, $info['id'], $to_user['gold'], '订单未确认收货系统确认，扣除收益' .$package_income );
+                if ($info['last_id'] > 0) self::edit(['status' => 4], $info['last_id']);
                 self::commitTrans();
             }
             catch (Exception $e)
@@ -307,7 +296,7 @@ class Package extends BaseModel
         foreach ($data as &$v)
         {
             if($v['whole_id']) {
-                $v['whole'] = StoreWholesale::find($v['whole_id'])->toArray();
+                $v['whole'] = StoreWholesale::find($v['whole_id']);
             }
             else
             {