Создание чеков с seller_id

diff --git a/erp24/api2/controllers/DataController.php b/erp24/api2/controllers/DataController.php
index 80694a710f457e79d8d04de332b13cc00c9e626c..ee31ffa44e9ab232328fef004247904de7fa703d 100644 (file)
--- a/erp24/api2/controllers/DataController.php
+++ b/erp24/api2/controllers/DataController.php
@@ -2286,7 +2286,7 @@ class DataController extends BaseController
                 foreach ($result["marketplace_orders"] as $mpOrder) {
                     $marketplaceOrder = MarketplaceOrders::findOne(['guid' => $mpOrder['id']]);
                     if ($marketplaceOrder) {
-                        $marketplaceOrder->seller_id = $mpOrder['id'] ?? null;
+                        $marketplaceOrder->seller_id = $mpOrder['seller_id'] ?? null;
                         $marketplaceOrder->number_1c = $mpOrder['number'] ?? null;
                         $marketplaceOrder->save();
                         if ($marketplaceOrder->getErrors()) {

diff --git a/erp24/records/MarketplaceOrders.php b/erp24/records/MarketplaceOrders.php
index f2b00fd454249498ef63f7b3a80f0cddc2997aa9..18e5524b71c1eae50661f057d52d653558560446 100644 (file)
--- a/erp24/records/MarketplaceOrders.php
+++ b/erp24/records/MarketplaceOrders.php
@@ -34,6 +34,7 @@ use yii\db\Expression;
  * @property int|null $marketplace_id ID маркетплейса: 1 - Flowwow, 2 - YandexMarket
  * @property string $error_text
  * @property string|null $number_1c Название документа в 1с
+ * @property string|null $seller_id ID продавца
  * @property string|null $telegram_error ошибка телеграмма
  * @property string|null $status_processing_1c Статус обработки заказа в 1С
  * @property string|null $order_link Ссылка на заказ в МП
@@ -107,7 +108,7 @@ class MarketplaceOrders extends \yii\db\ActiveRecord
             [['creation_date', 'updated_at', 'returned_at'], 'safe'],
             [['return_data', 'raw_data', 'marketplace_name', 'telegram_error', 'order_link', 'delivery_to', 'order_photo', 'manager_link'], 'string'],
             [['total', 'delivery_total', 'buyer_total_before_discount'], 'number'],
-            [['marketplace_order_id'], 'string', 'max' => 64],
+            [['marketplace_order_id', 'seller_id'], 'string', 'max' => 64],
             [['number_1c'], 'string', 'max' => 100],
             [['warehouse_guid', 'guid'], 'string', 'max' => 36],
             [['tax_system', 'payment_type', 'payment_method'], 'string', 'max' => 32],
@@ -146,6 +147,7 @@ class MarketplaceOrders extends \yii\db\ActiveRecord
             'marketplace_id' => 'ID маркетплейса: 1 - Flowwow, 2 - YandexMarket',
             'error_text' => 'Ошибка',
             'number_1c' => 'Номер документа в 1с',
+            'seller_id' => 'ID продавца',
             'status_telegram' => 'Статус отправки в телеграм',
             'telegram_error' => 'Ошибка телеграмма',
             'status_processing_1c' => 'Статус обработки заказа в 1С',

diff --git a/erp24/services/MarketplaceService.php b/erp24/services/MarketplaceService.php
index ef4f2cfdc0c9fa8e38a98c2a71d0fff9d3e1ac70..6f5d3f511f33224a6825173edf81cc2e81d97127 100644 (file)
--- a/erp24/services/MarketplaceService.php
+++ b/erp24/services/MarketplaceService.php
@@ -2441,10 +2441,11 @@ class MarketplaceService
         $existingCheck = CreateChecks::find()
             ->where(['marketplace_order_id' => $marketplaceOrder->marketplace_order_id])
             ->exists();
-
-        if (!$existingCheck) {
+        Yii::warning(json_encode($marketplaceOrder->marketplace_order_id, JSON_UNESCAPED_UNICODE));
+        if (!$existingCheck && !empty($marketplaceOrder->seller_id)) {
+            Yii::warning(json_encode($marketplaceOrder->seller_id, JSON_UNESCAPED_UNICODE));
             $createChecks = new CreateChecks;
-            $createChecks->order_guid = '';
+            $createChecks->order_guid = $marketplaceOrder->guid;
             $createChecks->marketplace_order_id = $marketplaceOrder->marketplace_order_id;
 
             $eit = ExportImportTable::find()
@@ -2483,6 +2484,7 @@ class MarketplaceService
             $createChecks->date = date('Y-m-d H:i:s');
             $createChecks->is_marketplace = 1;
             $createChecks->marketplace_name = $marketplaceOrder->marketplace_name;
+            $createChecks->seller_id = $marketplaceOrder->seller_id;
 
             if ($createChecks->save()) {
                 return true;