Merge branch 'colonel' into develop

application/modules/Cli/controllers/Colonelorder.php

@@ -189,7 +189,7 @@ class ColonelorderController extends Cli
             [
                 "colonel_user_id" => $colonelUserIds,
                 "date[>=]" => $startTime,
-                "date[<=]" => $endTime,
+                "date[<]" => $endTime,
             ],
             []
         );

application/modules/Cli/controllers/Colonelwallet.php

@@ -20,7 +20,7 @@ class ColonelwalletController extends Cli
         if (!empty($payInfoList)) {
             if ($this->deductingInventory($payInfoList)) {
                 if ($this->toWallet($payInfoList)) {
-                    $this->handlePayInfoStatus(array_column($payInfoList, 'colonel_distributor_pay_info_id'));
+                    $this->handlePayInfoStatus(array_column($payInfoList, 'pay_info_id'));
                 }
             }
         }
@@ -133,6 +133,6 @@ class ColonelwalletController extends Cli
      */
     public function handlePayInfoStatus(array $payInfoIds)
     {
-        return ColonelDistributorPayInfo::updateRecord(['status' => ColonelDistributorPayInfo::STATUS_USE], ['id' => $payInfoIds]);
+        return ColonelDistributorPayInfo::updateRecord(['status' => ColonelDistributorPayInfo::STATUS_USE], ['pay_info_id' => $payInfoIds]);
     }
 }