置换卷

src/main/java/com/ctrip/fun/golf/api/basic/VoucherMController.java

@@ -317,9 +317,12 @@ public class VoucherMController {
     @RequestMapping(value = "/voucher/getVoucherGiftList", method = RequestMethod.GET, params = { "token","uid", "pagerOffset", "pagerPerPage","status" })
     public Object getVoucherGiftList(@RequestParam String token, VoucherGiftQuery voucherGiftQuery) {
     	voucherGiftQuery.setToken(token);
+    	System.out.println("getVoucherGiftList1===>" );   
     	return voucherService.getVoucherGiftList(voucherGiftQuery);
     }
     
+
+    
     /**
      * 客户确认换卷
      */

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

@@ -150,6 +150,7 @@ public abstract class AbstractOrderMController<H extends AbstractOrderBean<T>, T
                 order.put("orderStatus", bean.getOrderStatus());
                 order.put("userOperateMode", bean.getUserOperateMode());
                 order.put("uid", bean.getUid());
+                order.put("orderCategory", bean.getOrderCategory());
                 order.put("amount", bean.getAmount());
                 order.put("totalAmount", bean.getTotalAmount());
                 order.put("orderDate", DateUtil.getDateStr(bean.getOrderDate()));

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

@@ -803,6 +803,7 @@ public class UserMController {
         mp.put("hobby",userBean.getHobby());        
         mp.put("golfLevel",userBean.getGolfLevel());
         mp.put("userWorkerId", userBean.getUserWorkerId());
+        mp.put("isSales", userBean.getIsSales());
 		return mp;
 	}
 	

src/main/java/com/ctrip/fun/golf/service/basic/VoucherMService.java

 package com.ctrip.fun.golf.service.basic;
 
 import java.util.ArrayList;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.core.ParameterizedTypeReference;
@@ -201,6 +202,28 @@ public class VoucherMService extends BaseService {
         return response.getBody();
     }
 	
+	public Object getVoucherGiftList(VoucherGiftQuery query){	
+		PagedResponseBean<VoucherGiftVo> pagedResponseBean = new PagedResponseBean<VoucherGiftVo>(0, new ArrayList<VoucherGiftVo>());
+        String uri = super.getServiceUri("uri.voucher.getVoucherGiftList");
+        System.out.println("getVoucherGiftList1===>" + uri );    
+        HttpEntity<Request<VoucherGiftQuery>> entity = new HttpEntity<Request<VoucherGiftQuery>>(new Request<VoucherGiftQuery>(null, query));
+        Response<PagedResponseBean<VoucherGiftVo>> response = null;
+        try {
+//            response = super.exchange(uri, HttpMethod.POST, entity, new ParameterizedTypeReference<Response<PagedResponseBean<VoucherGiftVo>>>() {
+//            }).getBody();
+        
+        } catch (Exception e) {
+            logger.error(e.getMessage());
+            return pagedResponseBean;
+        }
+        if (response == null || response.getStatus() != 0 || response.getBody() == null) {
+            return pagedResponseBean;
+        }
+		return response.getBody();
+	}
+	
+
+	
 	public Object shareVoucherForMiniApps(VoucherShareLogBean query) {
         PagedResponseBean<VoucherItemDTO> pagedResponseBean = new PagedResponseBean<VoucherItemDTO>(0, new ArrayList<VoucherItemDTO>());
         String uri = super.getServiceUri("uri.voucher.shareVoucherForMiniApps");
@@ -320,24 +343,7 @@ public class VoucherMService extends BaseService {
 	}
 	
 	
-	public Object  getVoucherGiftList (VoucherGiftQuery query){
-		PagedResponseBean<VoucherGiftVo> pagedResponseBean = new PagedResponseBean<VoucherGiftVo>(0, new ArrayList<VoucherGiftVo>());
-        String uri = super.getServiceUri("uri.voucher.getVoucherGiftList");
-        HttpEntity<Request<VoucherGiftQuery>> entity = new HttpEntity<Request<VoucherGiftQuery>>(new Request<VoucherGiftQuery>(null, query));
-        Response<PagedResponseBean<VoucherGiftVo>> response = null;
-        try {
-            response = super.exchange(uri, HttpMethod.POST, entity, 
-            		new ParameterizedTypeReference<Response<PagedResponseBean<VoucherGiftVo>>>() {
-            }).getBody();
-        } catch (Exception e) {
-            logger.error(e.getMessage());
-            return pagedResponseBean;
-        }
-        if (response == null || response.getStatus() != 0 || response.getBody() == null) {
-            return pagedResponseBean;
-        }
-		return response.getBody();
-	}
+
 	
 	public Response<?> voucherGiftAffirm(Request<VoucherGiftQuery> request) {
         String uri = super.getServiceUri("uri.voucher.voucherGiftAffirm");