lizhen_gitee 3 months ago
parent
commit
81fd6efbea

+ 1 - 0
addons/shopro/controller/order/Aftersale.php

@@ -173,6 +173,7 @@ class Aftersale extends Common
             $aftersale->refund_fee = 0;
             $aftersale->reason = $reason;
             $aftersale->content = $content;
+            $aftersale->express_status = 'noinfo';
 
 
 

+ 5 - 1
application/admin/model/shopro/order/Aftersale.php

@@ -259,8 +259,12 @@ class Aftersale extends Common
         return isset($list[$value]) ? $list[$value] : '';
     }
 
-    
+    public function getExpressStatusTextAttr($value, $data){
+        $value = $value ?: ($data['express_status'] ?? null);
 
+        $list = $this->expressStatusList();
+        return isset($list[$value]) ? $list[$value] : '';
+    }
 
     public function getRefundStatusTextAttr($value, $data)
     {

+ 2 - 1
application/common/library/Auth.php

@@ -403,7 +403,8 @@ class Auth
 
         $userinfo['avatar'] = localpath_to_netpath($userinfo['avatar']);
         $userinfo['chat_id'] = im_prefix($userinfo['id']);
-        $userinfo['balance'] = (new Wallet())->getWallet($userinfo['id'],'money');
+//        $userinfo['balance'] = (new Wallet())->getWallet($userinfo['id'],'money');
+        $userinfo['balance'] = $this->auth->money;
         return $userinfo;
     }