add the vipmember

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

+/**
+ * Copyright 2014 CTRIP Co.,Ltd. All rights reserved.
+ */
+package com.ctrip.fun.golf.api.order;
+
+import java.util.Map;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import com.ctrip.fun.common.vo.order.AbstractOrderListItemBean;
+import com.ctrip.fun.common.vo.order.VipMemberOrderBean;
+import com.ctrip.fun.golf.service.order.AbstractOrderMService;
+import com.ctrip.fun.golf.service.order.VipMemberOrderMService;
+
+@Controller
+@RequestMapping(value = "{version}/vipmemberOrder")
+public class VipMemberOrderMController extends AbstractOrderMController<VipMemberOrderBean, Object, AbstractOrderListItemBean> {
+
+    @Autowired
+    private VipMemberOrderMService vipmemberOrderMService = null;
+
+    @Override
+    protected AbstractOrderMService<VipMemberOrderBean, Object, AbstractOrderListItemBean> getOrderService() {
+        return vipmemberOrderMService;
+    }
+
+    @Override
+    protected void setOrderListBean(Map<String, Object> map, AbstractOrderListItemBean bean) {
+        // TODO Auto-generated method stub
+    }
+
+    @Override
+    protected void setOrderResourceList(VipMemberOrderBean bean, Map<String, Object> map) {
+        // TODO Auto-generated method stub
+    }
+
+    @Override
+    protected void setOtherOrderBasic(Map<String, Object> result, VipMemberOrderBean bean) {
+        // TODO Auto-generated method stub
+    }
+
+    @Override
+    protected void setRebookOrderResourceList(VipMemberOrderBean bean, Map<String, Object> result) {
+        // TODO Auto-generated method stub
+    }
+}

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

@@ -79,8 +79,9 @@ public class AdvertisementMController {
                 List<LinkedHashMap<String, Object>> list;
                 try {
                     list = h5mapper.readValue(h5json, List.class);
-                    int querySize = 0;
-                    querySize = list.size() >= number ? number : list.size();
+                    int querySize = list.size();
+                    //放开广告的限制
+                 //   querySize = list.size() >= number ? number : list.size();
                     for (int i = 0; i < querySize; i++) {
                         Map<String, Object> map = list.get(i);
                         if (map.get("productType").equals(2)) {
@@ -124,8 +125,9 @@ public class AdvertisementMController {
                 try {
                     root = mapper.readTree(json);
                     JsonNode temp = root.get(cityId + "");
-                    int size = 0;
-                    size = temp.size() >= number ? number : temp.size();
+                    int size = temp.size();
+                    //放开广告数量限制
+                    //size = temp.size() >= number ? number : temp.size();
                     for (int i = 0; i < size; i++) {
                         Map map = new HashMap();
                         JsonNode items = temp.get(i);

src/main/java/com/ctrip/fun/golf/api/user/UserMController.java

@@ -260,6 +260,12 @@ public class UserMController {
         //社员续费 add by caosy
         mp.put("communeYears", loginResultBean.getCommuneYears()!=null?loginResultBean.getCommuneYears():0);
         mp.put("communeExpireTime", loginResultBean.getCommuneExpireTime()!=null?DateUtil.getDateStr(loginResultBean.getCommuneExpireTime()):null);
+      //vip会员 add by caosy
+        LoginResultBean bean = loginResultBean;
+        mp.put("vipmemberExpireTime", bean.getVipmemberExpireTime()!=null?DateUtil.getDateStr(bean.getVipmemberExpireTime()):null);
+        mp.put("vipmemberSaveAmount", bean.getVipmemberSaveAmount());
+        mp.put("vipmemberImgUrl", bean.getVipmemberImgUrl());
+        
         return mp;
     }
 
@@ -550,6 +556,11 @@ public class UserMController {
         //社员续费 add by caosy
         mp.put("communeYears", userBean.getCommuneYears()!=null?userBean.getCommuneYears():0);
         mp.put("communeExpireTime", userBean.getCommuneExpireTime()!=null?DateUtil.getDateStr(userBean.getCommuneExpireTime()):null);
+      //vip会员 add by caosy
+        UserBean bean = userBean;
+        mp.put("vipmemberExpireTime", bean.getVipmemberExpireTime()!=null?DateUtil.getDateStr(bean.getVipmemberExpireTime()):null);
+        mp.put("vipmemberSaveAmount", bean.getVipmemberSaveAmount());
+        mp.put("vipmemberImgUrl", bean.getVipmemberImgUrl());
         
         mp.put("familyName",userBean.getFamilyName());        
         mp.put("nativePlace",userBean.getNativePlace());        
@@ -855,6 +866,11 @@ public class UserMController {
         //社员续费 add by caosy
         mp.put("communeYears", weChatUserResultBean.getCommuneYears()!=null?weChatUserResultBean.getCommuneYears():0);
         mp.put("communeExpireTime", weChatUserResultBean.getCommuneExpireTime()!=null?DateUtil.getDateStr(weChatUserResultBean.getCommuneExpireTime()):null);
+        
+        WeChatUserResultBean bean = weChatUserResultBean;
+        mp.put("vipmemberExpireTime", bean.getVipmemberExpireTime()!=null?DateUtil.getDateStr(bean.getVipmemberExpireTime()):null);
+        mp.put("vipmemberSaveAmount", bean.getVipmemberSaveAmount());
+        mp.put("vipmemberImgUrl", bean.getVipmemberImgUrl());
         return mp;
     }
 
@@ -925,6 +941,12 @@ public class UserMController {
         //社员续费 add by caosy
         mp.put("communeYears", weChatUserResultBean.getCommuneYears()!=null?weChatUserResultBean.getCommuneYears():0);
         mp.put("communeExpireTime", weChatUserResultBean.getCommuneExpireTime()!=null?DateUtil.getDateStr(weChatUserResultBean.getCommuneExpireTime()):null);
+        
+        //vip会员 add by caosy
+        WeChatUserResultBean bean = weChatUserResultBean;
+        mp.put("vipmemberExpireTime", bean.getVipmemberExpireTime()!=null?DateUtil.getDateStr(bean.getVipmemberExpireTime()):null);
+        mp.put("vipmemberSaveAmount", bean.getVipmemberSaveAmount());
+        mp.put("vipmemberImgUrl", bean.getVipmemberImgUrl());
         return mp;
     }
 

src/main/java/com/ctrip/fun/golf/service/order/VipMemberOrderMService.java

+/**
+ * Copyright 2014 CTRIP Co.,Ltd. All rights reserved.
+ */
+package com.ctrip.fun.golf.service.order;
+
+import org.springframework.core.ParameterizedTypeReference;
+
+import com.ctrip.fun.common.vo.PagedResponseBean;
+import com.ctrip.fun.common.vo.Response;
+import com.ctrip.fun.common.vo.order.AbstractOrderListItemBean;
+import com.ctrip.fun.common.vo.order.VipMemberOrderBean;
+
+public class VipMemberOrderMService extends AbstractOrderMService<VipMemberOrderBean, Object, AbstractOrderListItemBean> {
+
+    /**
+     * @return
+     * @see com.ctrip.fun.golf.service.order.AbstractOrderMService#getOrderType()
+     */
+    @Override
+    protected String getOrderType() {
+        return "vipmemberOrder";
+    }
+
+    @Override
+    public ParameterizedTypeReference<Response<VipMemberOrderBean>> getOrderDetailParameterizedTypeReference() {
+        ParameterizedTypeReference<Response<VipMemberOrderBean>> parameterizedTypeReference = new ParameterizedTypeReference<Response<VipMemberOrderBean>>() {
+        };
+        return parameterizedTypeReference;
+    }
+
+    /**
+     * @return
+     * @see com.ctrip.fun.golf.service.order.AbstractOrderMService#getQueryListParameterizedTypeReference()
+     */
+    @Override
+    public ParameterizedTypeReference<Response<PagedResponseBean<AbstractOrderListItemBean>>> getQueryListParameterizedTypeReference() {
+        ParameterizedTypeReference<Response<PagedResponseBean<AbstractOrderListItemBean>>> parameterizedTypeReference = new ParameterizedTypeReference<Response<PagedResponseBean<AbstractOrderListItemBean>>>() {
+        };
+        return parameterizedTypeReference;
+    }
+}

src/main/resources/order.spring.xml

@@ -8,6 +8,7 @@
     <bean name="tourOrderMService" class="com.ctrip.fun.golf.service.order.TourOrderMService" parent="abstractOrderMServic"></bean>
 	<bean name="rechargeOrderMService" class="com.ctrip.fun.golf.service.order.RechargeOrderMService" parent="abstractOrderMServic" />
 	<bean name="communeOrderMService" class="com.ctrip.fun.golf.service.order.CommuneOrderMService" parent="abstractOrderMServic" />
+	<bean name="vipmemberOrderMService" class="com.ctrip.fun.golf.service.order.VipMemberOrderMService" parent="abstractOrderMServic" />
 	<bean name="eventActivityOrderMService" class="com.ctrip.fun.golf.service.order.EventActivityOrderMService" parent="abstractOrderMServic" />
     <bean name="mallOrderMService" class="com.ctrip.fun.golf.service.mall.order.MallOrderMService" parent="abstractOrderMServic"></bean>
     <bean name="mallAfterSalesOrderMService" class="com.ctrip.fun.golf.service.mall.order.MallAfterSalesOrderMService" parent="baseService" ></bean>