订单详情页，可加入团购，过滤掉已经过期的

addons/shopro/controller/activity/Groupon.php

@@ -21,7 +21,7 @@ class Groupon extends Common
         $goods_id = $params['goods_id'] ?? 0;
         $activity_id = $params['activity_id'] ?? 0;
 
-        $groupons = GrouponModel::with('grouponLogs')->ing()
+        $groupons = GrouponModel::with('grouponLogs')->ing()->expire()
             ->where('goods_id', $goods_id)
             ->where('activity_id', $activity_id)
             ->order('id', 'asc')

addons/shopro/controller/order/Express.php

@@ -69,6 +69,7 @@ class Express extends Common
      */
     public function push()
     {
+        //区分寄出  与  寄回
         $data = $this->request->param();
         $expressLib = new ExpressLib();
         $result = $expressLib->push($data);

application/admin/model/shopro/activity/Groupon.php

@@ -28,7 +28,7 @@ class Groupon extends Common
             'invalid' => '拼团失败',
             'ing' => '进行中',
             'finish' => '已成团',
-            'finish_fictitious' => '虚拟成团',
+            'finish_fictitious' => '已经成团',//finish_fictitious
         ];
     }
 
@@ -40,6 +40,9 @@ class Groupon extends Common
         return $query->where('status', 'ing');
     }
 
+    public function scopeExpire($query){
+        return $query->where('expire_time','gt',time());
+    }
 
     public function getStatusTextAttr($value, $data)
     {