feature/EK-3320

backendApi/modules/v1/controllers/ShopController.php

@@ -837,7 +837,7 @@ class ShopController extends BaseController {
         // 生成发票编号
         $order = Order::find()
             ->alias('O')
-            ->select('O.*,CS.NAME AS COUNTRY')
+            ->select('O.*,CS.CODE AS COUNTRY_CODE')
             ->where(['SN' => $orderSn])
             ->join('LEFT JOIN', Countries::tableName() . ' AS CS', 'CS.ID=O.COUNTRY_ID')
             ->asArray()->one();
@@ -845,7 +845,7 @@ class ShopController extends BaseController {
             return static::notice('订单不存在', 400);
         }
         if (!$order['INVOICE_NO']) {
-            $invoiceNo = $this->generateInvoiceNo($order['COUNTRY']);
+            $invoiceNo = $this->generateInvoiceNo($order['COUNTRY_CODE']);
             Order::updateAll(['INVOICE_NO' => $invoiceNo], 'SN = :SN', [':SN' => $orderSn]);
         }