线下制单

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

@@ -3,6 +3,7 @@
  */
  */
 package com.ctrip.fun.golf.api.order;
 package com.ctrip.fun.golf.api.order;
 
 
+import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashMap;
 import java.util.List;
 import java.util.List;
@@ -157,6 +158,8 @@ public abstract class AbstractOrderMController<H extends AbstractOrderBean<T>, T
                 //add vipmember discount by caosy
                 //add vipmember discount by caosy
                 order.put("vipDiscountAmount", bean.getDiscountAfterOrderAmount());
                 order.put("vipDiscountAmount", bean.getDiscountAfterOrderAmount());
                 order.put("teeTime", bean.getTeeTime());
                 order.put("teeTime", bean.getTeeTime());
+                order.put("isConfirm", bean.getIsConfirm());
+                order.put("needPayMoney", needPayMoney(bean.getPayMode(),bean.getAmount() ,bean.getActualAmount(),bean.getVoucherAmount(),bean.getPrePayCardAmount(),bean.getPrePayAmount()));
                 this.setOrderListBean(order, bean);
                 this.setOrderListBean(order, bean);
                 orders.add(order);
                 orders.add(order);
             }
             }
@@ -165,6 +168,36 @@ public abstract class AbstractOrderMController<H extends AbstractOrderBean<T>, T
         return result;
         return result;
     }
     }
     
     
+    protected BigDecimal needPayMoney(String payMode,BigDecimal Amount,BigDecimal actualAmount,BigDecimal voucherAmount,BigDecimal PrePayCardAmount,BigDecimal prePayAmount){
+    	BigDecimal money =  BigDecimal.ZERO;
+    	
+    	if(actualAmount == null){
+    		actualAmount = BigDecimal.ZERO;
+    	}
+    	if(voucherAmount == null){
+    		voucherAmount = BigDecimal.ZERO;
+    	}
+    	if(PrePayCardAmount == null){
+    		PrePayCardAmount = BigDecimal.ZERO;
+    	}
+    	if(prePayAmount == null){
+    		prePayAmount = BigDecimal.ZERO;
+    	}
+    	if(payMode.equals("P")){
+    		// 预付
+    		money = Amount.subtract(voucherAmount).subtract(PrePayCardAmount);
+    	}else if(payMode.equals("O")){
+    		// 现付
+    		
+    	}else if(payMode.equals("M")){
+    		// 部分预付
+    		money = actualAmount.subtract(voucherAmount).subtract(PrePayCardAmount);
+    	}
+    	
+    	return money;
+ 	
+    }
+
     @SuppressWarnings("unchecked")
     @SuppressWarnings("unchecked")
     @ResponseBody
     @ResponseBody
     @Security(index = 1, field = "token")
     @Security(index = 1, field = "token")
@@ -335,6 +368,8 @@ public abstract class AbstractOrderMController<H extends AbstractOrderBean<T>, T
         result.put("insuranceStatus", bean.getInsuranceStatus());
         result.put("insuranceStatus", bean.getInsuranceStatus());
         result.put("insuranceMsg", bean.getInsuranceMsg());
         result.put("insuranceMsg", bean.getInsuranceMsg());
         result.put("policyNo", bean.getPolicyNo());
         result.put("policyNo", bean.getPolicyNo());
+        result.put("needPayMoney", bean.getNeedPayMoney());
+        result.put("isConfirm", bean.getIsConfirm());
         result.put("canDelete", bean.isCanDelete());
         result.put("canDelete", bean.isCanDelete());
         result.put("vipDiscountAmount", bean.getDiscountAfterOrderAmount());
         result.put("vipDiscountAmount", bean.getDiscountAfterOrderAmount());
     }
     }
@@ -378,6 +413,29 @@ public abstract class AbstractOrderMController<H extends AbstractOrderBean<T>, T
 
 
     }
     }
     
     
+    @SuppressWarnings("unchecked")
+    @ResponseBody
+    @Security(index = 1, field = "token")
+    @RequestMapping(value = "/confirmOrder", method = RequestMethod.GET, params = { "token", "orderNo" })
+    public Object ordeConfirm(OrderQuery orderQuery) {
+
+    	Response<?> response = new Response();
+        Request<OrderQuery> request = new Request<OrderQuery>();
+        orderQuery.setUid(UserContext.getUserId());
+        request.setUserId(UserContext.getUserId());
+        request.setBody(orderQuery);
+        response = this.getOrderService().ordeConfirm(request);
+        if (response.getStatus() == ResponseStatusEnum.SUCCESS.getValue()) {
+            Map<String, Object> map = new HashMap<String, Object>();
+            map.put("success", true);
+            return map;
+        } else {
+            return handFailResponse(response);
+        }
+
+
+    }
+
     /**
     /**
      * @param result
      * @param result
      * @param bean
      * @param bean

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

@@ -167,4 +167,15 @@ public abstract class AbstractOrderMService<H extends AbstractOrderBean<T>, T, K
 
 
         return response;
         return response;
     }
     }
+    
+    public Response<?> ordeConfirm(Request<OrderQuery> request) {
+        String uri = super.getServiceUri("uri.order.confirmOrder");
+        uri = uri.replace("{orderType}", this.getOrderType());
+        HttpEntity<Request<OrderQuery>> entity = new HttpEntity<Request<OrderQuery>>(request);
+
+        Response<?> response = super.exchange(uri, HttpMethod.POST, entity, new ParameterizedTypeReference<Response<?>>() {
+        }).getBody();
+
+        return response;
+    }
 }
 }

src/main/resources/rpc.properties

@@ -50,7 +50,7 @@ uri.order.travelDaySummary=/fun-golf-service/{orderType}/travelDaySummary
 uri.order.callback=/fun-golf-service/{orderType}/callback
 uri.order.callback=/fun-golf-service/{orderType}/callback
 uri.order.confirmReceving=/fun-golf-service/mall/order/confirmReceving
 uri.order.confirmReceving=/fun-golf-service/mall/order/confirmReceving
 uri.order.deleteOrder=/fun-golf-service/{orderType}/deleteOrder
 uri.order.deleteOrder=/fun-golf-service/{orderType}/deleteOrder
-
+uri.order.confirmOrder=/fun-golf-service/{orderType}/confirmOrder
 #communeOrder
 #communeOrder
 uri.communeOrder.queryCanInvoiceOrder=/fun-golf-service/communeOrder/queryCanInvoiceOrder
 uri.communeOrder.queryCanInvoiceOrder=/fun-golf-service/communeOrder/queryCanInvoiceOrder
 uri.communeOrder.placeOrderForMiniApp=/fun-golf-service/communeOrder/placeOrderForMiniApp
 uri.communeOrder.placeOrderForMiniApp=/fun-golf-service/communeOrder/placeOrderForMiniApp