zxhxx 3 rokov pred
rodič
commit
ad215adbbb

+ 1 - 1
app/api/controller/user/UserBillController.php

@@ -342,7 +342,7 @@ class UserBillController
         list($page, $limit,$pm) = UtilService::getMore([
             [['page', 'd'], 0], [['limit', 'd'], 0],[['pm', 'd'], -1],
         ], $request, true);
-        return app('json')->successful(UserBill::userBillList($request->uid(), $page, $limit,'',$pm));
+        return app('json')->successful(UserBill::userBillList($request->uid(), $page, $limit,'integral',$pm));
 
     }
     /*

+ 2 - 2
app/models/store/Package.php

@@ -129,10 +129,10 @@ class Package extends BaseModel
             $package_income = bcmul($info['price'],bcdiv(sys_config('package_income'),100,2),2);
             $confirm_receipt = bcmul($info['price'],bcdiv(sys_config('confirm_receipt'),100,2),2);
             $gold_bond = bcmul($info['price'],bcdiv(sys_config('gold_bond'),100,2),2);
-            User::where('uid',$info['uid'])->inc('brokerage_price',$package_income)->inc('gold',$gold_bond)->update();
+            User::where('uid',$info['uid'])->inc('brokerage_price',$package_income)->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);
+            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();