修改停靠分公司bug

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

@@ -6,19 +6,16 @@ import com.google.common.collect.Lists;
 import com.xxfc.platform.order.contant.enumerate.OrderTypeEnum;
 import com.xxfc.platform.order.entity.DailyMembersOrderStatistics;
 import com.xxfc.platform.order.entity.MembersOrder;
-import com.xxfc.platform.order.entity.OrderAccount;
 import com.xxfc.platform.order.entity.OrderStatistics;
 import com.xxfc.platform.order.mapper.DailyMembersOrderStatisticsMapper;
 import com.xxfc.platform.order.pojo.OrderQuery;
 import com.xxfc.platform.order.pojo.Term;
 import com.xxfc.platform.order.pojo.account.OrderAccountDTO;
 import com.xxfc.platform.order.pojo.account.OrderAccountDetail;
-import javassist.expr.NewArray;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.interceptor.TransactionAspectSupport;
@@ -26,7 +23,10 @@ import tk.mybatis.mapper.entity.Example;
 import tk.mybatis.mapper.weekend.WeekendSqls;
 
 import java.math.BigDecimal;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Date;
+import java.util.List;
 
 /**
  * 每日购买会员订单统计

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

@@ -294,7 +294,7 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> implements UserR
                         //如果修改的有停靠分公司，需要添加一条调度记录
                         Vehicle vehicle1 = selectById(exitsVehicle.getId());
                         if (vehicle1 != null) {
-                            if (vehicle1.getParkBranchCompanyId() != addOrUpdateVehicleVo.getParkBranchCompanyId()) {
+                            if (!vehicle1.getParkBranchCompanyId() .equals(addOrUpdateVehicleVo.getParkBranchCompanyId())) {
                                 VehicleBookRecord vehicleBookRecord = new VehicleBookRecord();
                                 vehicleBookRecord.setRetCompany(addOrUpdateVehicleVo.getParkBranchCompanyId());
                                 vehicleBookRecord.setLiftCompany(vehicle1.getParkBranchCompanyId());