dianliang/lanan-system
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
许允枞 2024-10-28 11:38:05 +08:00
commit 06b71889e5
3 changed files with 30 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/InspectionInfoServiceImpl.java
View File

@ -200,13 +200,16 @@ public class InspectionInfoServiceImpl extends ServiceImpl<InspectionInfoMapper,
customerInfo.setCustomerName(user.getNickname()); customerInfo.setCustomerName(user.getNickname());
customerInfo.setSex("0"); customerInfo.setSex("0");
customerInfo.setUserAge(user.getUserAge()); customerInfo.setUserAge(user.getUserAge());
// 设置客户来源 // 设置客户来源
CustomerMain customerMain = new CustomerMain(); CustomerMain customerMain = new CustomerMain();
customerMain.setDataFrom("01"); customerMain.setDataFrom("01");
customerMainService.saveOrUpdate(customerMain); customerMainService.saveOrUpdate(customerMain);
try {
customerInfoService.insertPartnerCustomerInfo(customerInfo);
}catch (Exception ignored){
}
customerInfoService.insertPartnerCustomerInfo(customerInfo);
} }
//追加订单明细记录 //追加订单明细记录
orderInfoDetailService.save(new OrderInfoDetail(orderInfo.getId(),"线下订单创建",new Date(),0L,"1")); orderInfoDetailService.save(new OrderInfoDetail(orderInfo.getId(),"线下订单创建",new Date(),0L,"1"));

2
dl-module-inspection/src/main/java/cn/iocoder/yudao/module/partner/service/impl/PartnerCustomerInfoServiceImpl.java
View File

@ -126,7 +126,7 @@ public class PartnerCustomerInfoServiceImpl extends ServiceImpl<PartnerCustomerI
* @return 结果 * @return 结果
*/ */
@Override @Override
@Transactional(rollbackFor = Exception.class)
public int insertPartnerCustomerInfo(PartnerCustomerInfo partnerCustomerInfo) throws Exception { public int insertPartnerCustomerInfo(PartnerCustomerInfo partnerCustomerInfo) throws Exception {
// 获取当前商户信息 // 获取当前商户信息
ShopMallPartners partners = partnerService.shopInfo(); ShopMallPartners partners = partnerService.shopInfo();

44
dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/service/impl/RescueDriverInfoServiceImpl.java
View File

@ -590,31 +590,35 @@ public class RescueDriverInfoServiceImpl extends ServiceImpl<RescueDriverInfoMap
//处理redis //处理redis
DriverInfo driverInfo = driverInfoService.getById(rescueInfo.getDriverId()); DriverInfo driverInfo = driverInfoService.getById(rescueInfo.getDriverId());
AdminUserRespDTO user = userService.getUser(driverInfo.getUserId()); AdminUserRespDTO user = userService.getUser(driverInfo.getUserId());
try{
// 收集客户信息
PartnerCustomerInfo customerInfo = new PartnerCustomerInfo();
customerInfo.setCustomerName(rescueInfo.getConnectionName());
customerInfo.setCustomerPhone(rescueInfo.getConnectionPhone());
customerInfo.setUserId(rescueInfo.getUserId());
// 收集客户信息 // 收集客户车辆信息
PartnerCustomerInfo customerInfo = new PartnerCustomerInfo(); List<ShopUserCar> userCarList = new ArrayList<>();
customerInfo.setCustomerName(rescueInfo.getConnectionName()); ShopUserCar userCar = new ShopUserCar();
customerInfo.setCustomerPhone(rescueInfo.getConnectionPhone()); userCar.setCarNo(rescueInfo.getLicenseNum());
customerInfo.setUserId(rescueInfo.getUserId()); userCar.setCarModel(rescueInfo.getCarType());
userCar.setCarBrand(rescueInfo.getCarBrand());
userCar.setUserId(user.getId());
userCarList.add(userCar);
// 收集客户车辆信息 customerInfo.setUserCarList(userCarList);
List<ShopUserCar> userCarList = new ArrayList<>();
ShopUserCar userCar = new ShopUserCar();
userCar.setCarNo(rescueInfo.getLicenseNum());
userCar.setCarModel(rescueInfo.getCarType());
userCar.setCarBrand(rescueInfo.getCarBrand());
userCar.setUserId(user.getId());
userCarList.add(userCar);
customerInfo.setUserCarList(userCarList); // 设置客户来源
CustomerMain customerMain = new CustomerMain();
customerMain.setDataFrom("02");
customerMainService.saveOrUpdate(customerMain);
// 设置客户来源 // 调用插入客户信息的方法
CustomerMain customerMain = new CustomerMain(); customerInfoService.insertPartnerCustomerInfo(customerInfo);
customerMain.setDataFrom("02"); }catch (Exception ignored){
customerMainService.saveOrUpdate(customerMain);
}
// 调用插入客户信息的方法
customerInfoService.insertPartnerCustomerInfo(customerInfo);
//所在顶级机构 //所在顶级机构