用户钱包与充值

application/api/controller/Notify.php

@@ -100,116 +100,7 @@ class Notify extends Api
 
 
 ////////////////////////////////////////////////////////////////////////
-    //充值VIP 异步回调对外方法
-    public function vip_notify_base(){
 
-        //验签
-        $paytype = input('paytype','wechat');
-        $notify_file = $this->notify_log_start($paytype);
-        $pay = Service::checkNotify($paytype);
-        if (!$pay) {
-            echo '签名错误';
-            exit;
-        }
-
-        //验证，拿订单号等信息
-        $data = $pay->verify();
-        $out_trade_no = $data['out_trade_no'];
-        //订单查询
-        $info = Db::name('pay_order')->where('out_trade_no',$out_trade_no)->find();
-
-        if(empty($info)){
-            return $pay->success()->send();
-            exit;
-        }
-
-        if($info['order_status'] != 0)
-        {
-            return $pay->success()->send();
-            exit;
-        }
-        //你可以在此编写订单逻辑
-        $rs = $this->vip_notify_do($out_trade_no);
-        if($rs === false){
-            //不论结果都应返回success
-            return $pay->success()->send();
-            exit;
-        }else{
-            //不论结果都应返回success
-            return $pay->success()->send();
-            exit;
-        }
-
-        //默认
-        return $pay->success()->send();
-        exit;
-    }
-
-    //充值金币 逻辑
-    private function vip_notify_do($out_trade_no){
-
-        Db::startTrans();
-        $orderInfo = Db::name('pay_order')->where(['out_trade_no' => $out_trade_no])->lock(true)->find();
-        if (empty($orderInfo)) {
-            Db::rollback();
-            return false;
-        }
-
-        if($orderInfo['order_status'] != 0){
-            Db::rollback();
-            return false;
-        }
-
-        //逻辑开始
-        //先充值
-        $args = json_decode($orderInfo['args'],true);
-        $user_info = Db::name('user_wallet')->where('user_id',$orderInfo['user_id'])->lock(true)->find();
-        if($user_info['vip_endtime'] < time()){
-            //过期了
-            $vip_endtime = time() + (intval($args['days']) * 86400);
-            $vip_type = 1;
-        }else{
-            //追加vip
-            $vip_endtime = $user_info['vip_endtime'] + (intval($args['days']) * 86400);
-            $vip_type = 2;
-        }
-        $update_data = [
-            'vip_endtime'=>$vip_endtime,
-        ];
-        $result = Db::name('user_wallet')->where('user_id',$orderInfo['user_id'])->update($update_data);
-
-        //记录日志
-        $log_data = [
-            'user_id' => $orderInfo['user_id'],
-            'before'  => $user_info['vip_endtime'],
-            'change_value'  => intval($args['days']) * 86400,
-            'remain'  => $vip_endtime,
-            'remark'  => '安卓购买vip',
-            'createtime'  => time(),
-            'vip_type'  => $vip_type,
-        ];
-        Db::name('user_vip_log')->insertGetId($log_data);
-
-        if($result === false)
-        {
-            Db::rollback();
-            return false;
-        }
-
-
-        //逻辑结束
-
-        //状态
-        $ros = Db::name('pay_order')->where(['out_trade_no' => $out_trade_no])->update(['order_status'=>1,'notifytime'=>time()]);
-        if($ros === false) {
-            Db::rollback();
-            return false;
-        }
-
-        //默认提交
-        Db::commit();
-        return true;
-    }
 
 
     //异步日志

application/api/controller/Pay.php

@@ -41,7 +41,7 @@ class Pay extends Api
         //赋值money
         if($rc_id){
             $recharge_config = Db::name('recharge_config')->where('id',$rc_id)->find();
-            $money = $recharge_config['money'] ?: 0;
+            $money = bcadd($recharge_config['money'],$recharge_config['giftmoney'],2);
         }
 
         //自由输入覆盖