update 团长分销-奖励结算脚本

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]['colonel_distributor_pay_info_id'] = $ids[$key];
+            $data[$key]['only_pay_info_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['colonel_distributor_pay_info_id'],
+                'third_order_id'      => $payInfo['only_pay_info_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['colonel_distributor_pay_info_id'],
+                'third_order_id'      => $payInfo['only_pay_info_id'],
                 'third_order_id_type' => $payInfo['type'],
                 'third_order_desc'    => self::getThirdOrderDesc($payInfo),
             ];
@@ -133,7 +133,7 @@ class ColonelwalletController extends Job
         // TODO 此处看后期业务发展 看是否需要封装WalletSdk
         $date = date('Y-m-d H:i:s');
         return [
-            'transfer_service_id' => '', //TODO
+            'transfer_service_id' => appConfig('colonel.wallet.transfer_service_id'),
             'sign'                => self::getWalletHttpSign($date),
             'time'                => $date
         ];
@@ -148,8 +148,7 @@ class ColonelwalletController extends Job
      */
     private function getWalletHttpSign($date): string
     {
-        $transfer_service_secret = ''; //TODO
-        return md5($date . $transfer_service_secret);
+        return md5($date . appConfig('colonel.wallet.transfer_service_secret'));
     }
 
     /**

conf/cli.ini

@@ -13,4 +13,8 @@ idgen.key = "5cfdb867e96374c7883b31d6928cc4cb"
 [prod : common]
 [perf : common ]
 [test: common ]
-[dev : common ]
+colonel.wallet.transfer_service_id="21090614423333205002"
\ No newline at end of file
+colonel.wallet.transfer_service_secret="4916927cf3305292f5a524db592dfa95"
+[dev : common ]
+colonel.wallet.transfer_service_id="21090614322322205004"
+colonel.wallet.transfer_service_secret="e24126c53d4507381ff800a6653611e4"
\ No newline at end of file