修复打赏接口

manage-server/app/Http/Controllers/PaymentController.php

@@ -13,19 +13,15 @@ class PaymentController extends Controller
      * @param Request $request
      * @return \Illuminate\Http\JsonResponse
      */
-    public function buildOrder(Request $request, $order_id = null, $order_type = null)
+    public function buildOrder(Request $request)
     {
 
         $wechat_id = $request->header("openid");
         if (!$wechat_id) {
             $wechat_id = $request->input("openid");
         }
-        if (!$order_id) {
-            $order_id = $request->input("order_id");
-        }
-        if (!$order_type) {
-            $order_type = $request->input("order_type");
-        }
+        $order_id = $request->input("order_id");
+        $order_type = $request->input("order_type");
         $order = CommonController::getRecord($order_type, $order_id);
 
         // 先判断微信交易是否失效，失效的话需要重新生成份新的系统内部订单，再重新统一下单

manage-server/app/Http/Controllers/RewardController.php

@@ -19,7 +19,54 @@ class RewardController extends Controller
             $reward->price = $price;
             $reward->wechat_id = $wechat_id;
             $reward->save();
-            return redirect()->action('PaymentController@buildOrder', ["order_id" => $reward->id, "order_type" => "reward"]);
+
+            $order = CommonController::getRecord($order_type, $reward->id);
+
+            // 先判断微信交易是否失效，失效的话需要重新生成份新的系统内部订单，再重新统一下单
+            if ($wechat_id && $order) {
+                // 判断微信交易是否失效
+                if(Carbon::now()->subHour()->gt($order->created_at)) {
+                    $order_new = clone $order;
+                    $order_new->id = null;
+                    $order_new->exists = false;
+                    $order_new->save();
+                    $order->delete();
+                    $order_id = $order_new->id;
+                }
+
+
+                $out_trade_no = $order_type . "-" . $order_id;
+                $app = app('wechat.payment');
+
+                $result = $app->order->unify([
+                    'body' => '玥子轩家政',
+                    'out_trade_no' => $out_trade_no,
+                    'total_fee' => $order->price * 100,
+                    'trade_type' => 'JSAPI',
+                    'openid' => $wechat_id,
+                    'notify_url' => 'https://wechat.sotype.com/api/payments/wechat-notify',
+                    'time_expire' => Carbon::now()->addHour()->format('YmdHis')
+                ]);
+
+                if ($result['return_code'] == 'SUCCESS' && $result['result_code'] == 'SUCCESS') {
+                    //第二次签名
+                    //$result = $app->jssdk->appConfig($result['prepay_id']);
+                    //$config = $app->configForAppPayment($result['prepay_id']);
+                    $config = $app->jssdk->sdkConfig($result['prepay_id']);
+                    return response()->json([
+                        "status" => 0,
+                        "code" => "success",
+                        "msg" => $config,
+                        "out_trade_no" => $out_trade_no
+                    ]);
+                } else {
+                    return response()->json([
+                        "status" => -1,
+                        "message" => '微信支付签名失败:' . var_export($result, 1)
+                    ]);
+                }
+
+            }
         }
     }
 }