Merge branch 'group_0313'

app/adminapi/lists/group_activity/GroupActivityLists.php

@@ -42,6 +42,14 @@ class GroupActivityLists extends BaseAdminDataLists implements ListsSearchInterf
             '%like%' => ['title'],
         ];
     }
+    
+    public function queryWhere(){
+        $where = [];
+        if(!empty($this->params['area'])){
+            $where[] = ['area', 'like', '%'.$this->params['area'].'%'];
+        }
+        return $where;
+    }
 
 
     /**
@@ -56,7 +64,8 @@ class GroupActivityLists extends BaseAdminDataLists implements ListsSearchInterf
     public function lists(): array
     {
         $list = GroupActivity::where($this->searchWhere)
-            ->field(['id', 'title', 'image','equity_id','origin_price','price','start_time', 'end_time', 'participant_num', 'type', 'form_time_limit', 'is_simulate_form', 'simulate_num'])
+            ->where($this->queryWhere())
+            ->field(['id', 'title', 'image','equity_id','origin_price','price','start_time', 'end_time', 'participant_num', 'type', 'form_time_limit', 'is_simulate_form', 'simulate_num','area'])
             ->limit($this->limitOffset, $this->limitLength)
             ->order(['id' => 'desc'])
             ->select()
@@ -65,6 +74,7 @@ class GroupActivityLists extends BaseAdminDataLists implements ListsSearchInterf
             $item['price'] = $item['price'] ? explode(',', $item['price']) : [];
             $item['participant_num'] = $item['participant_num'] ? explode(',', $item['participant_num']) : [];
             $item['simulate_num'] = $item['simulate_num'] ? explode(',', $item['simulate_num']) : [];
+            $item['area'] = $item['area'] ? explode(',', $item['area']) : [];
         }
         return $list;
     }
@@ -78,7 +88,7 @@ class GroupActivityLists extends BaseAdminDataLists implements ListsSearchInterf
      */
     public function count(): int
     {
-        return GroupActivity::where($this->searchWhere)->count();
+        return GroupActivity::where($this->searchWhere)->where($this->queryWhere())->count();
     }
 
 }

app/adminapi/lists/group_activity/GroupUserOrderLists.php

@@ -44,8 +44,8 @@ class GroupUserOrderLists extends BaseAdminDataLists implements ListsSearchInter
 
     public function queryWhere(){
         $where = [];
-        if(!empty($this->params['real_name'])){
-            $where[] = ['a.real_name', 'like', '%'.$this->params['real_name'].'%'];
+        if(!empty($this->params['area'])){
+            $where[] = ['a.area', 'like', '%'.$this->params['area'].'%'];
         }
         if(!empty($this->params['title'])){
             $where[] = ['b.title', 'like', '%'.$this->params['title'].'%'];

app/adminapi/logic/group_activity/GroupActivityLogic.php

@@ -54,6 +54,7 @@ class GroupActivityLogic extends BaseLogic
             } else {
                 $params['simulate_num'] = '';
             }
+            $params['area'] = implode(",",$params['area']);
             GroupActivity::create([
                 'title' => $params['title'],
                 'image' => $params['image'],
@@ -70,6 +71,7 @@ class GroupActivityLogic extends BaseLogic
                 'simulate_num' => $params['simulate_num'],
                 'is_preheat' => $params['is_preheat'],
                 'is_support_refund' => $params['is_support_refund'],
+                'area' => $params['area'],
             ]);
 
             Db::commit();
@@ -105,6 +107,8 @@ class GroupActivityLogic extends BaseLogic
             } else {
                 $params['simulate_num'] = '';
             }
+            
+            $params['area'] = implode(",",$params['area']);
             GroupActivity::where('id', $params['id'])->update([
                 'title' => $params['title'],
                 'image' => $params['image'],
@@ -121,6 +125,7 @@ class GroupActivityLogic extends BaseLogic
                 'simulate_num' => $params['simulate_num'],
                 'is_preheat' => $params['is_preheat'],
                 'is_support_refund' => $params['is_support_refund'],
+                'area' => $params['area'],
             ]);
 
             Db::commit();
@@ -155,7 +160,9 @@ class GroupActivityLogic extends BaseLogic
      */
     public static function detail($params): array
     {
-        return GroupActivity::findOrEmpty($params['id'])->toArray();
+        $detail = GroupActivity::findOrEmpty($params['id'])->toArray();
+        $detail['area'] = explode(",",$detail['area']);
+        return $detail;
     }
 
     /**

app/api/logic/GroupActivityLogic.php

@@ -32,10 +32,11 @@ class GroupActivityLogic extends BaseLogic
     public static function detail($id,$userId){
         $detail = GroupActivity::with('goods')->where(['id'=>$id])->visible([
             'id','title','image','start_time','end_time','type','equity_id',
-            'participant_num','origin_price','price','form_time_limit'
+            'participant_num','origin_price','price','form_time_limit','area'
         ])->findOrEmpty()->toArray();
 
         if(!empty($detail)){
+            $detail['area'] = explode(",",$detail['area']);
             $detail['price'] = explode(",",$detail['price']);
             $detail['participant_num'] = explode(",",$detail['participant_num']);
             $detail['timestamp'] = time();
@@ -60,8 +61,11 @@ class GroupActivityLogic extends BaseLogic
         if(!empty($detail)){
             $detail['activity'] = GroupActivity::with('goods')->where(['id'=>$detail['group_activity_id']])->visible([
                 'id','title','image','start_time','end_time','type','equity_id',
-                'participant_num','origin_price','price','form_time_limit'
+                'participant_num','origin_price','price','form_time_limit','area'
             ])->findOrEmpty()->toArray();
+            
+            $detail['activity']['area'] = explode(",",$detail['activity']['area']);
+
             $detail['users'] = GroupUserOrder::alias('a')
                                 ->leftJoin('user b','a.user_id=b.id')
                                 ->where(['a.sn'=>$sn,'a.status'=>1])
@@ -108,7 +112,7 @@ class GroupActivityLogic extends BaseLogic
      * @notes 用户订单详情
      */
     public static function userOrderDetail($sn,$userId){
-        $detail = GroupUserOrder::with('groupOrder')->where(['sn'=>$sn, 'user_id' => $userId])->field('id,status,pay_way,pay_time,pay_status,refund_status,remark,create_time,group_order_id,user_equity_id')->findOrEmpty()->toArray();
+        $detail = GroupUserOrder::with('groupOrder')->where(['sn'=>$sn, 'user_id' => $userId])->field('id,status,pay_way,pay_time,pay_status,refund_status,remark,create_time,group_order_id,user_equity_id,area,address')->findOrEmpty()->toArray();
         if ($detail) {
             $detail['is_refund'] = 0;
             if ($detail['pay_status'] == 1 && $detail['refund_status'] == 0) {

app/common/logic/PaymentLogic.php

@@ -279,10 +279,6 @@ class PaymentLogic extends BaseLogic
     //        PayNotifyLogic::handle($from, $order['sn']);
     //        return ['sn' => $order['sn'],'need_pay'=>0];
     //    }
-    if($from=='group'){
-        PayNotifyLogic::handle($from, $order['sn']);
-        return ['sn' => $order['sn'],'need_pay'=>0];
-    }
 
         $payService = null;
         switch ($payWay) {