weiaisuosi/nanguangszwlback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

oms发单

Browse Source
This commit is contained in:
赵辉
2026-01-28 15:22:53 +08:00
parent e26dc853d5
commit e5476beb07
1 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mhd_oms/src/main/java/com/mhd/oms/domain/resevationOrder/service/OmsAddressMultiService.java
+20 -20
View File
@@ -148,7 +148,6 @@ public class OmsAddressMultiService implements IOmsAddressMultiService {
String swzlUserId = String.valueOf(loginUser.getUserid());
// 使用登录用户ID作为货主ID
String appointShipperId = String.valueOf(loginUser.getUserid());
// 使用登录用户信息作为货主信息，不再依赖appointShipperId
UserPo userPoInfo = userPo; // 直接使用已获取的登录用户信息
// 从UserCenter服务获取当前登录用户的货主信息
@@ -491,7 +490,7 @@ public class OmsAddressMultiService implements IOmsAddressMultiService {
resevationOrder.setTransportationName("车次配载");
resevationOrder.setRadioValue(1);
}
}
}if (tmsOrderAddDTO.getOrderShippingType() != null) {
if (tmsOrderAddDTO.getOrderShippingType() == 3) {
resevationOrder.setTransportationName("数量配载");
resevationOrder.setRadioValue(2);
@@ -501,31 +500,32 @@ public class OmsAddressMultiService implements IOmsAddressMultiService {
resevationOrder.setRadioValue(1);
resevationOrder.setTransportationModeId(1);
}
}
//设置是否自动审核
//自动审核用户信息（0否1是）
// SysConfigSwitch configSwitch = sysConfigSwitchService.queryBySysOrgCode();
//查询平台业务员
// 从UserCenter服务获取平台业务员信息
UserDTO userDTO = new UserDTO();
userDTO.setUserRole("platAuther");
AjaxResult platAutherResult = AjaxResult.success(userServiceFeign.getUserByTopOrganizationUserAccount(userDTO, "oms"));
List<UserPo> platAutherUserList = new ArrayList<>();
if (platAutherResult.get("code").toString().equals("200")) {
platAutherUserList.add(objectMapper.convertValue(platAutherResult.get("data"), UserPo.class));
}
// UserDTO userDTO = new UserDTO();
// userDTO.setUserRole("platAuther");
// AjaxResult platAutherResult = AjaxResult.success(userServiceFeign.getUserByTopOrganizationUserAccount(userDTO, "oms"));
// List<UserPo> platAutherUserList = new ArrayList<>();
// if (platAutherResult.get("code").toString().equals("200")) {
// platAutherUserList.add(objectMapper.convertValue(platAutherResult.get("data"), UserPo.class));
// }
if (autoAuditOrder == 1) {
resevationOrder.setAuditStatus(1);
if (platAutherUserList != null && platAutherUserList.size() > 0) {
resevationOrder.setAuditBy(String.valueOf(platAutherUserList.get(0).getUserId()));
}
// if (platAutherUserList != null && platAutherUserList.size() > 0) {
// resevationOrder.setAuditBy(String.valueOf(platAutherUserList.get(0).getUserId()));
// }
} else if (autoAuditOrder == 2) {
resevationOrder.setAuditStatus(0);
if (platAutherUserList != null && platAutherUserList.size() > 0) {
resevationOrder.setAuditBy(String.valueOf(platAutherUserList.get(0).getUserId()));
}
// if (platAutherUserList != null && platAutherUserList.size() > 0) {
// resevationOrder.setAuditBy(String.valueOf(platAutherUserList.get(0).getUserId()));
// }
} else {
resevationOrder.setAuditStatus(0);
}
@@ -554,11 +554,11 @@ public class OmsAddressMultiService implements IOmsAddressMultiService {
}
}
//保存付款方
if (tmsOrderAddDTO.getPayerType() == 0) {//委托方
resevationOrder.setPayer(resevationOrder.getAppointShipper());
} else if (tmsOrderAddDTO.getPayerType() == 1) {//收货方
resevationOrder.setPayer(resevationOrder.getRecipientName());
}
// if (tmsOrderAddDTO.getPayerType() == 0) {//委托方
// resevationOrder.setPayer(resevationOrder.getAppointShipper());
// } else if (tmsOrderAddDTO.getPayerType() == 1) {//收货方
// resevationOrder.setPayer(resevationOrder.getRecipientName());
// }
// 设置组织信息
if (tmsOrderAddDTO.getOrganizationId() != null) {