From 127209d1daa80647e03e3e8df4426fe62fa45bbf Mon Sep 17 00:00:00 2001
From: 13146336667 <33367671@qq.com>
Date: Fri, 12 Aug 2022 10:23:10 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9Egroup=5Fstatus=E6=88=90?=
 =?UTF-8?q?=E5=9B=A2=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 data/dOrder.php                  | 1 +
 model/mOrder.php                 | 4 ++++
 queue/crontab/sync_push_data.php | 1 +
 3 files changed, 6 insertions(+)

diff --git a/data/dOrder.php b/data/dOrder.php
index 344ba48..61991e0 100644
--- a/data/dOrder.php
+++ b/data/dOrder.php
@@ -10,6 +10,7 @@ class dOrder extends dBase {
             'id',
             'order_sn',
             'order_status',
+            'group_status',
             'refund_status',
             'after_sales_status',
             'pay_amount',
diff --git a/model/mOrder.php b/model/mOrder.php
index d4af3f8..2ce064f 100644
--- a/model/mOrder.php
+++ b/model/mOrder.php
@@ -16,6 +16,9 @@ class mOrder extends mBase {
     // 发货状态，枚举值：1：待发货，2：已发货待签收，3：已签收
     public $order_status = 0;
 
+    // 成团状态：0：拼团中、1：已成团、2：团失败
+    public $group_status = 0;
+
     // 退款状态，枚举值：1：无售后或售后关闭，2：售后处理中，3：退款中，4： 退款成功
     public $refund_status = 0;
 
@@ -64,6 +67,7 @@ class mOrder extends mBase {
         $data['uid'] = $uid;
 
         $data['order_status'] = $this->order_status;
+        $data['group_status'] = $this->group_status;
         $data['refund_status'] = $this->refund_status;
         $data['after_sales_status'] = $this->after_sales_status;
         $data['pay_amount'] = $this->pay_amount;
diff --git a/queue/crontab/sync_push_data.php b/queue/crontab/sync_push_data.php
index b140ec9..b183b2f 100644
--- a/queue/crontab/sync_push_data.php
+++ b/queue/crontab/sync_push_data.php
@@ -115,6 +115,7 @@ $obj->writeLog('pdd', 'sync_push_data.log', $start."|".$end);
 
             $obj->order_sn = $order['order_sn'];
             $obj->order_status = $order['order_status'];
+            $obj->group_status = $order['group_status'];
             $obj->refund_status = $order['refund_status'];
             $obj->after_sales_status = $order['after_sales_status'];
             $obj->pay_amount = $order['pay_amount'];