Merge branch 'master-zjw'

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/OrderAccountBiz.java

@@ -443,12 +443,14 @@ public class OrderAccountBiz extends BaseBiz<OrderAccountMapper,OrderAccount> {
 
             csv.initParamJson();
             //设置明细
-            orderRentVehicleBiz.updateSelectiveById(new OrderRentVehicleDetail(){{
+            orderRentVehicleBiz.updateSelectiveByIdRe(new OrderRentVehicleDetail(){{
                 setId(orderMQDTO.getDetailId());
                 handelCostDetailExtend(csv);
                 setBackFreeDays(inProgressVO.getBackFreeDays());
             }});
 
+            orderMQDTO.setOrderRentVehicleDetail(orderRentVehicleBiz.selectById(orderMQDTO.getDetailId()));
+
             //捕捉异常
             try {
                 orderMsgBiz.handelMsgDeposit(orderMQDTO.getOrderRentVehicleDetail(), orderMQDTO, userFeign.userDetailById(orderMQDTO.getUserId()).getData());