Merge branch 'master-modify-cutAmount' into dev

xx-im/xx-im-server/src/main/java/com/xxfc/platform/im/biz/MsgBiz.java

@@ -273,6 +273,8 @@ public class MsgBiz {
                 BeanUtil.copyProperties(msg, msgVo, CopyOptions.create().setIgnoreNullValue(true).setIgnoreError(true));
                 //添加用户昵称和头像
                 ImiVo imiVo = userBiz.getUserInfo(msg.getUserId());
+                log.info("获取用户头像和昵称 : 用户ID>>> {}", msg.getUserId());
+                log.info("获取用户头像和昵称 : imiVo>>> {}", imiVo);
                 if (imiVo != null) {
                     msgVo.setNickname(imiVo.getNickname());
                     msgVo.setPicUrl(imiVo.getHeadimgurl());

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

@@ -372,8 +372,8 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
                 baseOrder.setStatus(OrderStatusEnum.ORDER_FINISH.getCode());
                 baseOrder = baseOrderBiz.updateSelectiveByIdReT(baseOrder);
                 orderRentVehicleDetail.setFixedLossStatus(1);
-                baseOrderBiz.sendOrderMq(orderRentVehicleDetail, null, null, baseOrder, OrderMQDTO.ORDER_FINISH);
                 orderRentVehicleBiz.updateSelectiveByIdRe(orderRentVehicleDetail);
+                baseOrderBiz.sendOrderMq(orderRentVehicleDetail, null, null, baseOrder, OrderMQDTO.ORDER_FINISH);
             }
         } else if (baseOrder.getStatus() == OrderStatusEnum.ORDER_FIXED_LOSS.getCode()) {//定损后还车
             DepositRefundRecord depositRefundRecord = orderDepositRefundRecordBiz.findByCrossIdAndStatus(orderVehicleCrosstown.getId(), DepositRefundStatus.FIXLOSSREFUND.getCode());