Merge branch 'refs/heads/dev_zh_ty_20260108' into dev
This commit is contained in:
+11
@@ -4,14 +4,17 @@ import cn.hutool.core.collection.CollUtil;
|
||||
import cn.hutool.core.util.ObjectUtil;
|
||||
import com.alibaba.fastjson.JSON;
|
||||
import com.alibaba.fastjson2.JSONObject;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
|
||||
import com.mhd.user.domain.userAggregate.entity.DriverVehicleBind;
|
||||
import com.mhd.user.domain.userAggregate.repository.mapper.DriverVehicleBindMapper;
|
||||
import com.mhd.user.domain.userAggregate.repository.po.DriverVehicleBindPo;
|
||||
import com.mhd.user.domain.userAggregate.repository.todo.DriverVehicleBindDo;
|
||||
import com.mhd.user.domain.userAggregate.service.DriverVehicleBindDomainService;
|
||||
import com.mhd.user.domain.userAggregate.service.UserDriverDomainService;
|
||||
import com.mhd.system.api.TransportFeign;
|
||||
import com.mhd.user.interfaces.dto.DriverVehicleBindDto;
|
||||
import com.mhd.user.interfaces.dto.addDTO.UserDriverDTO;
|
||||
import com.mhd.user.interfaces.facadeApi.Po.VehicleDriverBindAppPo;
|
||||
import com.mhd.common.core.domain.dto.VehicleDto;
|
||||
import com.mhd.user.domain.userAggregate.repository.po.UserDriverPo;
|
||||
@@ -49,6 +52,9 @@ public class DriverVehicleBindApplicationService {
|
||||
private CommonApplicationService commonApplicationService;
|
||||
@Resource
|
||||
private UserDriverDomainService userDriverDomainService;
|
||||
@Autowired
|
||||
private DriverVehicleBindMapper driverVehicleBindMapper;
|
||||
|
||||
/**
|
||||
* 分页查询司机车辆绑定关系列表
|
||||
*/
|
||||
@@ -355,4 +361,9 @@ public class DriverVehicleBindApplicationService {
|
||||
}
|
||||
return isTrue;
|
||||
}
|
||||
|
||||
public int delectDriverBind(UserDriverDTO userDriverDTO) {
|
||||
return driverVehicleBindMapper.delete(new LambdaQueryWrapper<DriverVehicleBind>().eq(DriverVehicleBind::getDriverBindId,userDriverDTO.getUserId())
|
||||
.eq(DriverVehicleBind::getVehicleId,userDriverDTO.getVehicleId()));
|
||||
}
|
||||
}
|
||||
|
||||
+21
@@ -44,6 +44,8 @@ import com.mhd.user.domain.roleAggregate.entity.RoleEntity;
|
||||
import com.mhd.user.domain.roleAggregate.repository.todo.RoleDo;
|
||||
import com.mhd.user.domain.roleAggregate.service.RoleDomainService;
|
||||
import com.mhd.user.domain.userAggregate.entity.*;
|
||||
import com.mhd.user.domain.userAggregate.repository.mapper.DriverVehicleBindMapper;
|
||||
import com.mhd.user.domain.userAggregate.repository.mapper.UserMapper;
|
||||
import com.mhd.user.domain.userAggregate.repository.po.*;
|
||||
import com.mhd.user.domain.userAggregate.repository.po.UserDriverEnterprisePo;
|
||||
import com.mhd.user.domain.userAggregate.repository.po.UserDriverPo;
|
||||
@@ -178,6 +180,10 @@ public class UserDriverApplicationService {
|
||||
private MotorcadeCollectionDomainService motorcadeCollectionDomainService;
|
||||
@Resource
|
||||
private VehicleBindingStrategyFactory vehicleBindingStrategyFactory;
|
||||
@Autowired
|
||||
private DriverVehicleBindMapper driverVehicleBindMapper;
|
||||
@Autowired
|
||||
private UserMapper userMapper;
|
||||
|
||||
/**
|
||||
* @Description 承运人列表查询
|
||||
@@ -2870,5 +2876,20 @@ public class UserDriverApplicationService {
|
||||
// }
|
||||
return motorcade.getDriverEnterpriseCode();
|
||||
}
|
||||
|
||||
public int bindVehicleForHome(UserDriverDO userDriverDO) {
|
||||
DriverVehicleBind driverVehicleBind = new DriverVehicleBind();
|
||||
driverVehicleBind.setUserId(userDriverDO.getUserId());
|
||||
driverVehicleBind.setVehicleId(userDriverDO.getVehicleId());
|
||||
driverVehicleBind.setDefaultFlag(1);
|
||||
driverVehicleBind.setDelFlag(1);
|
||||
driverVehicleBind.setDriverBindId(userDriverDO.getUserId());
|
||||
UserPo userPo = userMapper.selectByUserId(userDriverDO.getUserId());
|
||||
driverVehicleBind.setBindDriverName(userPo.getUserName());
|
||||
driverVehicleBind.setBindDriverPhone(userPo.getUserPhone());
|
||||
//向网货同步添加绑定关系
|
||||
// wlhyDomainService.binding(driverVehicleBind);
|
||||
return driverVehicleBindMapper.insert(driverVehicleBind);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user