Browse Source

feat: 支付回调

xiansin 2 years ago
parent
commit
f9add27511

+ 2 - 2
server/app/Helper/ByteDance.php

xqd xqd
@@ -129,7 +129,7 @@ class ByteDance extends BaseUniPlatform
         return sha1(trim(implode('', $filtered)));
     }
 
-    public function pushOrder($openid, $orderId, $goods)
+    public function pushOrder($openid, $orderId, $goods, $status)
     {
         $data = [
             'access_token' => $this->accessToken,
@@ -138,7 +138,7 @@ class ByteDance extends BaseUniPlatform
             'order_detail' => [
                 'order_id'    => $orderId,
                 'create_time' => (int)Carbon::now()->getPreciseTimestamp(3),
-                'status'      => '已支付',
+                'status'      => $status, // 已支付 待支付
                 'amount'      => 1,
                 'total_price' => '',
                 'detail_url'  => 'pages/my/consume',

+ 4 - 1
server/app/Http/Controllers/V1/PayNoticeController.php

xqd xqd xqd
@@ -12,6 +12,7 @@ use App\Models\UserInfo;
 use App\Models\UserRechargeRecord;
 use App\Models\UserVipRecord;
 use Carbon\Carbon;
+use Illuminate\Support\Facades\Log;
 
 class PayNoticeController extends Controller
 {
@@ -43,11 +44,12 @@ class PayNoticeController extends Controller
                 if(isset($goods)){
                     /* @var Pay $payInfo*/
                     $payInfo = Pay::with(['user'])->where('id', $payId)->first($payId);
-                    $factory->pushOrder($payInfo->user->open_id, $payId, $goods);
+                    $factory->pushOrder($payInfo->user->open_id, $payId, $goods ,'已支付');
                 }
                 \DB::commit();
             } catch (\Exception $e) {
                 \DB::rollBack();
+                \Log::error('抖音支付回调错误==>'.$e->getMessage());
                 return $fail('通信失败,请稍后再通知我');
             }
             return true;
@@ -88,6 +90,7 @@ class PayNoticeController extends Controller
                 \DB::commit();
             } catch (\Exception $e) {
                 \DB::rollBack();
+                \Log::error('快手支付回调错误==>'.$e->getMessage());
                 return $fail('通信失败,请稍后再通知我');
             }
             return true;

+ 9 - 0
server/app/Http/Controllers/V1/User/RechargeController.php

xqd
@@ -74,6 +74,15 @@ class RechargeController extends Controller
                 $recharge->status = 0;
                 $recharge->save();
 
+                $factory = $this->getUniFactory();
+                $goods = [
+                    'id' => $combo->id,
+                    'title' => $combo->name,
+                    'price' => $combo->price
+                ];
+                /* @var Pay $payInfo*/
+                $payInfo = Pay::with(['user'])->where('id', $res['pay_id'])->first($res['pay_id']);
+                $factory->pushOrder($payInfo->user->open_id, $res['pay_id'], $goods ,'已支付');
             }
 
             \DB::commit();

+ 10 - 0
server/app/Http/Controllers/V1/User/VipController.php

xqd
@@ -64,6 +64,16 @@ class VipController extends Controller
                 $recharge->status = 0;
                 $recharge->save();
 
+                // 同步订单
+                $factory = $this->getUniFactory();
+                $goods = [
+                    'id' => $combo->id,
+                    'title' => $combo->name,
+                    'price' => $combo->price
+                ];
+                /* @var Pay $payInfo*/
+                $payInfo = Pay::with(['user'])->where('id', $res['pay_id'])->first($res['pay_id']);
+                $factory->pushOrder($payInfo->user->open_id, $res['pay_id'], $goods ,'已支付');
             }
             \DB::commit();
             return $this->success($res);