Jelajahi Sumber

Merge branch 'master' of http://39.98.194.76:3000/txct/wanyue_app

gorden 1 hari lalu
induk
melakukan
043c8411d4
1 mengubah file dengan 4 tambahan dan 4 penghapusan
  1. 4 4
      app/admin/controller/order/WholeController.php

+ 4 - 4
app/admin/controller/order/WholeController.php

@@ -5058,10 +5058,10 @@ class WholeController extends Curd
             Db::beginTransaction();
             $payStatus = 'N';
             if (in_array('WXPAY', $payDetailType)) {
-//                $result = Pay::wechat(config('payment.wxpay'))->find($groupId, 'pos');
-//                $result = json_decode(json_encode($result), true);
-                $result = '{"return_code":"SUCCESS","return_msg":"OK","result_code":"SUCCESS","mch_id":"1680393367","appid":"wxc6274da7198e3eb4","openid":"o3JAn6Ii_bAlxS-jbNEC4WnPhdwM","is_subscribe":"N","trade_type":"MICROPAY","trade_state":"SUCCESS","bank_type":"OTHERS","total_fee":"1000","fee_type":"CNY","cash_fee":"1000","cash_fee_type":"CNY","transaction_id":"4200067718202409250802875650","out_trade_no":"OD24092518408RV7","attach":[],"time_end":"20240925184009","trade_state_desc":"支付成功","nonce_str":"OeGOkjch4eaV5qIt","sign":"6DCB3BFC594EBC018A2BEE2C3DFEA4E3"}';
-                $result = json_decode($result, true);
+               $result = Pay::wechat(config('payment.wxpay'))->find($groupId, 'pos');
+               $result = json_decode(json_encode($result), true);
+                // $result = '{"return_code":"SUCCESS","return_msg":"OK","result_code":"SUCCESS","mch_id":"1680393367","appid":"wxc6274da7198e3eb4","openid":"o3JAn6Ii_bAlxS-jbNEC4WnPhdwM","is_subscribe":"N","trade_type":"MICROPAY","trade_state":"SUCCESS","bank_type":"OTHERS","total_fee":"1000","fee_type":"CNY","cash_fee":"1000","cash_fee_type":"CNY","transaction_id":"4200067718202409250802875650","out_trade_no":"OD24092518408RV7","attach":[],"time_end":"20240925184009","trade_state_desc":"支付成功","nonce_str":"OeGOkjch4eaV5qIt","sign":"6DCB3BFC594EBC018A2BEE2C3DFEA4E3"}';
+                // $result = json_decode($result, true);
                 if (!empty($result['return_code']) && $result['return_code'] == 'SUCCESS' && !empty($result['result_code']) && $result['result_code'] == 'SUCCESS' && !empty($result['trade_state']) && $result['trade_state'] == 'SUCCESS') {
                     $payStatus = 'Y';
                     foreach ($orders as $order) {