Merge branch 'dev'

2025-05-18 13:19:36 +08:00 · 2025-05-18 13:19:36 +08:00 · ea6b9de9fd
commit ea6b9de9fd
parent 9c42eb1432 229cdff389
1 changed files with 5 additions and 1 deletions
--- a/app/admin/controller/Order.php
+++ b/app/admin/controller/Order.php
@ -1090,7 +1090,11 @@ class Order extends Base
                $pay_type_text = '支付宝';
                break;
            default:
-                $pay_type_text = '微信支付';
+                if ($item['price'] > 0) {
+                    $pay_type_text = '微信支付';
+                } else {
+                    $pay_type_text = '货币支付';
+                }
        }

        if ($isExport) {