Merge branch 'colonel' into test

application/modules/Job/controllers/Colonelwallet.php

@@ -122,7 +122,7 @@ class ColonelwalletController extends Job
                 'user_id'             => $payInfo['colonel_user_id'],
                 'amount'              => $payInfo['reward'],
                 'third_order_id'      => $payInfo['pay_info_trade_id'],
-                'third_order_id_type' => $payInfo['type'],
+                'third_order_id_type' => $thirdOrderInfo['type'],
                 'third_order_desc'    => $thirdOrderInfo['desc'],
             ];
         }