Merge branch 'master' of e.coding.net:zdap/weixiu/weixiu_api into equity-m

app/adminapi/logic/coupon/CouponRulesLogic.php

@@ -131,10 +131,6 @@ class CouponRulesLogic extends BaseLogic
             if(!empty($params['goods_id'])){
                 $goodsArr = [];
                 foreach($params['goods_id'] as $v){
-                    if(!is_array($v)){
-                        $goodsArr[] = $v;
-                        continue;
-                    }
                     $goodsArr[] = $v;
                 }
                 $model = CouponRules::find($params['id']);

app/api/logic/ActivityLogic.php

@@ -96,7 +96,11 @@ class ActivityLogic extends BaseLogic
                     $item = Goods::findOrEmpty($item['id'])->toArray();
                     $item['code'] = '';
                     $goods_coupon_id = CouponGoods::where(['goods_id'=>$item['id']])->value('coupon_id')??0;
-                    $goods_coupon_id && $item['code'] =  CouponRules::where(['id'=>$goods_coupon_id])->value('code')??'';
+                    if($goods_coupon_id){
+                        $coupon = CouponRules::where(['id'=>$goods_coupon_id])->field('code,server_category_name')->findOrEmpty();
+                        $coupon && $item['server_category_name'] = $coupon['server_category_name'];
+                        $coupon && $item['code'] = $coupon['code'];
+                    }
                     foreach ($reserved_fields as $field => $value) {
                         !empty($value) && $item[$field] = $value;
                     }
@@ -107,6 +111,7 @@ class ActivityLogic extends BaseLogic
             }
             // 不同模板 - 板块内商品数据结构不同
             switch ($url_page){
+                case 'adver6':
                 case 'adver5':
                     break;
                 default: