Merge branch 'master' into dev

app/event/order/NewCustomerEvent.php

@@ -29,7 +29,7 @@ class NewCustomerEvent
             }
 
             //发放优惠券
-            $goods = Goods::where('goods_id', $params['join_sheet_goods_id'])->select('goods_attribute_json')->first();
+            $goods = Goods::where('goods_id', $params['join_sheet_goods_id'])->select('goods_id','goods_name','goods_attribute_json')->first();
             if (!empty($goods) && !empty($goods->goods_attribute_json)) {
                 $goodsAttributeJson = json_decode($goods->goods_attribute_json, true);
                 if (isset($goodsAttributeJson['account'])) {