新增话费支付和支付完成回调

app/controller/api/Notify.php

@@ -44,6 +44,17 @@ class Notify
                     $pay_type = $post_data_str['pay_channel'];
                     $pay_type = $pay_type == 'wx_lite' ? 1 : 4;
                     switch ($type){
+                        case 'huafei':
+                            //话费充值支付成功推送
+                            try{
+                                $order_data = Db::name('rrx_order_huafei_hf') -> where('order_no', $requestId[0])->find();
+                                if($order_data['status']==1) return false;
+                                $pay_type = $pay_type == 1 ? 'wx' : 'al';
+                                Db::name('rrx_order_huafei_hf')->where('order_no',$requestId[0])->update(['rand'=>$requestId[1],'pay_type'=>$pay_type,'status'=>1]);
+                            }catch (\Exception $e) {
+                                Db::name('log')->insert(['data'=>'话费充值支付回调错误：'.$e->getFile().'：'.$e->getLine().'【'.$e->getMessage().'】']);
+                            }
+                            break;
                         case 'pay':
                             //商城集合订单
                             Db::name('store_group_order') -> where('group_order_sn',$requestId[0]) -> update(['rand'=>$requestId[1]]);

app/controller/api/merchant/sxy/Access.php

@@ -721,6 +721,37 @@ class Access
         return $result;
     }
 
+
+
+    //app小程序话费支付
+    public function hf_pay_wechat_mp(){
+        try {
+            log::info("微信小程序回调");
+            Db::name('log')->insert(['data'=>'汇付订单支付pay_wechat_mp-66666666---发起支付']);
+            $oid = Request::param('oid','');
+            $code = Request::param('code','');
+            $type = Request::param('type','');
+            if($oid == '') return app('json')->fail("请检查参数是否正确");
+
+			$groupOrder = Db::name('order_huafei_hf')->where('order_id', (int)$oid)->find();
+            if (!$groupOrder) return app('json')->fail('订单不存在或已支付');
+ 
+            $res = $this->pay_huifu($type,$code,$groupOrder,"储蓄保",env('APP_URL')."/api/hf_notify/huafei",'delay');
+            Db::name('log')->insert(['data'=>'汇付话费订单支付--- 返回参数'.json_encode($res)]);
+            if (isset($res['id'])) {
+                return app('json')->success($res);
+            }
+            return app('json')->fail($res);
+        }catch (Exception $exception){
+            log::info("支付异常======");
+            log::info($exception);
+            Db::name("log")->insert(array('data'=>$exception->getFile().'：'.$exception->getLine().'【'.$exception->getMessage().'】'));//日志记录
+            return app('json')->fail("异常");
+        }
+    }
+
+
+
     //小程序支付
     public function pay_wechat_mp(StoreGroupOrderRepository $groupOrderRepository){
         try {
@@ -823,6 +854,7 @@ class Access
         }
 
     }
+    
 
 
     //小程序支付
@@ -1317,6 +1349,7 @@ class Access
 
     }
 
+
     //退款
     public function refund(){
         $data['requestId'] = ShouxinyiApiRequest::getOrderNumber('refund');    //订单号

app/controller/api/store/service/Huafei.php

@@ -90,32 +90,48 @@ class Huafei extends BaseController
 		//验证
 		$verify = $this->verify($params['phone'], $params['money']);
 		if($verify['code'] == '0000'){
-			//推送
-			$order_sn = time().$uid;
-			$push = $this->pushOrder($order_sn, $params['phone'], $params['money']);
-			if($push['code'] == '0000'){
-				//入库记录
-				$insertdata = [
-					'uid'=> $uid,
-					'mobile' => $params['phone'],
-					'commission'=> 0,
-					'commission_share'=> 0.04,
-					'order_number' => $push['data']['order_number'],
-					'order_sn' => $order_sn,
-					'amount_price' => $push['data']['amount'],
-					'fanli_price' => $push['data']['fanli'],
-					'cost_price' => $push['data']['cost_price'],
-					'pay_money' => $params['money'],
-					'status' => 0,
-					'create_time' => time(),
-					'finish_time' => time(),
-					'modify_time' => time(),
-				];
-				Db::name('order_huafei')->insert($insertdata);
-				return app('json')->success('话费推送成功', $push);
+			$order_sn = time().$uid.mt_rand(1000,9999);
+			//创建预支付订单
+			$insertdata = [
+				'uid'=> $uid,
+				'mobile' => $params['phone'],
+				'order_no' => $order_sn,
+				'pay_price' => $params['money'],
+				'status' => 0,
+				'create_time' => time(),
+			];
+			$oid = Db::name('order_huafei_hf')->insertGetId($insertdata);
+			if($oid){
+				return app('json')->success('订单创建成功', ['oid'=>$oid, 'order_sn'=>$order_sn]);
 			}else{
-				return app('json')->fail($push['msg']);
+				return app('json')->fail('创建话费充值预支付订单失败');
 			}
+
+			//推送订单
+			// $push = $this->pushOrder($order_sn, $params['phone'], $params['money']);
+			// if($push['code'] == '0000'){
+			// 	//入库记录
+			// 	$insertdata = [
+			// 		'uid'=> $uid,
+			// 		'mobile' => $params['phone'],
+			// 		'commission'=> 0,
+			// 		'commission_share'=> 0.04,
+			// 		'order_number' => $push['data']['order_number'],
+			// 		'order_sn' => $order_sn,
+			// 		'amount_price' => $push['data']['amount'],
+			// 		'fanli_price' => $push['data']['fanli'],
+			// 		'cost_price' => $push['data']['cost_price'],
+			// 		'pay_money' => $params['money'],
+			// 		'status' => 0,
+			// 		'create_time' => time(),
+			// 		'finish_time' => time(),
+			// 		'modify_time' => time(),
+			// 	];
+			// 	Db::name('order_huafei')->insert($insertdata);
+			// 	return app('json')->success('话费推送成功', $push);
+			// }else{
+			// 	return app('json')->fail($push['msg']);
+			// }
 		}else{
 			return app('json')->fail($verify['msg']);
 		}

route/api.php

@@ -1130,6 +1130,8 @@ Route::group('api/', function () {
     Route::any('test1111', 'api.merchant.sxy.Access/test1111');//回调
     //app小程序支付
     Route::get('sxy_pay_wechat_mp', 'api.merchant.sxy.Access/pay_wechat_mp');
+    //app小程序话费支付
+    Route::get('hf_pay_wechat_mp', 'api.merchant.sxy.Access/hf_pay_wechat_mp');
     //app小程序支付年费
     Route::get('pay_annual_cost', 'api.merchant.sxy.Access/pay_annual_cost');
     //app小程序支付激活码费用