Merge remote-tracking branch 'origin/2.0-dev' into 2.0-dev

hai-order/src/main/java/com/web/controller/OrderPayController.java

@@ -583,7 +583,7 @@ public class OrderPayController {
             payParam.put("outTradeNo" , order.getOrderNo());
             payParam.put("transType" , "JSAPI");
             payParam.put("payMode" , "ALIPAY");
-            payParam.put("totalAmount" , order.getTotalPrice());
+            payParam.put("totalAmount" , order.getPayRealPrice());
             payParam.put("profitSharing" , profitSharing.equals("Y")?1:0);
             payParam.put("notifyUrl" , SysConst.getSysConfig().getHuiPayNotify());
             payParam.put("subject" , orderTitle);