用户待开发票接口和用户开票接口开发

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

@@ -8,22 +8,35 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
+import javax.servlet.http.HttpServletRequest;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 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.alibaba.fastjson.JSONObject;
+import com.ctrip.fun.common.core.util.BeanConverter;
+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.ResponseStatusEnum;
+import com.ctrip.fun.common.vo.basic.VoucherQueryRequestDTO;
 import com.ctrip.fun.common.vo.order.BuyVoucherActivityBean;
 import com.ctrip.fun.common.vo.order.CommuneOrderBean;
 import com.ctrip.fun.common.vo.order.CommuneOrderListItemBean;
 import com.ctrip.fun.common.vo.order.CommuneOrderResourceBean;
+import com.ctrip.fun.common.vo.order.InvoiceBean;
+import com.ctrip.fun.common.vo.order.OrderBean;
+import com.ctrip.fun.common.vo.order.OrderListBean;
+import com.ctrip.fun.common.vo.order.OrderQuery;
 import com.ctrip.fun.common.vo.order.PlaceOrderResponseBean;
 import com.ctrip.fun.common.vo.product.BuyVoucherActivityQuery;
 import com.ctrip.fun.golf.secrity.Security;
@@ -54,7 +67,32 @@ public class CommuneOrderMController extends AbstractOrderMController<CommuneOrd
         return response;
     }
     
-    @SuppressWarnings("unchecked")
+
+ 
+   
+    @ResponseBody
+    @Security
+    @RequestMapping(value = "/queryCanInvoiceOrder", method = RequestMethod.GET)
+    public Response<PagedResponseBean<OrderListBean>> queryCanInvoiceOrder(@RequestParam String token,OrderQuery orderQuery ) {
+        Response<PagedResponseBean<OrderListBean>> response = new Response<PagedResponseBean<OrderListBean>>();
+        Request<OrderQuery> request = new Request<OrderQuery>();
+        request.setBody(orderQuery);
+        orderQuery.setUid(UserContext.getUserId());
+        response = communeOrderMService.queryCanInvoiceOrder(request);
+        return response;
+    }
+    
+    @ResponseBody
+    @Security
+    @RequestMapping(value = "/addInvoice/{token}", method = RequestMethod.POST)
+    public Response<Integer> addInvoice(@PathVariable String token,@RequestBody InvoiceBean invoiceBean) {
+    	 Request<InvoiceBean> request = new Request<InvoiceBean>();
+    	 request.setBody(invoiceBean);
+    	 return  communeOrderMService.addInvoice(request);
+    }
+    
+    
+  
     @ResponseBody
     @Security(index = 1, field = "token")
     @RequestMapping(value = "/voucherPlaceOrderForMiniApp", method = RequestMethod.POST)

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

@@ -19,6 +19,10 @@ import com.ctrip.fun.common.vo.order.BuyVoucherActivityBean;
 import com.ctrip.fun.common.vo.order.CommuneOrderBean;
 import com.ctrip.fun.common.vo.order.CommuneOrderListItemBean;
 import com.ctrip.fun.common.vo.order.CommuneOrderResourceBean;
+import com.ctrip.fun.common.vo.order.InvoiceBean;
+import com.ctrip.fun.common.vo.order.OrderBean;
+import com.ctrip.fun.common.vo.order.OrderListBean;
+import com.ctrip.fun.common.vo.order.OrderQuery;
 import com.ctrip.fun.common.vo.order.PlaceOrderResponseBean;
 import com.ctrip.fun.common.vo.product.BuyVoucherActivityQuery;
 
@@ -45,6 +49,28 @@ public class CommuneOrderMService extends AbstractOrderMService<CommuneOrderBean
         }
     }
     
+    public Response<PagedResponseBean<OrderListBean>> queryCanInvoiceOrder(@RequestBody Request<OrderQuery> request) {
+        {
+            String uri = super.getServiceUri("uri.communeOrder.queryCanInvoiceOrder");
+            HttpEntity<Request<OrderQuery>> entity = new HttpEntity<Request<OrderQuery>>(request);
+            Response<PagedResponseBean<OrderListBean>> response = super.exchange(uri, HttpMethod.POST, entity, new ParameterizedTypeReference<Response<PagedResponseBean<OrderListBean>>>() {
+            }).getBody();
+            return response;
+        }
+    }
+    
+    public Response<Integer> addInvoice(@RequestBody Request<InvoiceBean> request) {
+        {
+            String uri = super.getServiceUri("uri.order.addInvoice");
+            HttpEntity<Request<InvoiceBean>> entity = new HttpEntity<Request<InvoiceBean>>(request);
+            Response<Integer> response = super.exchange(uri, HttpMethod.POST, entity, new ParameterizedTypeReference<Response<Integer>>() {
+            }).getBody();
+            return response;
+        }
+    }
+    
+    
+    
     public ResponseMp<JSONObject> voucherPlaceOrderForMiniApp(@RequestBody Request<CommuneOrderBean> request) {
         {
             String uri = super.getServiceUri("uri.communeOrder.voucherPlaceOrderForMiniApp");

src/main/resources/rpc.properties

@@ -52,6 +52,7 @@ uri.order.confirmReceving=/fun-golf-service/mall/order/confirmReceving
 uri.order.deleteOrder=/fun-golf-service/{orderType}/deleteOrder
 
 #communeOrder
+uri.communeOrder.queryCanInvoiceOrder=/fun-golf-service/communeOrder/queryCanInvoiceOrder
 uri.communeOrder.placeOrderForMiniApp=/fun-golf-service/communeOrder/placeOrderForMiniApp
 uri.communeOrder.voucherPlaceOrderForMiniApp=/fun-golf-service/communeOrder/voucherPlaceOrderForMiniApp
 uri.communeOrder.buyVoucherActivityList=/fun-golf-service/communeOrder/buyVoucherActivityList
@@ -268,6 +269,9 @@ uri.UserInvoiceTitle.update=/fun-golf-service/user/invoiceTitle/update
 uri.UserInvoiceTitle.delete=/fun-golf-service/user/invoiceTitle/delete
 uri.UserInvoiceTitle.add=/fun-golf-service/user/invoiceTitle/add
 
+#
+uri.order.addInvoice=/fun-golf-service/invoice/add
+
 #weather
 uri.weather.courseWeatherList=/fun-golf-service/courseWeather/courseWeatherList