Merge branch 'f-6.7.0' of 192.168.10.6:caosy/fun-golf-service into f-6.7.0

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

@@ -265,10 +265,18 @@ public abstract class AbstractOrderService<H extends AbstractOrderBean<T>, T> ex
     	this.checkContinuePayParameters(abstractOrderBean);
     	this.checkContinuePayParameters(abstractOrderBean);
         UserExt userExt = getUserExtDao().getByUid(abstractOrderBean.getUid());
         UserExt userExt = getUserExtDao().getByUid(abstractOrderBean.getUid());
         Order order = this.getOrderDao().getOrderByOrderNo(abstractOrderBean.getOrderNo());
         Order order = this.getOrderDao().getOrderByOrderNo(abstractOrderBean.getOrderNo());
+        
+
+        BigDecimal invoiceAmount = order.getInvoiceAmount() == null ? new BigDecimal(0) : order.getInvoiceAmount();
+        BigDecimal postageAmount = order.getPostageAmount() == null ? new BigDecimal(0) : order.getPostageAmount();
+        BigDecimal insuranceAmount = order.getInsuranceAmount() == null ? new BigDecimal(0) : order.getInsuranceAmount();
+
+        BigDecimal needPayAmount = order.getPrePayAmount().add(invoiceAmount).add(postageAmount).add(insuranceAmount).subtract(order.getPrePayCardAmount()).subtract(order.getVoucherAmount());
+        
         ResponseMp<JSONObject>  response = new ResponseMp<JSONObject>();
         ResponseMp<JSONObject>  response = new ResponseMp<JSONObject>();
         JSONObject jSONObject = new JSONObject();
         JSONObject jSONObject = new JSONObject();
         try {
         try {
-        	jSONObject = WeiXinAtcion.weixinPlay(userExt.getMiniAppOpenId(),order.getAmount().multiply(new BigDecimal("100")).intValue(), order.getOrderNo()+"", this.getNotifyUrlForWeiXinPay(order), "dingqiu");
+        	jSONObject = WeiXinAtcion.weixinPlay(userExt.getMiniAppOpenId(),needPayAmount.multiply(new BigDecimal("100")).intValue(), order.getOrderNo()+"", this.getNotifyUrlForWeiXinPay(order), "dingqiu");
             jSONObject.put("needWXPay", true);
             jSONObject.put("needWXPay", true);
         	response.setBody(jSONObject);
         	response.setBody(jSONObject);
         } catch (Exception e) {
         } catch (Exception e) {