话费回调调整 推送代码调整

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

@@ -23,57 +23,66 @@ class Huafei extends BaseController
 
 	//充值话费回调
 	public function notify(){
-		$param = $this->request->param();
-		Db::name('log')->insert(['data'=>'话费充值回调数据'.json_encode($param)]);
-
-		$order_no = $param['order_no'];
-		$order_number = $param['order_number'];
-
-		$huafeiInfo = Db::name('order_huafei')->where("order_number", $order_number)->where("order_sn", $order_no)->find();
-		if(!$huafeiInfo) echo 'error';exit;
-
-		$updateData = [
-			'amount_price' => $param['amount'],
-			'fanli_price' => $param['fanli'],
-			'cost_price' => $param['cost_price'],
-			'arrived_amount'=> $param['arrived_amount'],
-			'status' => $param['status'],
-			'modify_time' => time(),
-		];
-		$ret = Db::name("order_huafei")->where("order_number", $order_number)->where("order_sn", $order_no)->update($updateData);
-		if($ret){
-			if($param['status'] == 2) {
-				//判断数据库有无此订单
-				$type_shop = 9;
-				$orderThird = app()->make(UserThirdRepository::class);
-				//预估养老金
-				$orderThird->yuguOrder(
-					$huafeiInfo['order_pdd_id'],
-					$huafeiInfo['commission'],
-					$huafeiInfo['uid'],
-					$huafeiInfo['order_sn'],
-					$type_shop,
-					'order_huafei');
-				//预估积分
-				$orderThird->yuguJifen(
-					$huafeiInfo['commission'] ,
-					$huafeiInfo['uid'],
-					$huafeiInfo['order_sn'],
-					$type_shop
-				);	
-				//复购金
-				$orderThird->yuguFugou(
-					$huafeiInfo['commission'] ,
-					$huafeiInfo['uid'],
-					$huafeiInfo['order_sn'],
-					$type_shop
-				);	
+		try{
+			$param = $this->request->param();
+			Db::name('log')->insert(['data'=>'话费充值回调数据'.json_encode($param)]);
+	
+			$order_no = $param['order_no'];
+			$order_number = $param['order_number'];
+	
+			$huafeiInfo = Db::name('order_huafei')->where("order_sn", $order_no)->find();
+			if(!$huafeiInfo){
+				return 'error';
 			}
-
-			echo 'success';exit;
-		}else{
-			Db::name('log')->insert(['data'=>'话费充值回调数据处理失败']);
-			echo 'error';exit;
+	
+			$updateData = [
+				'amount_price' => $param['amount'],
+				'fanli_price' => $param['fanli'],
+				'cost_price' => $param['cost_price'],
+				'arrived_amount'=> $param['arrived_amount'],
+				'status' => $param['status'],
+				'modify_time' => date('Y-m-d H:i:s'),
+			];
+			$ret = Db::name("order_huafei")->where("order_sn", $order_no)->update($updateData);
+			if($ret){
+				if($param['status'] == 2) {
+					//判断数据库有无此订单
+					$type_shop = 9;
+					$orderThird = app()->make(UserThirdRepository::class);
+					//预估养老金
+					$orderThird->yuguOrder(
+						$huafeiInfo['order_pdd_id'],
+						$huafeiInfo['commission'],
+						$huafeiInfo['uid'],
+						$huafeiInfo['order_sn'],
+						$type_shop,
+						'order_huafei');
+					//预估积分
+					$orderThird->yuguJifen(
+						$huafeiInfo['commission'] ,
+						$huafeiInfo['uid'],
+						$huafeiInfo['order_sn'],
+						$type_shop
+					);	
+					//复购金
+					$orderThird->yuguFugou(
+						$huafeiInfo['commission'] ,
+						$huafeiInfo['uid'],
+						$huafeiInfo['order_sn'],
+						$type_shop
+					);	
+				}
+	
+				echo 'success';
+				return;
+			}else{
+				Db::name('log')->insert(['data'=>'话费充值回调数据处理失败']);
+				echo 'error';
+				return;
+			}
+		}catch (\Exception $e) {
+			Db::name('log')->insert(['data'=>'充值话费回调错误：'.$e->getFile().'：'.$e->getLine().'【'.$e->getMessage().'】']);
+			return app('json')->fail('充值话费回调错误：'.$e->getFile().'：'.$e->getLine().'【'.$e->getMessage().'】');
 		}
 	}
 
@@ -105,14 +114,20 @@ class Huafei extends BaseController
 		}
 
 		return app('json')->success('获取话费面额成功', $data);
-	}
+	}	
 
 
 	//充值话费推送补发
 	public function bufa(){
-		$order_no = $this->request->param('order_no');
-		$order_data = Db::name('order_huafei_hf') -> where('order_no', $order_no)->find();
-		return $this->pushHf($order_data['uid'], $order_data['order_no'], $order_data['mobile'], $order_data['pay_price']);
+		try{
+			$order_no = $this->request->param('order_no');
+			$order_data = Db::name('order_huafei_hf') -> where('order_no', $order_no)->find();
+			$RES = $this->pushHf($order_data['uid'], $order_data['order_no'], $order_data['mobile'], $order_data['pay_price']);
+			return app('json')->success('充值话费推送补发成功', $RES);
+		}catch (\Exception $e) {
+			Db::name('log')->insert(['data'=>'充值话费推送补发错误：'.$e->getFile().'：'.$e->getLine().'【'.$e->getMessage().'】']);
+			return app('json')->fail('充值话费推送补发错误：'.$e->getFile().'：'.$e->getLine().'【'.$e->getMessage().'】');
+		}
 	}
 
 
@@ -134,7 +149,7 @@ class Huafei extends BaseController
 				'order_no' => $order_sn,
 				'pay_price' => $params['money'],
 				'status' => 0,
-				'create_time' => time(),
+				'create_time'=> date('Y-m-d H:i:s'),
 			];
 			$oid = Db::name('order_huafei_hf')->insertGetId($insertdata);
 			if($oid){
@@ -143,7 +158,7 @@ class Huafei extends BaseController
 				return app('json')->fail('创建话费充值预支付订单失败');
 			}
 		}else{
-			return app('json')->fail($verify['msg']);
+			return app('json')->fail($verify['msg'].'MSG');
 		}
     }
 
@@ -152,11 +167,10 @@ class Huafei extends BaseController
 	public function pushHf($uid, $order_sn, $phone, $money){
 		//推送订单
 		$push = $this->pushOrder($order_sn, $phone, $money);
+		Db::name('log')->insert(['data'=>'话费充值推送订单返回数据'.json_encode($push)]);
 		if($push['code'] == '0000'){
-
 			$commissionMoney = $money*0.04;
-
-			//入库记录
+			//成功入库记录
 			$insertdata = [
 				'uid'=> $uid,
 				'mobile' => $phone,
@@ -168,15 +182,34 @@ class Huafei extends BaseController
 				'fanli_price' => $push['data']['fanli'],
 				'cost_price' => $push['data']['cost_price'],
 				'pay_money' => $money,
-				'status' => 0,
-				'create_time' => time(),
-				'finish_time' => time(),
-				'modify_time' => time(),
+				'status' => 1,
+				'create_time' => date('Y-m-d H:i:s'),
+				'finish_time' => date('Y-m-d H:i:s'),
+				'modify_time' => date('Y-m-d H:i:s'),
 			];
 			Db::name('order_huafei')->insert($insertdata);
 			return $push;
 		}else{
-			return false;
+			$commissionMoney = $money*0.04;
+			//失败入库记录
+			$insertdata = [
+				'uid'=> $uid,
+				'mobile' => $phone,
+				'commission'=> $commissionMoney,
+				'commission_share'=> 0.04,
+				'order_number' => '',
+				'order_sn' => $order_sn,
+				'amount_price' => $money,
+				'fanli_price' => 0,
+				'cost_price' => 0,
+				'pay_money' => $money,
+				'status' => 3,
+				'create_time' => date('Y-m-d H:i:s'),
+				'finish_time' => date('Y-m-d H:i:s'),
+				'modify_time' => date('Y-m-d H:i:s'),
+			];
+			Db::name('order_huafei')->insert($insertdata);
+			return $push;
 		}
 	}
 
@@ -191,8 +224,6 @@ class Huafei extends BaseController
 		$query = Db::name("order_huafei");
         $count = $query->where($where)->count();
         $list = $query->page($page, $limit)->where($where)->select()->each(function ($item){
-			$item['create_time'] = date("Y-m-d H:i:s", $item['create_time']);
-            $item['status'] = (int)$item['status'];
             return $item;
         });
 		return app('json')->success('获取话费充值记录成功', ['list'=>$list, 'count'=>$count]);
@@ -216,7 +247,7 @@ class Huafei extends BaseController
 		$request['mobile'] = $phone;
 		$request['money'] = $money;
 		$request['recharge_type'] = 1;
-		$request['notify_url'] = 'https://api.gdjbp.com//api/huafei/notify';
+		$request['notify_url'] = 'https://api.gdjbp.com/api/huafei/notify';
 		return $this->execute('/rest/Recharge/PushOrder', $request);
 	}
 

route/api.php

@@ -1046,9 +1046,9 @@ Route::group('api/', function () {
 
     //话费充值补发
     Route::post('huafei/bufa', 'api.store.service.Huafei/bufa');
-
+    
     //话费充值回调通知
-    Route::get('huafei/notify', 'api.store.service.Huafei/notify');
+    Route::post('huafei/notify', 'api.store.service.Huafei/notify');