Merge branch 'master' of http://git.huxiukeji.com/lizhen/xiaoshan

addons/shopro/controller/activity/Groupon.php

@@ -23,15 +23,34 @@ class Groupon extends Common
 
         $groupons = GrouponModel::with('leader')->ing()
             ->where('goods_id', $goods_id)
-//            ->where('activity_id', $activity_id)
+            ->where('activity_id', $activity_id)
             ->order('id', 'asc')
 //            ->paginate($this->request->param('list_rows', 10));
             ->autopage()->select();
         $this->success('获取成功', $groupons);
     }
 
+    //某个拼团详情
+    public function detailnew(){
+        $id = $this->request->param('id');
+        $groupon = GrouponModel::with(['groupon_logs'])->where('id', $id)->find();
+        if (!$groupon) {
+            $this->error(__('No Results were found'));
+        }
+
+        $service = new GoodsService();
+        // 查询所有状态的商品，并且包含被删除的商品
+        $goods = $service->withTrashed()->where('id', $groupon->goods_id)->find();
+        if (!$goods) {
+            $this->error('活动商品不存在');
+        }
 
 
+        $groupon['goods'] = $goods;
+
+        $this->success('获取成功', $groupon);
+    }
+
 
     // 团详情
     public function detail()

application/admin/model/shopro/order/traits/OrderStatus.php

@@ -118,7 +118,7 @@ trait OrderStatus
                 if (!isset($ext['need_address']) || $ext['need_address']) {                 // 自动发货这些不需要收货地址的，没有 edit_consignee
                     $backendBtns[] = 'edit_consignee';      //修改收货地址
                 }
-
+                //申请全额退款,在下面
                 break;
             case 'refund_completed':
                 $status_text = '退款完成';
@@ -137,6 +137,7 @@ trait OrderStatus
                 } else {
                     $backendBtns[] = 'refund';        // 全部退款  直接不申请退款
                 }
+                //团购和全额退款，在下面
                 break;
             case 'groupon_invalid':
                 $status_text = '拼团失败';
@@ -146,7 +147,7 @@ trait OrderStatus
             case 'completed':
                 $status_text = '交易完成';
                 $status_desc = '交易已完成';
-                $btns[] = 'delete';     // 删除订单
+//                $btns[] = 'delete';     // 删除订单
                 break;
         }