赛事活动-日历排期功能实现

src/main/java/com/ctrip/fun/golf/api/assemble/AsmCourseResourceController.java

@@ -132,7 +132,17 @@ public class AsmCourseResourceController {
         Response<PagedResponseBean<CommuneResourceBean>> respose = new Response<PagedResponseBean<CommuneResourceBean>>();
         respose.setStatus(ResponseStatusEnum.SUCCESS.getValue());
         respose.setMessage(ResponseStatusEnum.SUCCESS.getMsg());
-        respose.setBody(this.asmCourseResourceService.queryCommuneResourceListV3(request.getBody()));
+        respose.setBody(this.asmCourseResourceService.queryCommuneResourceListV3Used(request.getBody()));
+        return respose;
+    }
+
+    @ResponseBody
+    @RequestMapping(value = "/queryCommuneResourceListV3Used", method = RequestMethod.POST)
+    public Response<PagedResponseBean<CommuneResourceBean>> queryCommuneResourceListV3Used(@RequestBody Request<CommuneResourceQuery> request) {
+        Response<PagedResponseBean<CommuneResourceBean>> respose = new Response<PagedResponseBean<CommuneResourceBean>>();
+        respose.setStatus(ResponseStatusEnum.SUCCESS.getValue());
+        respose.setMessage(ResponseStatusEnum.SUCCESS.getMsg());
+        respose.setBody(this.asmCourseResourceService.queryCommuneResourceListV3Used(request.getBody()));
         return respose;
     }
 
@@ -147,6 +157,16 @@ public class AsmCourseResourceController {
     }
 
     @ResponseBody
+    @RequestMapping(value = "/queryCommuneResourceListV4Date", method = RequestMethod.POST)
+    public Response<PagedResponseBean<CommuneResourceBean>> queryCommuneResourceListV4Date(@RequestBody Request<CommuneResourceQuery> request) {
+        Response<PagedResponseBean<CommuneResourceBean>> respose = new Response<PagedResponseBean<CommuneResourceBean>>();
+        respose.setStatus(ResponseStatusEnum.SUCCESS.getValue());
+        respose.setMessage(ResponseStatusEnum.SUCCESS.getMsg());
+        respose.setBody(this.asmCourseResourceService.queryCommuneResourceListV3Used(request.getBody()));
+        return respose;
+    }
+
+    @ResponseBody
     @RequestMapping(value = "/queryCommuneResourceByCourse", method = RequestMethod.POST)
     public Response<PagedResponseBean<CommuneResourceBean>> queryCommuneResourceByCourse(@RequestBody Request<CommuneResourceQuery> request) {
         Response<PagedResponseBean<CommuneResourceBean>> respose = new Response<PagedResponseBean<CommuneResourceBean>>();

src/main/java/com/ctrip/fun/golf/service/assemble/AsmCourseResourceService.java

@@ -488,6 +488,44 @@ public class AsmCourseResourceService {
     }
     
 
+    /**
+     * 查詢社员资源V3
+     * 
+     * @param communeResourceQuery CommuneResourceQuery
+     * @return PagedResponseBean<CommuneResourceBean> PagedResponseBean<CommuneResourceBean>
+     */
+    public PagedResponseBean<CommuneResourceBean> queryCommuneResourceListV3Used(CommuneResourceQuery communeResourceQuery) {
+        PagedResponseBean<CommuneResourceBean> result = new PagedResponseBean<CommuneResourceBean>();
+        PagedEntityBean<CommuneResourceBean> pagedEntityBeans = this.asmCourseResourceDao.queryCommuneResourceV3Used(communeResourceQuery);
+        List<CommuneResourceBean> list = (List<CommuneResourceBean>) pagedEntityBeans.getResult();
+//        List<CommuneResourceBean> list = new ArrayList<CommuneResourceBean>();
+        if (list != null && list.size() > 0) {
+            List<Integer> priceIdList = new ArrayList<Integer>();
+            List<ResourcePrice> resourcePrices = new ArrayList<ResourcePrice>();
+            
+            for (CommuneResourceBean communeResourceBean : list) {
+                priceIdList.add(communeResourceBean.getPriceId());
+            }
+            resourcePrices = this.resourcePriceDao.getResourcePriceByOrderIds(priceIdList);
+            
+            if (resourcePrices.size() == 0) {
+                return result;
+            }
+
+            for (CommuneResourceBean communeResourceBean : list) {
+                ResourcePrice resourcePrice = this.findResourcePrice(communeResourceBean.getPriceId(), resourcePrices);
+                communeResourceBean.setCommuneGuestMinus(resourcePrice.getCommuneGuestMinus());
+                communeResourceBean.setCommuneGuestPrice(resourcePrice.getCommuneGuestPrice());
+                communeResourceBean.setCommuneMinus(resourcePrice.getCommuneMinus());
+                communeResourceBean.setCommunePrice(resourcePrice.getCommunePrice());
+            }
+        }
+        result.setCount((int) pagedEntityBeans.getCount());
+        result.setResult(list);
+        return result;
+    
+    	
+    }
 
     /**
      * 查詢社员资源V3
@@ -566,11 +604,18 @@ public class AsmCourseResourceService {
 	    		CommuneResourceV4PriceBean bean = new CommuneResourceV4PriceBean();
 	    		String productName = asm.getProductName();
 	    		//System.out.println(productName.getBytes());
-
-	            int endIndex = productName.indexOf("爱玩公社活动日");
-	            
-	    		String simpleProductName = productName.substring(2,endIndex);
-    			bean.setProductName(simpleProductName);
+	    		String simpleProductName = "";
+	    		if(productName!=null && productName.length()>2){
+		            int endIndex = productName.indexOf("爱玩公社");
+		            if(endIndex>=2){
+		            	simpleProductName = productName.substring(2,endIndex);
+	    			}else{
+	    				simpleProductName = productName.substring(2);
+	    			}
+	    		}else{
+	    			simpleProductName = productName;
+	    		}
+	            bean.setProductName(simpleProductName);
     			bean.setCashRebate(asm.getCashRebate());
     			bean.setCommunePrice(asm.getCommunePrice());
     			bean.setCommuneMinus(asm.getCommuneMinus());