Merge remote-tracking branch 'origin/feature-24hour' into feature-24hour

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/service/AbstractOrderHandle.java

@@ -7,7 +7,6 @@ import com.github.wxiaoqi.security.admin.feign.UserFeign;
 import com.github.wxiaoqi.security.admin.feign.dto.AppUserDTO;
 import com.github.wxiaoqi.security.admin.feign.rest.UserRestInterface;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
-import com.github.wxiaoqi.security.common.context.BaseContextHandler;
 import com.github.wxiaoqi.security.common.exception.BaseException;
 import com.github.wxiaoqi.security.common.util.OrderUtil;
 import com.github.wxiaoqi.security.common.util.process.ResultCode;
@@ -19,7 +18,6 @@ import com.xxfc.platform.order.contant.enumerate.OrderTypeEnum;
 import com.xxfc.platform.order.entity.BaseOrder;
 import com.xxfc.platform.order.entity.inter.OrderDetail;
 import com.xxfc.platform.order.mqhandler.RabbitProduct;
-import com.xxfc.platform.order.pojo.pay.NotifyUrlDTO;
 import com.xxfc.platform.order.pojo.price.OrderPriceVO;
 import com.xxfc.platform.universal.entity.Dictionary;
 import org.springframework.beans.factory.annotation.Autowired;

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehicleBiz.java

@@ -320,9 +320,11 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> implements UserR
                             }
                         }
 
-                    }
+                    } else {
+                        log.info("【修改车辆信息错误】》》》数据库车辆信息：{}；前端传参车辆信息：{}", exitsVehicle.toString(), addOrUpdateVehicleVo.toString());
                         return RestResponse.codeAndMessage(ResCode.VEHICLE_INFO_SAME_NUM_PLATE_EXISTS.getCode(),
                                 ResCode.VEHICLE_INFO_SAME_NUM_PLATE_EXISTS.getDesc());
+                    }
 
 //                    if(addOrUpdateVehicleVo.getCode()!= null &&
 //                            addOrUpdateVehicleVo.getCode().equals(exitsVehicles.get(0).getCode())){