Merge branch 'f-6.6.9' of 192.168.10.6:caosy/fun-golf-mobile into f-6.6.9

src/main/java/com/ctrip/fun/golf/api/eventActivity/EventActivityMController.java

@@ -31,6 +31,7 @@ import com.ctrip.fun.common.vo.order.EventOrderHistoryInfoBean;
 import com.ctrip.fun.common.vo.order.EventOrderHistoryInfoQuery;
 import com.ctrip.fun.common.vo.order.LatestOnGoingOrderOverTimeInfoQuery;
 import com.ctrip.fun.common.vo.order.LatestOnGoingOrderOverTimeInfoResponseBean;
+import com.ctrip.fun.common.vo.product.EventActivityCheckQuery;
 import com.ctrip.fun.common.vo.user.UserBean;
 import com.ctrip.fun.common.vo.user.UserQuery;
 import com.ctrip.fun.golf.secrity.Security;
@@ -224,6 +225,16 @@ public class EventActivityMController {
             return errorBean;
         }
     }
+    
+    @Security(index = 1, field = "token")
+    @RequestMapping(value = "/checkHasWaittingDealOrders", method = RequestMethod.POST)
+    @ResponseBody
+    public Object checkHasWaittingDealOrders(@RequestBody EventActivityCheckQuery eventActivityCheckQuery) {
+    	Request<EventActivityCheckQuery> request = new Request<EventActivityCheckQuery>();
+    	request.setBody(eventActivityCheckQuery);
+        return eventActivityMService.checkHasWaittingDealOrders(request);
+    }
+    
 
     @Security(index = 1, field = "token")
     @RequestMapping(value = "/reserveSeatForOne", method = RequestMethod.POST)

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

@@ -76,6 +76,21 @@ public abstract class AbstractOrderMController<H extends AbstractOrderBean<T>, T
         response = this.getOrderService().placeOrderWeiXinPay(request);
         return response;
     }
+    
+    @SuppressWarnings("unchecked")
+    @ResponseBody
+    @Security(index = 1, field = "token")
+    @RequestMapping(value = "/continueWeiXinPay", method = RequestMethod.POST)
+    public Object continueWeiXinPay(@RequestBody H abstractOrderBean) {
+        Response<JSONObject> response = new Response<JSONObject>();
+        Request<H> request = new Request<H>();
+        request.setBody(abstractOrderBean);
+        abstractOrderBean.setUid(UserContext.getUserId());
+        request.setUserId(UserContext.getUserId());
+        response = this.getOrderService().continueWeiXinPay(request);
+        return response;
+    }   
+    
 
     /**
      * @param response

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

@@ -15,6 +15,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import com.alibaba.fastjson.JSONObject;
 import com.ctrip.fun.common.vo.Request;
 import com.ctrip.fun.common.vo.Response;
+import com.ctrip.fun.common.vo.ResponseMp;
 import com.ctrip.fun.common.vo.ResponseStatusEnum;
 import com.ctrip.fun.common.vo.order.CommuneOrderBean;
 import com.ctrip.fun.common.vo.order.CommuneOrderListItemBean;
@@ -53,7 +54,7 @@ public class CommuneOrderMController extends AbstractOrderMController<CommuneOrd
     @Security(index = 1, field = "token")
     @RequestMapping(value = "/voucherPlaceOrderForMiniApp", method = RequestMethod.POST)
     public Object voucherPlaceOrderForMiniApp(@RequestBody CommuneOrderBean communeOrderBean) {
-        Response<JSONObject> response = new Response<JSONObject>();
+        ResponseMp<JSONObject> response = new ResponseMp<JSONObject>();
         Request<CommuneOrderBean> request = new Request<CommuneOrderBean>();
         request.setBody(communeOrderBean);
         communeOrderBean.setUid(UserContext.getUserId());

src/main/java/com/ctrip/fun/golf/service/eventActivity/EventActivityMService.java

@@ -8,11 +8,15 @@ import org.slf4j.LoggerFactory;
 import org.springframework.core.ParameterizedTypeReference;
 import org.springframework.http.HttpEntity;
 import org.springframework.http.HttpMethod;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
 
 import com.ctrip.fun.common.core.util.SysUtil;
 import com.ctrip.fun.common.vo.PagedResponseBean;
 import com.ctrip.fun.common.vo.Request;
 import com.ctrip.fun.common.vo.Response;
+import com.ctrip.fun.common.vo.ResponseStatusEnum;
 import com.ctrip.fun.common.vo.order.EventCustomerInfoBean;
 import com.ctrip.fun.common.vo.order.EventCustomerInfoGroupBean;
 import com.ctrip.fun.common.vo.order.EventCustomerInfoQuery;
@@ -21,6 +25,7 @@ import com.ctrip.fun.common.vo.order.EventOrderHistoryInfoBean;
 import com.ctrip.fun.common.vo.order.EventOrderHistoryInfoQuery;
 import com.ctrip.fun.common.vo.order.LatestOnGoingOrderOverTimeInfoQuery;
 import com.ctrip.fun.common.vo.order.LatestOnGoingOrderOverTimeInfoResponseBean;
+import com.ctrip.fun.common.vo.product.EventActivityCheckQuery;
 import com.ctrip.fun.golf.service.BaseService;
 
 public class EventActivityMService extends BaseService {
@@ -122,6 +127,16 @@ public class EventActivityMService extends BaseService {
 
         return response;
     }
+    
+    
+    public Response<String> checkHasWaittingDealOrders(Request<EventActivityCheckQuery> request) {
+        String uri = super
+                .getServiceUri("uri.eventActivityOrder.checkHasWaittingDealOrders");
+        HttpEntity<Request<EventActivityCheckQuery>> entity = new HttpEntity<Request<EventActivityCheckQuery>>(
+                request);
+        Response<String> response = super.exchange( uri, HttpMethod.POST,entity,new ParameterizedTypeReference<Response<String>>() {}).getBody();
+        return response;
+    }
 
     public Response<Serializable> reserveSeatForOne(Request<EventCustomerInfoGroupBean> request) {
         String uri = super.getServiceUri("uri.eventCustomerInfo.reserveSeatForOne");

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

@@ -6,10 +6,12 @@ import org.springframework.core.ParameterizedTypeReference;
 import org.springframework.http.HttpEntity;
 import org.springframework.http.HttpMethod;
 import org.springframework.web.bind.annotation.RequestBody;
+
 import com.alibaba.fastjson.JSONObject;
 import com.ctrip.fun.common.vo.PagedResponseBean;
 import com.ctrip.fun.common.vo.Request;
 import com.ctrip.fun.common.vo.Response;
+import com.ctrip.fun.common.vo.ResponseMp;
 import com.ctrip.fun.common.vo.order.AbstractOrderBean;
 import com.ctrip.fun.common.vo.order.AbstractOrderListItemBean;
 import com.ctrip.fun.common.vo.order.OrderBean;
@@ -50,6 +52,19 @@ public abstract class AbstractOrderMService<H extends AbstractOrderBean<T>, T, K
         }
     }
     
+    public ResponseMp<JSONObject> continueWeiXinPay(@RequestBody Request<H> request) {
+        {
+            String uri = super.getServiceUri("uri.order.continueWeiXinPay");
+            uri = uri.replace("{orderType}", this.getOrderType());
+            HttpEntity<Request<H>> entity = new HttpEntity<Request<H>>(request);
+
+            ResponseMp<JSONObject> response = super.exchange(uri, HttpMethod.POST, entity, new ParameterizedTypeReference<ResponseMp<JSONObject>>() {
+            }).getBody();
+
+            return response;
+        }
+    }
+    
     public Response<H> callback(@RequestBody Request<OrderBean> request) {
         {
             String uri = super.getServiceUri("uri.order.callback");

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

@@ -12,6 +12,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.ctrip.fun.common.vo.PagedResponseBean;
 import com.ctrip.fun.common.vo.Request;
 import com.ctrip.fun.common.vo.Response;
+import com.ctrip.fun.common.vo.ResponseMp;
 import com.ctrip.fun.common.vo.order.CommuneOrderBean;
 import com.ctrip.fun.common.vo.order.CommuneOrderListItemBean;
 import com.ctrip.fun.common.vo.order.CommuneOrderResourceBean;
@@ -40,11 +41,11 @@ public class CommuneOrderMService extends AbstractOrderMService<CommuneOrderBean
         }
     }
     
-    public Response<JSONObject> voucherPlaceOrderForMiniApp(@RequestBody Request<CommuneOrderBean> request) {
+    public ResponseMp<JSONObject> voucherPlaceOrderForMiniApp(@RequestBody Request<CommuneOrderBean> request) {
         {
             String uri = super.getServiceUri("uri.communeOrder.voucherPlaceOrderForMiniApp");
             HttpEntity<Request<CommuneOrderBean>> entity = new HttpEntity<Request<CommuneOrderBean>>(request);
-            Response<JSONObject> response = super.exchange(uri, HttpMethod.POST, entity, new ParameterizedTypeReference<Response<JSONObject>>() {
+            ResponseMp<JSONObject> response = super.exchange(uri, HttpMethod.POST, entity, new ParameterizedTypeReference<ResponseMp<JSONObject>>() {
             }).getBody();
 
             return response;

src/main/resources/rpc.properties

@@ -40,6 +40,7 @@ uri.advert.QueryAdvertBannerList=/fun-golf-service/Advert/QueryAdvertBannerList
 uri.order.queryList=/fun-golf-service/{orderType}/queryList
 uri.order.placeOrder=/fun-golf-service/{orderType}/placeOrder
 uri.order.placeOrderWeiXinPay=/fun-golf-service/{orderType}/placeOrderWeiXinPay
+uri.order.continueWeiXinPay=/fun-golf-service/{orderType}/continueWeiXinPay
 uri.order.orderDetail=/fun-golf-service/{orderType}/orderDetail
 uri.order.cancelOrder=/fun-golf-service/{orderType}/cancelOrder
 uri.order.rebookOrderDetail=/fun-golf-service/{orderType}/rebookOrderDetail
@@ -382,6 +383,7 @@ uri.eventCustomerInfo.getCustomerInfoGroupInfoList=/fun-golf-service/eventCustom
 
 #分组
 uri.eventActivityOrder.getLatestOnGoingOrderOverTimeInfo=/fun-golf-service/eventActivityOrder/getLatestOnGoingOrderOverTimeInfo
+uri.eventActivityOrder.checkHasWaittingDealOrders=/fun-golf-service/eventActivityOrder/checkHasWaittingDealOrders
 uri.eventCustomerInfo.reserveSeatForOne=/fun-golf-service/eventCustomerInfo/reserveSeatForOne
 uri.eventCustomerInfo.reserveSeat=/fun-golf-service/eventCustomerInfo/reserveSeatForMultiple
 uri.eventCustomerInfo.cancelSeatForOne=/fun-golf-service/eventCustomerInfo/cancelSeatForOne