diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/controller/manage/SaDeliverUnhandledController.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/controller/manage/SaDeliverUnhandledController.java index 06f40958..f19f0047 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/controller/manage/SaDeliverUnhandledController.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/controller/manage/SaDeliverUnhandledController.java @@ -124,6 +124,8 @@ public class SaDeliverUnhandledController extends BaseController { for (DeliverUnhandledVO deliverUnhandled : resultList) { // 省市区处理 OrderUtil.handleOrderAddress(areaMap, deliverUnhandled); + // 订单类型枚举转换 + deliverUnhandled.setOrderTypeVal(EOrderType.getLabelByValue(deliverUnhandled.getOrderType())); } } return getDataTable(resultList); diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/vo/DeliverUnhandledVO.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/vo/DeliverUnhandledVO.java index 755d15fe..e60b76a1 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/vo/DeliverUnhandledVO.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/vo/DeliverUnhandledVO.java @@ -36,8 +36,6 @@ public class DeliverUnhandledVO { /** * 订单类型(EOrderType) */ - @JsonIgnore - @Transaction(transactionKey = EnumsPrefixConstants.ORDER_TYPE) private Integer orderType; /** * 订单类型显示 diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/controller/manager/SaOrderController.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/controller/manager/SaOrderController.java index 044a559f..cfe64388 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/controller/manager/SaOrderController.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/controller/manager/SaOrderController.java @@ -603,7 +603,7 @@ public class SaOrderController extends ParentOrderController { // 获取管理员权限(角色地区范围、体系列表、团队列表) UserAuthorityDTO userAuthorityDTO = iUserServiceApi.getUserAuthority(SecurityUtils.getUserId()).getData(); - param.setAreaScopeList(userAuthorityDTO.getRoleAreaScopeList()); + param.setAreaScopeList(userAuthorityDTO.getRoleAreaScopeList()); param.setVertexIdList(userAuthorityDTO.getVertexIdList()); param.setTeamList(userAuthorityDTO.getUserTeamList()); @@ -622,6 +622,8 @@ public class SaOrderController extends ParentOrderController { if (vo.getRecCounty() != null) { vo.setRecCountyName(areaMap.get(vo.getRecCounty())); } + // 订单类型枚举转换 + vo.setOrderTypeVal(EOrderType.getLabelByValue(vo.getOrderType())); } return getDataTable(resultList); }