赛事活动页面改造-添加日历排期功能

src/main/java/com/ctrip/fun/golf/api/product/CommuneMController.java

@@ -15,6 +15,7 @@ import org.springframework.stereotype.Controller;
 import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 
 import com.ctrip.fun.common.core.util.DateUtil;
@@ -66,16 +67,57 @@ public class CommuneMController {
         return this.getResultMap(pagedResponseBean, communeResourceQuery.getImageSize());
     }
 
+    /**
+     * 赛事活动列表， 包含总库存和总剩余名额数
+     * @param communeResourceQuery
+     * @return
+     */
     @ResponseBody
-    @RequestMapping(value = "/v4/commune/communeResources", method = RequestMethod.GET, params = { "cityId", "imageSize", "pagerOffset", "pagerPerPage", "sortField", "sortDirection" })
+    @RequestMapping(value = "/v3/commune/communeResourcesUsed", method = RequestMethod.GET, params = { "cityId", "imageSize", "pagerOffset", "pagerPerPage", "sortField", "sortDirection" })
+    public Object queryCommuneResourceListV3Used(CommuneResourceQuery communeResourceQuery) {
+        List<Integer> resourceTypeList = new ArrayList<Integer>();
+        resourceTypeList.add(ResourceTypeEnum.EVENT_ACTIVITY.getValue());
+        communeResourceQuery.setResourceTypeList(resourceTypeList);
+        PagedResponseBean<CommuneResourceBean> pagedResponseBean = communeMService.queryCommuneResourceListV3Used(communeResourceQuery);
+        return this.getResultMap(pagedResponseBean, communeResourceQuery.getImageSize());
+    }
+
+    /**
+     * 赛事活动日历排期
+     * , params = { "cityId", "imageSize", "pagerOffset", "pagerPerPage", "sortField", "sortDirection","priceDate" }
+     * @param communeResourceQuery
+     * @return
+     */
+    @ResponseBody
+    @RequestMapping(value = "/v4/commune/communeResources", method = RequestMethod.GET)
     public Object queryCommuneResourceListV4(CommuneResourceQuery communeResourceQuery) {
         List<Integer> resourceTypeList = new ArrayList<Integer>();
         resourceTypeList.add(ResourceTypeEnum.EVENT_ACTIVITY.getValue());
         communeResourceQuery.setResourceTypeList(resourceTypeList);
+//        communeResourceQuery.setPriceDate(selectedDate);
         List<CommuneResourceV4> pagedResponseBean = communeMService.queryCommuneResourceListV4(communeResourceQuery);
         return pagedResponseBean;
     }
 
+
+    /**
+     * 赛事活动日历排期   指定日期赛事活动列表
+     *  params = { "cityId", "imageSize", "pagerOffset", "pagerPerPage", "sortField", "sortDirection","priceDate" }
+     * @param communeResourceQuery
+     * @return
+     */
+    @ResponseBody
+    @RequestMapping(value = "/v4/commune/communeResourcesDate", method = RequestMethod.GET)
+    public Object queryCommuneResourceListV4Date(CommuneResourceQuery communeResourceQuery) {
+    	List<Integer> resourceTypeList = new ArrayList<Integer>();
+        resourceTypeList.add(ResourceTypeEnum.EVENT_ACTIVITY.getValue());
+        communeResourceQuery.setResourceTypeList(resourceTypeList);
+        PagedResponseBean<CommuneResourceBean> pagedResponseBean = communeMService.queryCommuneResourceListV4Date(communeResourceQuery);
+        return this.getResultMap(pagedResponseBean, communeResourceQuery.getImageSize());
+    }
+    
+    
+
     @SuppressWarnings("unchecked")
     private Object getResultMap(PagedResponseBean<CommuneResourceBean> pagedResponseBean, String imageSize) {
         Map map = new HashMap();
@@ -117,6 +159,8 @@ public class CommuneMController {
                 element.put("productName", communeResourceBean.getProductName());
                 element.put("startTime", communeResourceBean.getStartTime());
                 element.put("size", communeResourceBean.getSize());
+                element.put("totalSize", communeResourceBean.getTotalSize());
+                element.put("totalUsed", communeResourceBean.getTotalUsed());
                 element.put("currentTime", DateUtil.getDateTimeStr(communeResourceBean.getCurrentTime()));
                 element.put("eventActivityTips", communeResourceBean.getEventActivityTips());
                 element.put("realTimeTeeTimeType", communeResourceBean.getRealTimeTeeTimeType());

src/main/java/com/ctrip/fun/golf/service/product/CommuneMService.java

@@ -59,6 +59,24 @@ public class CommuneMService extends BaseService {
 
     }
 
+    public PagedResponseBean<CommuneResourceBean> queryCommuneResourceListV3Used(CommuneResourceQuery communeResourceQuery) {
+
+        Request<CommuneResourceQuery> request = new Request<CommuneResourceQuery>("", communeResourceQuery);
+        HttpEntity<Request<CommuneResourceQuery>> entity = new HttpEntity<Request<CommuneResourceQuery>>(request);
+        PagedResponseBean<CommuneResourceBean> responseBean = null;
+        Response<PagedResponseBean<CommuneResourceBean>> response = super.exchange(this.getServiceUri("uri.Commune.queryCommuneResourceListV3Used"), HttpMethod.POST, entity,
+                new ParameterizedTypeReference<Response<PagedResponseBean<CommuneResourceBean>>>() {
+                }).getBody();
+        if (response.getStatus() == 0) {
+            responseBean = response.getBody();
+        } else {
+            // logger.error("[list] status:{}, msg: {}", response.getStatus(), response.getMessage());
+            throw new RestException(500, response.getMessage());
+        }
+        return responseBean;
+
+    }
+
     public List<CommuneResourceV4> queryCommuneResourceListV4(CommuneResourceQuery communeResourceQuery) {
 
         Request<CommuneResourceQuery> request = new Request<CommuneResourceQuery>("", communeResourceQuery);
@@ -77,6 +95,24 @@ public class CommuneMService extends BaseService {
 
     }
 
+    public PagedResponseBean<CommuneResourceBean> queryCommuneResourceListV4Date(CommuneResourceQuery communeResourceQuery) {
+
+        Request<CommuneResourceQuery> request = new Request<CommuneResourceQuery>("", communeResourceQuery);
+        HttpEntity<Request<CommuneResourceQuery>> entity = new HttpEntity<Request<CommuneResourceQuery>>(request);
+        PagedResponseBean<CommuneResourceBean> responseBean = null;
+        Response<PagedResponseBean<CommuneResourceBean>> response = super.exchange(this.getServiceUri("uri.Commune.queryCommuneResourceListV4Date"), HttpMethod.POST, entity,
+                new ParameterizedTypeReference<Response<PagedResponseBean<CommuneResourceBean>>>() {
+                }).getBody();
+        if (response.getStatus() == 0) {
+            responseBean = response.getBody();
+        } else {
+            // logger.error("[list] status:{}, msg: {}", response.getStatus(), response.getMessage());
+            throw new RestException(500, response.getMessage());
+        }
+        return responseBean;
+
+    }
+
     public PagedResponseBean<CommuneResourceBean> queryCommuneResourceList(CommuneResourceQuery communeResourceQuery) {
 
         Request<CommuneResourceQuery> request = new Request<CommuneResourceQuery>("", communeResourceQuery);

src/main/resources/rpc.properties

@@ -335,7 +335,9 @@ uri.insideSms.findByIdForAll=/fun-golf-service/insideSms/findByIdForAll
 uri.Commune.queryCommuneResourceList=/fun-golf-service/asmCourseData/queryCommuneResourceList
 uri.Commune.queryCommuneResourceListV2=/fun-golf-service/asmCourseData/queryCommuneResourceListV2
 uri.Commune.queryCommuneResourceListV3=/fun-golf-service/asmCourseData/queryCommuneResourceListV3
+uri.Commune.queryCommuneResourceListV3Used=/fun-golf-service/asmCourseData/queryCommuneResourceListV3Used
 uri.Commune.queryCommuneResourceListV4=/fun-golf-service/asmCourseData/queryCommuneResourceListV4
+uri.Commune.queryCommuneResourceListV4Date=/fun-golf-service/asmCourseData/queryCommuneResourceListV4Date
 uri.Commune.queryCommuneResourceByCourse=/fun-golf-service/asmCourseData/queryCommuneResourceByCourse
 uri.Commune.getCommuneResourceDetail=/fun-golf-service/asmCourseData/getCommuneResourceDetail
 uri.Commune.getAggregationCommuneResourceDetail=/fun-golf-service/asmCourseData/getAggregationCommuneResourceDetail