Merge branch 'lichong-dev' into f-6.7.0

65632c07 · chongli · 7f4aa3ab · 64e1fde6 · 65632c07 · 65632c07
Commit 65632c07 authored Nov 13, 2018 by chongli
Showing with 128 additions and 2 deletions
src/main/java/com/ctrip/fun/golf/api/order/CommuneOrderMController.java
src/main/java/com/ctrip/fun/golf/service/order/CommuneOrderMService.java
src/main/resources/rpc.properties
--- a/src/main/java/com/ctrip/fun/golf/api/order/CommuneOrderMController.java
+++ b/src/main/java/com/ctrip/fun/golf/api/order/CommuneOrderMController.java
@@ -8,22 +8,37 @@ 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.SortDirectionEnum;
+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.InvoiceinfoQuery;
+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 +69,51 @@ 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) {
+    	invoiceBean.setUid(UserContext.getUserId());
+    	Request<InvoiceBean> request = new Request<InvoiceBean>();
+    	request.setBody(invoiceBean);
+    	return  communeOrderMService.addInvoice(request);
+    }
+    @ResponseBody
+    @Security
+    @RequestMapping(value = "/listInvoice/{token}", method = RequestMethod.GET)
+    public Response<PagedResponseBean<InvoiceBean>> invoiceRecord(@PathVariable String token) {
+    	InvoiceinfoQuery query = new InvoiceinfoQuery();
+    	query.setUid(UserContext.getUserId());
+    	query.setSortField("invoiceId");
+    	query.setSortDirection(SortDirectionEnum.DESC);
+    	Request<InvoiceinfoQuery> request = new Request<InvoiceinfoQuery>();
+    	request.setBody(query);
+    	PagedResponseBean<InvoiceBean>  pageBean = communeOrderMService.listInvoice(UserContext.getUserId(), query);
+    	Response<PagedResponseBean<InvoiceBean>> resp = new Response<PagedResponseBean<InvoiceBean>>();
+    	resp.setStatusEnum(ResponseStatusEnum.SUCCESS);
+    	resp.setBody(pageBean);
+    	return  resp;
+    }
    @ResponseBody
    @Security(index = 1, field = "token")
    @RequestMapping(value = "/voucherPlaceOrderForMiniApp", method = RequestMethod.POST)

--- a/src/main/java/com/ctrip/fun/golf/service/order/CommuneOrderMService.java
+++ b/src/main/java/com/ctrip/fun/golf/service/order/CommuneOrderMService.java
@@ -3,8 +3,13 @@
 */
 package com.ctrip.fun.golf.service.order;
+import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.core.ParameterizedTypeReference;
 import org.springframework.http.HttpEntity;
 import org.springframework.http.HttpMethod;
@@ -15,15 +20,20 @@ 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.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.PlaceOrderResponseBean;
+import com.ctrip.fun.common.vo.order.InvoiceBean;
+import com.ctrip.fun.common.vo.order.InvoiceinfoQuery;
+import com.ctrip.fun.common.vo.order.OrderListBean;
+import com.ctrip.fun.common.vo.order.OrderQuery;
 import com.ctrip.fun.common.vo.product.BuyVoucherActivityQuery;
 public class CommuneOrderMService extends AbstractOrderMService<CommuneOrderBean, CommuneOrderResourceBean, CommuneOrderListItemBean> {
+	  private static final Logger logger = LoggerFactory.getLogger(CommuneOrderMService.class);
    /**
     * @return
     * @see com.ctrip.fun.golf.service.order.AbstractOrderMService#getOrderType()
@@ -45,6 +55,58 @@ 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.invoice.add");
+            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  PagedResponseBean<InvoiceBean> listInvoice(String userId,InvoiceinfoQuery query) {
+        {
+        	PagedResponseBean<InvoiceBean> responseBean = new PagedResponseBean<InvoiceBean>(0, new ArrayList<InvoiceBean>());
+        	Request<InvoiceinfoQuery> request = new Request<InvoiceinfoQuery>(userId, query);
+            String uri = super.getServiceUri("uri.invoice.list");
+            HttpEntity<Request<InvoiceinfoQuery>> entity = new HttpEntity<Request<InvoiceinfoQuery>>(request);
+            Response<PagedResponseBean<InvoiceBean>> response = super.exchange(uri, HttpMethod.POST, entity, new ParameterizedTypeReference<Response<PagedResponseBean<InvoiceBean>>>() {
+            }).getBody();
+            if (null != response) {
+                if (response.getStatus() == ResponseStatusEnum.SUCCESS.getValue()) {
+                    responseBean = response.getBody();
+                } else {
+                    Map<String, String> tags = new HashMap<>();
+                    tags.put("userId", userId);
+                    tags.put("query", query.toString());
+                    logger.error("list异常", String.format("status: %d, msg: %s", response.getStatus(), response.getMessage()), tags);
+                }
+            }
+            return responseBean;
+        }
+    }
    public ResponseMp<JSONObject> voucherPlaceOrderForMiniApp(@RequestBody Request<CommuneOrderBean> request) {
        {
            String uri = super.getServiceUri("uri.communeOrder.voucherPlaceOrderForMiniApp");

--- a/src/main/resources/rpc.properties
+++ b/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
@@ -269,6 +270,10 @@ 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.invoice.add=/fun-golf-service/invoice/add
+uri.invoice.list=/fun-golf-service/invoice/list
 #weather
 uri.weather.courseWeatherList=/fun-golf-service/courseWeather/courseWeatherList