Merge branch 'master-bug' into dev

xx-activity/xx-activity-api/src/main/java/com/xxfc/platform/activity/util/IntegralToolsUtils.java

@@ -25,7 +25,6 @@ public class IntegralToolsUtils {
         endDate.setTime(date2);
         return endDate.getDate() - startDate.getDate();
     }
-
     //获取当天的0点
     public static Long getDayStart() {
         long current = System.currentTimeMillis();

xx-activity/xx-activity-server/src/main/java/com/xxfc/platform/activity/biz/IntegralSignRecordBiz.java

@@ -80,7 +80,7 @@ public class IntegralSignRecordBiz extends BaseBiz<IntegralSignRecordMapper, Int
                        mapper.updateByPrimaryKeySelective(integralSignRecord);
                        //添加积分记录
                        addPoint(objectRestResponse.getData(),integralSignRecord, appUserDTO, integralSignRecord.getSignDays());
-                   } else if(day >1 ) {//断续签
+                   } else if(day > 1 || day < 0) {//断续签,小于0代表跨年签到
                        //规则连续签到 断签需要重新签到
                        if(objectRestResponse.getData().getIsContinuity()) {
                            integralSignRecord.setIsdel(true);

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

@@ -137,7 +137,7 @@ public class MsgBiz {
         if (msgVoList.size() > 0) {
             return ObjectRestResponse.succ(msgVoList.get(0));
         }
-        return ObjectRestResponse.succ();
+        return ObjectRestResponse.createFailedResult(ResultCode.IM_MSG_NOT_EXIST_CODE, ResultCode.getMsg(ResultCode.IM_MSG_NOT_EXIST_CODE));
     }
 
     public ObjectRestResponse getMsgListByUserId(Integer page, Integer limit, Integer type) {
@@ -273,8 +273,6 @@ 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

@@ -357,7 +357,7 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
                 orderDepositRefundRecordBiz.saveFixLossRecord(depositRefundRecord);
                 //修改訂單狀態為定損
                 baseOrder.setStatus(OrderStatusEnum.ORDER_FIXED_LOSS.getCode());
-                baseOrder = baseOrderBiz.updateSelectiveByIdReT(baseOrder);
+                baseOrderBiz.updateSelectiveByIdReT(baseOrder);
                 orderRentVehicleDetail.setFixedLossStatus(1);
                 orderRentVehicleBiz.updateSelectiveByIdRe(orderRentVehicleDetail);
             } else if (orderVehicleCrosstown.getType() == CrosstownTypeEnum.FIXED_LOSS_NOW.getCode()) { //直接定损还车
@@ -370,10 +370,10 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
                 orderDepositRefundRecordBiz.saveFixLossRecord(depositRefundRecord);
                 //修改訂單狀態為已完成
                 baseOrder.setStatus(OrderStatusEnum.ORDER_FINISH.getCode());
-                baseOrder = baseOrderBiz.updateSelectiveByIdReT(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());