Browse Source

Merge branch 'order' into test

zqwang 1 year ago
parent
commit
695c5db659

+ 1 - 1
modules/Channel/Services/Order/OrderService.php

@@ -26,7 +26,7 @@ class OrderService
      */
     public static function getOrderList(array $param, $isAll = false)
     {
-        $list = self::getOrderQuerySql($param);
+        $list = self::getOrderQuerySql($param)->orderBy("orders.id",'desc');
 
         if ($isAll) {
             $list = $list->get();

+ 1 - 1
modules/Jiesuan/Services/VerifyService.php

@@ -23,7 +23,7 @@ class VerifyService extends BaseService
     public static function verifyList(array $param = [], $isAll = false)
     {
         $list = self::QuerySql($param);
-        $list->select('bank_cards.id', 'bank_cards.owner_name', 'bank_cards.name_of_payee', 'bank_cards.status', 'bank_cards.card_no', 'bank_cards.bank_name', 'bank_cards.phone_of_payee', 'bank_cards.bank_name', 'bank_cards.remark', 'bank_cards.created_at', 'bank_cards.checked_at', 'bank_cards.company_uid', 'users.username as business_name');
+        $list->orderBy("bank_cards.id",'desc')->select('bank_cards.id', 'bank_cards.owner_name', 'bank_cards.name_of_payee', 'bank_cards.status', 'bank_cards.card_no', 'bank_cards.bank_name', 'bank_cards.phone_of_payee', 'bank_cards.bank_name', 'bank_cards.remark', 'bank_cards.created_at', 'bank_cards.checked_at', 'bank_cards.company_uid', 'users.username as business_name');
         if ($isAll) {
             $list = $list->get();
         } else {

File diff suppressed because it is too large
+ 1 - 1
modules/OrderRefund/Services/RefundOrderService.php