推广产品

src/main/java/com/ctrip/fun/golf/api/order/CommuneOrderMController.java

@@ -124,7 +124,7 @@ public class CommuneOrderMController extends AbstractOrderMController<CommuneOrd
     
     
     @ResponseBody
     @ResponseBody
     @RequestMapping(value = "/buyVoucherActivityList", method = RequestMethod.GET)
     @RequestMapping(value = "/buyVoucherActivityList", method = RequestMethod.GET)
-    public Object buyVoucherActivityList(String regionCode) {
+    public Object buyVoucherActivityList(String regionCode,Integer productType) {
         Response<List<BuyVoucherActivityBean>> response = new Response<List<BuyVoucherActivityBean>>();
         Response<List<BuyVoucherActivityBean>> response = new Response<List<BuyVoucherActivityBean>>();
         Request<BuyVoucherActivityQuery> request = new Request<BuyVoucherActivityQuery>();
         Request<BuyVoucherActivityQuery> request = new Request<BuyVoucherActivityQuery>();
         BuyVoucherActivityQuery query = new BuyVoucherActivityQuery();
         BuyVoucherActivityQuery query = new BuyVoucherActivityQuery();
@@ -132,6 +132,9 @@ public class CommuneOrderMController extends AbstractOrderMController<CommuneOrd
         if(regionCode != null){
         if(regionCode != null){
         	query.setRegionCode(regionCode);
         	query.setRegionCode(regionCode);
         }
         }
+        if(productType != null){
+        	query.setProductType(productType);
+        }
         request.setBody(query);
         request.setBody(query);
         Response<PagedResponseBean<BuyVoucherActivityBean>> responsePage = buyVoucherActivityMService.list(request);
         Response<PagedResponseBean<BuyVoucherActivityBean>> responsePage = buyVoucherActivityMService.list(request);
         response.setBody((ArrayList<BuyVoucherActivityBean>)responsePage.getBody().getResult());
         response.setBody((ArrayList<BuyVoucherActivityBean>)responsePage.getBody().getResult());