Merge branch 'master' of http://1.14.104.71:10880/root/ylrz_his_scrm_java

fs-user-app/src/main/java/com/fs/app/controller/live/LiveOrderController.java

@@ -351,7 +351,7 @@ public class LiveOrderController extends AppBaseController
         LiveOrder liveOrder = orderService.selectLiveOrderByOrderId(orderId);
         //订单总价 临时处理 为 商品支付金额（商品支付金额=订单总价-快递费）
         if(ObjectUtil.isNotEmpty(liveOrder)) {
-            liveOrder.setTotalPrice(liveOrder.getTotalPrice().subtract(liveOrder.getPayDelivery()));
+            liveOrder.setTotalPrice(liveOrder.getTotalPrice().subtract(liveOrder.getPayPostage()));
         }
         return AjaxResult.success(liveOrder);
     }