feature/EK-3320

backendApi/modules/v1/controllers/ShopController.php

@@ -835,12 +835,17 @@ class ShopController extends BaseController {
         $filter['params'] = [':SN' => $orderSn];
 
         // 生成发票编号
-        $order = Order::find()->where(['SN' => $orderSn])->asArray()->one();
+        $order = Order::find()
+            ->alias('O')
+            ->select('O.*,CS.NAME AS COUNTRY')
+            ->where(['SN' => $orderSn])
+            ->join('LEFT JOIN', Countries::tableName() . ' AS CS', 'CS.ID=O.COUNTRY_ID')
+            ->asArray()->one();
         if (!$order) {
             return static::notice('订单不存在', 400);
         }
         if (!$order['INVOICE_NO']) {
-            $invoiceNo = $this->generateInvoiceNo();
+            $invoiceNo = $this->generateInvoiceNo($order['COUNTRY']);
             Order::updateAll(['INVOICE_NO' => $invoiceNo], 'SN = :SN', [':SN' => $orderSn]);
         }
 
@@ -1151,9 +1156,9 @@ class ShopController extends BaseController {
         return static::notice('成功. ' . json_encode($orderErr));
     }
 
-    public function generateInvoiceNo()
+    public function generateInvoiceNo($country_code = '')
     {
-        $prefix = 'Inv';
+        $prefix = 'Inv'.$country_code;
         $currentDate = date('dmY');
         
         // 查询今天生成的最新发票号（包含当天日期格式的）

common/models/Order.php

@@ -59,6 +59,7 @@ use Yii;
  * @property int AUTO_MAINTENANCE AMP订单
  * @property string INVOICE_REMARK 发票备注
  * @property string INVOICE_NO 发票号
+ * @property string METHOD 支付方式
  */
 class Order extends \common\components\ActiveRecord
 {