From 3304bb8630ed2b4fad2e913d789c58fd143785ad Mon Sep 17 00:00:00 2001 From: yanzai Date: Fri, 18 Oct 2024 14:27:31 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=AF=E5=88=86=E9=A2=84=E5=AD=98=E6=AC=BE?= =?UTF-8?q?=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/API/AspNetZhuanController.php | 4 ++-- .../Controllers/API/H5/OrderController.php | 4 ++-- .../Http/Controllers/API/H5/PayController.php | 24 +++++++++++++++++++ 3 files changed, 28 insertions(+), 4 deletions(-) diff --git a/Laravel/app/Http/Controllers/API/AspNetZhuanController.php b/Laravel/app/Http/Controllers/API/AspNetZhuanController.php index 77c3b46..745047f 100644 --- a/Laravel/app/Http/Controllers/API/AspNetZhuanController.php +++ b/Laravel/app/Http/Controllers/API/AspNetZhuanController.php @@ -32,9 +32,9 @@ class AspNetZhuanController extends Controller return true; } //使用预存款 - public static function UseYuCunKuan($hzid,$yucunkuan,$yyid,$yucunkuanleixing,$caozuorenid,$caozuorenmigncheng,$beizhu,$dingdanshijian) + public static function UseYuCunKuan($ghzid,$yucunkuan,$yyid,$yucunkuanleixing,$caozuorenid,$caozuorenmigncheng,$beizhu,$dingdanshijian) { - $res = self::Get(self::$JF_BaseUrl . '?type=5' . '&hzid=' . $hzid. '&yucunkuan=' . $yucunkuan.'&yyid='.$yyid.'&yucunkuanleixing='.$yucunkuanleixing.'&caozuorenid='.$caozuorenid.'&caozuorenmigncheng='.urlencode($caozuorenmigncheng).'&beizhu='.urlencode($beizhu).'&dingdanshijian='.urlencode($dingdanshijian)); + $res = self::Get(self::$JF_BaseUrl . '?type=5' . '&ghzid=' . $ghzid. '&yucunkuan=' . $yucunkuan.'&yyid='.$yyid.'&yucunkuanleixing='.$yucunkuanleixing.'&caozuorenid='.$caozuorenid.'&caozuorenmigncheng='.urlencode($caozuorenmigncheng).'&beizhu='.urlencode($beizhu).'&dingdanshijian='.urlencode($dingdanshijian)); return true; } diff --git a/Laravel/app/Http/Controllers/API/H5/OrderController.php b/Laravel/app/Http/Controllers/API/H5/OrderController.php index 9a9c12a..8298d42 100644 --- a/Laravel/app/Http/Controllers/API/H5/OrderController.php +++ b/Laravel/app/Http/Controllers/API/H5/OrderController.php @@ -309,7 +309,7 @@ class OrderController extends Controller if($jifen>$all_jifen) return \Yz::echoError1("用户剩余积分不足"); } if($yucunkuan>0) { - return \Yz::echoError1("暂不支持预存款"); + // return \Yz::echoError1("暂不支持预存款"); $all_yucunkuan= $AspNet::GetJiFen_YuCunKuan(2,$person->ghzid); if($yucunkuan>$all_yucunkuan) return \Yz::echoError1("用户剩余预存款不足"); } @@ -371,7 +371,7 @@ class OrderController extends Controller } if($yucunkuan>0) { $yucunkuan_dikou_status=false; - // $yucunkuan_dikou_status= $AspNet::UseYuCunKuan(); + $yucunkuan_dikou_status= $AspNet::UseYuCunKuan($person->ghzid,-$yucunkuan,$yyid,0,$insert,'tj_h5','抵扣体检H5订单',$now_datetime); } } diff --git a/Laravel/app/Http/Controllers/API/H5/PayController.php b/Laravel/app/Http/Controllers/API/H5/PayController.php index c815a34..43aa931 100644 --- a/Laravel/app/Http/Controllers/API/H5/PayController.php +++ b/Laravel/app/Http/Controllers/API/H5/PayController.php @@ -2,6 +2,7 @@ namespace App\Http\Controllers\API\H5; +use App\Http\Controllers\API\AspNetZhuanController; use App\Http\Controllers\API\XCXApiController; use App\Http\Controllers\Controller; use Illuminate\Http\Request; @@ -109,6 +110,8 @@ class PayController extends Controller if (!$orderInfo) return \Yz::echoError1("未找到有效订单"); if ($orderInfo->status !== 2) return \Yz::echoError1("订单状态异常。当前状态:" . $orderInfo->status); if ($orderInfo->check_status == 2) return \Yz::echoError1("已登记体检,禁止退款"); + $person=DB::table('web_user_person')->where(['id' => $orderInfo->person_id])->first(); + if(!$person) return \Yz::echoError1("用户不存在"); //调用思信取消,恢复号源 $ap = new OrderController(); $cancel = $ap->cancel_appointment($orderInfo->hospital_id, [ @@ -130,6 +133,27 @@ class PayController extends Controller return \Yz::echoError1("退款失败" . $res['data']['refund_state']); } } + + + $now_datetime=date('Y-m-d H:i:s'); + //调用接口恢复积分和预存款 + $env=config('app.globals.Env'); + $AspNet=new AspNetZhuanController(); + $jifen_huifu_status=true; + $yucunkuan_huifu_status=true; + $yyid=$orderInfo->hospital_id; + if($yyid==1) $yyid=6; + if($env=='pro') { //如果是正式环境 + if($orderInfo->jifen>0) { + $jifen_huifu_status=false; + $jifen_huifu_status= $AspNet::UseJiFen($person->ghzid,$orderInfo->jifen,$yyid,$orderInfo->id,'tj_h5','抵扣体检H5订单',$now_datetime); + } + if($orderInfo->yucunkuan>0) { + $yucunkuan_huifu_status=false; + $yucunkuan_huifu_status= $AspNet::UseYuCunKuan($person->ghzid,$orderInfo->yucunkuan,$yyid,0,$orderInfo->id,'tj_h5','抵扣体检H5订单',$now_datetime); + } + } + DB::table('orders')->where(['id' => $id])->update([ 'status' => 5 ]);