pay recharge

www/protected/modules/common/controllers/ConfirmController.php

@@ -5,26 +5,72 @@ class ConfirmController extends CController{
         $input_data = json_decode(file_get_contents("php://input"), true);
         $input_data = $input_data['data']['object'];
         if($input_data['object'] == 'charge'&& $input_data['paid']==true){
-       
-  
+
             //TODO update database
-            $order = ROrder::get(new MongoId($input_data['order_no']));
-            if(!$order || $order->status == -1){
-                echo 'fail';
-                die();
-            }
-            $order->charge_id = $input_data['id'];
-            $order->pay_channel = $input_data['channel'];
-            $order->status = 1;
-            if($order->update(array('charge_id','pay_channel','status'),true)){
-                $list = new ARedisList('o2o_after_pay_success');
-                $list->push(json_encode($input_data));
+
+            if(strpos($input_data['order_no'], 'recharge_') !== false  ){    //充值卡订单
+                // 支付成功后 用户余额/代金券  增加   暂时充值卡发放的代金券没有过期时间
+
+                $order = RechargeOrder::get(new MongoId(str_replace("recharge_","",$input_data['order_no'])));
+
+                $recharge = Recharge::get(new MongoId($order->recharge));
+
+                $user_obj = RUser::get($order->user);
+
+                $amount = $recharge->denomination;
+
+
+                if($recharge->cash_back){
+                    $amount += $recharge->cash_back;
+                }
+                if(isset($recharge->coupons) && is_array($recharge->coupons) && count($recharge->coupons)){
+                    foreach ($recharge->coupons as $coupon_id) {
+                        //$start_time = time();
+                        //$end_time = strtotime(date('Y-m-d',$start_time+1209600));
+                        Service::factory('CouponService')->giveCoupon($user_obj->_id, $coupon_id);
+                    }
+                }
+
+                $user_obj->balance = $user_obj->balance+$amount;
+                $user_obj->save();
+
+                $log = new RechargeLog();
+                $log->time = time();
+                $log->user =  $user_obj->_id;
+                $log->recharge = $recharge->_id;
+                $log->save(true);
+
+                $balance_log = new BalanceLog();
+                $balance_log->time = time();
+                $balance_log->user =  $user_obj->_id;
+                $balance_log->memo = '购买充值卡充值';
+                $balance_log->type = 'recharge';
+                $balance_log->amount = $amount;
+                $balance_log->save(true);
+
                 echo 'success';
                 die();
+
             }else{
-                echo 'fail';
-                die();
+                $order = ROrder::get(new MongoId($input_data['order_no']));
+                if(!$order || $order->status == -1){
+                    echo 'fail';
+                    die();
+                }
+                $order->charge_id = $input_data['id'];
+                $order->pay_channel = $input_data['channel'];
+                $order->status = 1;
+                if($order->update(array('charge_id','pay_channel','status'),true)){
+                    $list = new ARedisList('o2o_after_pay_success');
+                    $list->push(json_encode($input_data));
+                    echo 'success';
+                    die();
+                }else{
+                    echo 'fail';
+                    die();
+                }
             }
+
         }elseif($input_data['object'] == 'refund'&& $input_data['succeed']==true){
             //TODO update database
             echo 'success';

www/protected/modules/o2o/controllers/RechargeController.php

@@ -25,45 +25,10 @@ class  RechargeController extends O2oBaseController{
 
         $str = '壹管家充值卡';
         $amount = ceil($order->price*1000)/10;
-        $result = Service::factory('PayService')->Pay($pay_channel,$amount,(string)$order->_id,$str,$str,$user_obj->wx_pub_openid);
+        $result = Service::factory('PayService')->Pay($pay_channel,$amount,'recharge_'.(string)$order->_id,$str,$str,$user_obj->wx_pub_openid);
         if($result === false){
             CommonFn::requestAjax(false,'支付遇到点问题了，请稍候再试');
         }else{
-            // 支付成功后 用户余额/代金券  增加   暂时充值卡发放的代金券没有过期时间
-
-            $recharge = Recharge::get(new MongoId($order->recharge));
-
-            $amount = $recharge->denomination;
-
-
-            if($recharge->cash_back){
-                $amount += $recharge->cash_back;
-            }
-            if(isset($recharge->coupons) && is_array($recharge->coupons) && count($recharge->coupons)){
-                foreach ($recharge->coupons as $coupon_id) {
-                    //$start_time = time();
-                    //$end_time = strtotime(date('Y-m-d',$start_time+1209600));
-                    Service::factory('CouponService')->giveCoupon($user_obj->_id, $coupon_id);
-                }
-            }
-
-            $user_obj->balance = $user_obj->balance+$amount;
-            $user_obj->save();
-
-            $log = new RechargeLog();
-            $log->time = time();
-            $log->user =  $user_obj->_id;
-            $log->recharge = $recharge->_id;
-            $log->save(true);
-
-            $balance_log = new BalanceLog();
-            $balance_log->time = time();
-            $balance_log->user =  $user_obj->_id;
-            $balance_log->memo = '购买充值卡充值';
-            $balance_log->type = 'recharge';
-            $balance_log->amout = $amount;
-            $balance_log->save(true);
-
             CommonFn::requestAjax(true,'success',json_decode($result),200,array());
         }
     }