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..f127040f 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,22 @@ public class SaDeliverUnhandledController extends BaseController { for (DeliverUnhandledVO deliverUnhandled : resultList) { // 省市区处理 OrderUtil.handleOrderAddress(areaMap, deliverUnhandled); + // 订单类型枚举转换 + deliverUnhandled.setOrderTypeVal(EOrderType.getLabelByValue(deliverUnhandled.getOrderType())); + // 销售类型 + deliverUnhandled.setIsGiftVal(ESaleType.getLabelByValue(deliverUnhandled.getIsGift())); + // 发货类型 + deliverUnhandled.setShippingChannelVal(EShippingChannel.getLabelByValue(deliverUnhandled.getShippingChannel())); + // 订单状态 + deliverUnhandled.setOrderStatusVal(EOrderStatus.getLabelByValue(deliverUnhandled.getOrderStatus())); + // 发货方式 + deliverUnhandled.setDeliveryWayVal(EDelivery.getLabelByValue(deliverUnhandled.getDeliveryWay())); + // 供应方式 + deliverUnhandled.setOperateScopeVal(ESupplyWay.getLabelByVal(deliverUnhandled.getOperateScope())); + // 运输方式 + deliverUnhandled.setTranTypeVal(ETransportType.getLabelByValue(deliverUnhandled.getTranType())); + // 预售状态 + deliverUnhandled.setPreSaleStatusVal(EPresaleStatus.getLabelByValue(deliverUnhandled.getPreSaleStatus())); } } return getDataTable(resultList); @@ -174,14 +190,22 @@ public class SaDeliverUnhandledController extends BaseController { // 省市区处理 OrderUtil.handleOrderAddress(areaMap, deliverUnhandled); - deliverUnhandled.setIsGiftVal(transactionMap.get(EnumsPrefixConstants.E_SALE_TYPE + deliverUnhandled.getIsGift())); - deliverUnhandled.setDeliveryWayVal(transactionMap.get(EnumsPrefixConstants.DELIVERY + deliverUnhandled.getDeliveryWay())); - deliverUnhandled.setOperateScopeVal(transactionMap.get(EnumsPrefixConstants.SUPPLY_WAY + deliverUnhandled.getOperateScope())); - deliverUnhandled.setShippingChannelVal(transactionMap.get(EnumsPrefixConstants.E_SHIPPING_CHANNEL + deliverUnhandled.getShippingChannel())); - deliverUnhandled.setTranTypeVal(transactionMap.get(EnumsPrefixConstants.ENU_TRA + deliverUnhandled.getTranType())); - deliverUnhandled.setPreSaleStatusVal(transactionMap.get(EnumsPrefixConstants.PRESALE_STATUS + deliverUnhandled.getPreSaleStatus())); - deliverUnhandled.setOrderTypeVal(transactionMap.get(EnumsPrefixConstants.ORDER_TYPE + deliverUnhandled.getOrderType())); - deliverUnhandled.setOrderStatusVal(transactionMap.get(EnumsPrefixConstants.ORDER_STATUS + deliverUnhandled.getOrderStatus())); + // 订单类型枚举转换 + deliverUnhandled.setOrderTypeVal(EOrderType.getLabelByValue(deliverUnhandled.getOrderType())); + // 销售类型 + deliverUnhandled.setIsGiftVal(ESaleType.getLabelByValue(deliverUnhandled.getIsGift())); + // 发货类型 + deliverUnhandled.setShippingChannelVal(EShippingChannel.getLabelByValue(deliverUnhandled.getShippingChannel())); + // 订单状态 + deliverUnhandled.setOrderStatusVal(EOrderStatus.getLabelByValue(deliverUnhandled.getOrderStatus())); + // 发货方式 + deliverUnhandled.setDeliveryWayVal(EDelivery.getLabelByValue(deliverUnhandled.getDeliveryWay())); + // 供应方式 + deliverUnhandled.setOperateScopeVal(ESupplyWay.getLabelByVal(deliverUnhandled.getOperateScope())); + // 运输方式 + deliverUnhandled.setTranTypeVal(ETransportType.getLabelByValue(deliverUnhandled.getTranType())); + // 预售状态 + deliverUnhandled.setPreSaleStatusVal(EPresaleStatus.getLabelByValue(deliverUnhandled.getPreSaleStatus())); } } ExcelUtil util = new ExcelUtil<>(DeliverUnhandledVO.class); 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..fac3344f 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 @@ -6,6 +6,7 @@ import com.hzs.common.core.annotation.Excel; import com.hzs.common.core.annotation.Transaction; import com.hzs.common.core.constant.EnumsPrefixConstants; import lombok.Data; +import org.springframework.transaction.annotation.Transactional; import java.math.BigDecimal; import java.util.Date; @@ -36,8 +37,6 @@ public class DeliverUnhandledVO { /** * 订单类型（EOrderType） */ - @JsonIgnore - @Transaction(transactionKey = EnumsPrefixConstants.ORDER_TYPE) private Integer orderType; /** * 订单类型显示 @@ -91,7 +90,6 @@ public class DeliverUnhandledVO { /** * 销售类型 */ - @Transaction(transactionKey = EnumsPrefixConstants.E_SALE_TYPE) @JsonIgnore private Integer isGift; /** @@ -155,7 +153,6 @@ public class DeliverUnhandledVO { /** * 发货类型 */ - @Transaction(transactionKey = EnumsPrefixConstants.E_SHIPPING_CHANNEL) @JsonIgnore private Integer shippingChannel; /** @@ -180,7 +177,6 @@ public class DeliverUnhandledVO { /** * 订单状态（EOrderStatus） */ - @Transaction(transactionKey = EnumsPrefixConstants.ORDER_STATUS) private Integer orderStatus; /** * 订单状态显示 @@ -192,7 +188,6 @@ public class DeliverUnhandledVO { * 发货方式（EDelivery） */ @JsonIgnore - @Transaction(transactionKey = EnumsPrefixConstants.DELIVERY) private Integer deliveryWay; /** * 发货方式显示 @@ -204,7 +199,6 @@ public class DeliverUnhandledVO { * 供应方式（ESupplyWay） */ @JsonIgnore - @Transaction(transactionKey = EnumsPrefixConstants.SUPPLY_WAY) private Integer operateScope; /** * 供应方式显示 @@ -216,7 +210,6 @@ public class DeliverUnhandledVO { * 运输方式（ETransportType） */ @JsonIgnore - @Transaction(transactionKey = EnumsPrefixConstants.ENU_TRA) private Integer tranType; /** * 运输方式显示 @@ -228,7 +221,6 @@ public class DeliverUnhandledVO { * 预售状态（EPresaleStatus） */ @JsonIgnore - @Transaction(transactionKey = EnumsPrefixConstants.PRESALE_STATUS) private Integer preSaleStatus; /** * 预售状态显示 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..3f6e335f 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,12 @@ public class SaOrderController extends ParentOrderController { if (vo.getRecCounty() != null) { vo.setRecCountyName(areaMap.get(vo.getRecCounty())); } + // 订单类型枚举转换 + vo.setOrderTypeVal(EOrderType.getLabelByValue(vo.getOrderType())); + // 发货方式 + vo.setDeliveryWayVal(EDelivery.getLabelByValue(vo.getDeliveryWay())); + // 支付方式 + vo.setPayTypeVal(EOrderPayType.getLabelByValue(vo.getPayType())); } return getDataTable(resultList); } diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/vo/OrderInvoicingVO.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/vo/OrderInvoicingVO.java index af97150e..40e53f95 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/vo/OrderInvoicingVO.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/vo/OrderInvoicingVO.java @@ -33,7 +33,6 @@ public class OrderInvoicingVO implements Serializable { /** * 订单类型 */ - @Transaction(transactionKey = EnumsPrefixConstants.ORDER_TYPE) private Integer orderType; /** * 订单类型显示 @@ -122,7 +121,6 @@ public class OrderInvoicingVO implements Serializable { /** * 发货方式 */ - @Transaction(transactionKey = EnumsPrefixConstants.DELIVERY) private Integer deliveryWay; /** * 发货方式显示 @@ -132,7 +130,6 @@ public class OrderInvoicingVO implements Serializable { /** * 支付方式 */ - @Transaction(transactionKey = EnumsPrefixConstants.ORDER_PAY_TYPE) private Integer payType; /** * 支付方式显示 diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ESaleType.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ESaleType.java index ac36549c..2ed6942c 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ESaleType.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ESaleType.java @@ -34,4 +34,16 @@ public enum ESaleType { */ private final String key; + public static String getLabelByValue(Integer value) { + if (null == value) { + return ""; + } + for (ESaleType enums : ESaleType.values()) { + if (enums.getValue() == value) { + return enums.getLabel(); + } + } + return ""; + } + }