Merge branch 'miniAppPay' into f-6.6.9

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

@@ -14,6 +14,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.ResponseBody;
 
+import com.alibaba.fastjson.JSONObject;
 import com.ctrip.fun.common.core.util.DateUtil;
 import com.ctrip.fun.common.vo.PagedResponseBean;
 import com.ctrip.fun.common.vo.Request;
@@ -61,6 +62,20 @@ public abstract class AbstractOrderMController<H extends AbstractOrderBean<T>, T
             return this.handFailResponse(response);
         }
     }
+    
+    @SuppressWarnings("unchecked")
+    @ResponseBody
+    @Security(index = 1, field = "token")
+    @RequestMapping(value = "/placeOrderWeiXinPay", method = RequestMethod.POST)
+    public Object placeOrderWeiXinPay(@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().placeOrderWeiXinPay(request);
+        return response;
+    }
 
     /**
      * @param response

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

@@ -48,6 +48,20 @@ public class CommuneOrderMController extends AbstractOrderMController<CommuneOrd
         return response;
     }
     
+    @SuppressWarnings("unchecked")
+    @ResponseBody
+    @Security(index = 1, field = "token")
+    @RequestMapping(value = "/voucherPlaceOrderForMiniApp", method = RequestMethod.POST)
+    public Object voucherPlaceOrderForMiniApp(@RequestBody CommuneOrderBean communeOrderBean) {
+        Response<JSONObject> response = new Response<JSONObject>();
+        Request<CommuneOrderBean> request = new Request<CommuneOrderBean>();
+        request.setBody(communeOrderBean);
+        communeOrderBean.setUid(UserContext.getUserId());
+        request.setUserId(UserContext.getUserId());
+        response = communeOrderMService.voucherPlaceOrderForMiniApp(request);
+        return response;
+    }
+    
     @Override
     protected AbstractOrderMService<CommuneOrderBean, CommuneOrderResourceBean, CommuneOrderListItemBean> getOrderService() {
         return communeOrderMService;

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

@@ -2,12 +2,11 @@
  * Copyright 2014 CTRIP Co.,Ltd. All rights reserved.
  */
 package com.ctrip.fun.golf.service.order;
-
 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;
@@ -31,13 +30,26 @@ public abstract class AbstractOrderMService<H extends AbstractOrderBean<T>, T, K
             String uri = super.getServiceUri("uri.order.placeOrder");
             uri = uri.replace("{orderType}", this.getOrderType());
             HttpEntity<Request<H>> entity = new HttpEntity<Request<H>>(request);
-
             Response<PlaceOrderResponseBean> response = super.exchange(uri, HttpMethod.POST, entity, new ParameterizedTypeReference<Response<PlaceOrderResponseBean>>() {
             }).getBody();
 
             return response;
         }
     }
+    
+    public Response<JSONObject> placeOrderWeiXinPay(@RequestBody Request<H> request) {
+        {
+            String uri = super.getServiceUri("uri.order.placeOrderWeiXinPay");
+            uri = uri.replace("{orderType}", this.getOrderType());
+            HttpEntity<Request<H>> entity = new HttpEntity<Request<H>>(request);
+
+            Response<JSONObject> response = super.exchange(uri, HttpMethod.POST, entity, new ParameterizedTypeReference<Response<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

@@ -40,6 +40,17 @@ public class CommuneOrderMService extends AbstractOrderMService<CommuneOrderBean
         }
     }
     
+    public Response<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>>() {
+            }).getBody();
+
+            return response;
+        }
+    }
+    
     
 
     @Override

src/main/resources/rpc.properties

@@ -39,6 +39,7 @@ uri.advert.QueryAdvertBannerList=/fun-golf-service/Advert/QueryAdvertBannerList
 # order
 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.orderDetail=/fun-golf-service/{orderType}/orderDetail
 uri.order.cancelOrder=/fun-golf-service/{orderType}/cancelOrder
 uri.order.rebookOrderDetail=/fun-golf-service/{orderType}/rebookOrderDetail
@@ -51,6 +52,7 @@ uri.order.deleteOrder=/fun-golf-service/{orderType}/deleteOrder
 
 #communeOrder
 uri.communeOrder.placeOrderForMiniApp=/fun-golf-service/communeOrder/placeOrderForMiniApp
+uri.communeOrder.voucherPlaceOrderForMiniApp=/fun-golf-service/communeOrder/voucherPlaceOrderForMiniApp
 
 # order0
 uri.order.QueryOrderList=/fun-golf-service/Order/QueryOrderList