Merge branch 'colonel' into develop

application/modules/Job/controllers/Colonelorder.php

@@ -227,7 +227,7 @@ class ColonelorderController extends Job
         ]);
         $ids = $res['id_datetime']['goods'] ?? [];
         foreach ($data as $key => $item) {
-            $data[$key]['only_pay_info_id'] = $ids[$key];
+            $data[$key]['pay_info_trade_id'] = $ids[$key];
         }
         return $data;
     }

application/modules/Job/controllers/Colonelwallet.php

@@ -63,7 +63,7 @@ class ColonelwalletController extends Job
                 'user_id'             => $payInfo['colonel_user_id'],
                 'service_name'        => self::WALLET_SERVICE_NAME,
                 'source_name'         => self::WALLET_SOURCE_NAME,
-                'third_order_id'      => $payInfo['only_pay_info_id'],
+                'third_order_id'      => $payInfo['pay_info_trade_id'],
                 'third_order_id_type' => $payInfo['type'],
                 'third_order_desc'    => self::getThirdOrderDesc($payInfo),
                 'amount'              => $payInfo['reward'],
@@ -105,7 +105,7 @@ class ColonelwalletController extends Job
                 'op'                  => self::CAPITAL_POOL_OP,
                 'user_id'             => $payInfo['colonel_user_id'],
                 'amount'              => $payInfo['reward'],
-                'third_order_id'      => $payInfo['only_pay_info_id'],
+                'third_order_id'      => $payInfo['pay_info_trade_id'],
                 'third_order_id_type' => $payInfo['type'],
                 'third_order_desc'    => self::getThirdOrderDesc($payInfo),
             ];