angelo
/
java-zk-app
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

## bug425 物流管理菜单下订单类型转枚举

This commit is contained in:
zhangheng 2025-09-30 09:43:04 +08:00
parent a4e8f8f8c6
commit 5f4a6b8698
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/controller/manage/SaDeliverUnhandledController.java
View File

@ -124,6 +124,8 @@ public class SaDeliverUnhandledController extends BaseController {
for (DeliverUnhandledVO deliverUnhandled : resultList) { for (DeliverUnhandledVO deliverUnhandled : resultList) {
// 省市区处理 // 省市区处理
OrderUtil.handleOrderAddress(areaMap, deliverUnhandled); OrderUtil.handleOrderAddress(areaMap, deliverUnhandled);
// 订单类型枚举转换
deliverUnhandled.setOrderTypeVal(EOrderType.getLabelByValue(deliverUnhandled.getOrderType()));
} }
} }
return getDataTable(resultList); return getDataTable(resultList);

2
bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/vo/DeliverUnhandledVO.java
View File

@ -36,8 +36,6 @@ public class DeliverUnhandledVO {
/** /**
* 订单类型（EOrderType） * 订单类型（EOrderType）
*/ */
@JsonIgnore
@Transaction(transactionKey = EnumsPrefixConstants.ORDER_TYPE)
private Integer orderType; private Integer orderType;
/** /**
* 订单类型显示 * 订单类型显示

4
bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/controller/manager/SaOrderController.java
View File

@ -603,7 +603,7 @@ public class SaOrderController extends ParentOrderController {
// 获取管理员权限（角色地区范围、体系列表、团队列表） // 获取管理员权限（角色地区范围、体系列表、团队列表）
UserAuthorityDTO userAuthorityDTO = iUserServiceApi.getUserAuthority(SecurityUtils.getUserId()).getData(); UserAuthorityDTO userAuthorityDTO = iUserServiceApi.getUserAuthority(SecurityUtils.getUserId()).getData();
param.setAreaScopeList(userAuthorityDTO.getRoleAreaScopeList()); param.setAreaScopeList(userAuthorityDTO.getRoleAreaScopeList());
param.setVertexIdList(userAuthorityDTO.getVertexIdList()); param.setVertexIdList(userAuthorityDTO.getVertexIdList());
param.setTeamList(userAuthorityDTO.getUserTeamList()); param.setTeamList(userAuthorityDTO.getUserTeamList());
@ -622,6 +622,8 @@ public class SaOrderController extends ParentOrderController {
if (vo.getRecCounty() != null) { if (vo.getRecCounty() != null) {
vo.setRecCountyName(areaMap.get(vo.getRecCounty())); vo.setRecCountyName(areaMap.get(vo.getRecCounty()));
} }
// 订单类型枚举转换
vo.setOrderTypeVal(EOrderType.getLabelByValue(vo.getOrderType()));
} }
return getDataTable(resultList); return getDataTable(resultList);
} }