github/CRMEB
1
0
Fork 0
mirror of https://github.com/crmeb/CRMEB.git synced 2026-01-18 13:28:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

修复积分记录bug

Browse Source
This commit is contained in:
sugar1569 2019-04-02 18:12:02 +08:00
parent 00cb2627fe
commit 1a96b654fc
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
application/routine/model/user/UserRecharge.php
View File

@ -9,6 +9,7 @@ namespace app\routine\model\user;
use basic\ModelBasic; use basic\ModelBasic;
use service\RoutineService; use service\RoutineService;
use service\MiniProgramService;
use traits\ModelTrait; use traits\ModelTrait;
class UserRecharge extends ModelBasic class UserRecharge extends ModelBasic
@ -22,7 +23,7 @@ class UserRecharge extends ModelBasic
return time(); return time();
} }
public static function addRecharge($uid,$price,$recharge_type = 'weixin',$paid = 0) public static function addRecharge($uid,$price,$recharge_type = 'routine',$paid = 0)
{ {
$order_id = self::getNewOrderId($uid); $order_id = self::getNewOrderId($uid);
return self::set(compact('order_id','uid','price','recharge_type','paid')); return self::set(compact('order_id','uid','price','recharge_type','paid'));
@ -37,7 +38,8 @@ class UserRecharge extends ModelBasic
public static function jsPay($orderInfo) public static function jsPay($orderInfo)
{ {
return RoutineService::payRoutine(WechatUser::uidToOpenid($orderInfo['uid']),$orderInfo['order_id'],$orderInfo['price'],'user_recharge','用户充值'); return MiniProgramService::jsPay(WechatUser::uidToOpenid($orderInfo['uid']),$orderInfo['order_id'],$orderInfo['price'],'user_recharge','用户充值');//2.5.36
// return RoutineService::payRoutine(WechatUser::uidToOpenid($orderInfo['uid']),$orderInfo['order_id'],$orderInfo['price'],'user_recharge','用户充值');
} }
/** /**
@ -51,7 +53,7 @@ class UserRecharge extends ModelBasic
$user = User::getUserInfo($order['uid']); $user = User::getUserInfo($order['uid']);
self::beginTrans(); self::beginTrans();
$res1 = self::where('order_id',$order['order_id'])->update(['paid'=>1,'pay_time'=>time()]); $res1 = self::where('order_id',$order['order_id'])->update(['paid'=>1,'pay_time'=>time()]);
$res2 = UserBill::income('用户余额充值',$order['uid'],'now_money','recharge',$order['price'],$order['id'],$user['now_money'],'成功充值余额'.floatval($order['price']).'元'); $res2 = UserBill::income('用户余额充值',$order['uid'],'now_money','recharge',$order['price'],$order['id'],bcadd($user['now_money'],$order['price'],2),'成功充值余额'.floatval($order['price']).'元');
$res3 = User::edit(['now_money'=>bcadd($user['now_money'],$order['price'],2)],$order['uid'],'uid'); $res3 = User::edit(['now_money'=>bcadd($user['now_money'],$order['price'],2)],$order['uid'],'uid');
$res = $res1 && $res2 && $res3; $res = $res1 && $res2 && $res3;
self::checkTrans($res); self::checkTrans($res);