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

bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/controller/manage/SaDeliverController.java

@@ -94,6 +94,18 @@ public class SaDeliverController extends BaseController {
             for (DeliverVO deliver : resultList) {
                 // 省市区处理
                 OrderUtil.handleOrderAddress(areaMap, deliver);
+                // 订单类型枚举转换
+                deliver.setOrderTypeVal(EOrderType.getLabelByValue(deliver.getOrderType()));
+                // 发货类型
+                deliver.setShippingChannelVal(EShippingChannel.getLabelByValue(deliver.getShippingChannel()));
+                // 发货方式
+                deliver.setDeliveryWayVal(EDelivery.getLabelByValue(deliver.getDeliveryWay()));
+                // 供应方式
+                deliver.setOperateScopeVal(ESupplyWay.getLabelByVal(deliver.getOperateScope()));
+                // 运输方式
+                deliver.setTranTypeVal(ETransportType.getLabelByValue(deliver.getTranType()));
+                // 发货状态
+                deliver.setDeliverStatusVal(EDeliveryStatus.getEnumByValue(deliver.getDeliverStatus()).getLabel());
             }
         }
         return getDataTable(resultList);
@@ -142,12 +154,12 @@ public class SaDeliverController extends BaseController {
                 // 省市区处理
                 OrderUtil.handleOrderAddress(areaMap, deliver);
 
-                deliver.setDeliverStatusVal(transactionMap.get(EnumsPrefixConstants.DELIVERY_STATUS + deliver.getDeliverStatus()));
+                deliver.setDeliverStatusVal(EDeliveryStatus.getEnumByValue(deliver.getDeliverStatus()).getLabel());
-                deliver.setDeliveryWayVal(transactionMap.get(EnumsPrefixConstants.DELIVERY + deliver.getDeliveryWay()));
+                deliver.setDeliveryWayVal(EDelivery.getLabelByValue(deliver.getDeliveryWay()));
-                deliver.setOperateScopeVal(transactionMap.get(EnumsPrefixConstants.SUPPLY_WAY + deliver.getOperateScope()));
+                deliver.setOperateScopeVal(ESupplyWay.getLabelByVal(deliver.getOperateScope()));
-                deliver.setOrderTypeVal(transactionMap.get(EnumsPrefixConstants.ORDER_TYPE + deliver.getOrderType()));
+                deliver.setOrderTypeVal(EOrderType.getLabelByValue(deliver.getOrderType()));
-                deliver.setTranTypeVal(transactionMap.get(EnumsPrefixConstants.ENU_TRA + deliver.getTranType()));
+                deliver.setTranTypeVal(ETransportType.getLabelByValue(deliver.getTranType()));
-                deliver.setShippingChannelVal(transactionMap.get(EnumsPrefixConstants.E_SHIPPING_CHANNEL + deliver.getShippingChannel()));
+                deliver.setShippingChannelVal(EShippingChannel.getLabelByValue(deliver.getShippingChannel()));
             }
         }
         ExcelUtil<DeliverVO> util = new ExcelUtil<>(DeliverVO.class);

bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/controller/manage/SaDeliverHandledController.java

@@ -98,6 +98,22 @@ public class SaDeliverHandledController extends BaseController {
             for (DeliverHandledVO deliverHandled : resultList) {
                 // 省市区处理
                 OrderUtil.handleOrderAddress(areaMap, deliverHandled);
+                // 订单类型枚举转换
+                deliverHandled.setOrderTypeVal(EOrderType.getLabelByValue(deliverHandled.getOrderType()));
+                // 发货类型
+                deliverHandled.setShippingChannelVal(EShippingChannel.getLabelByValue(deliverHandled.getShippingChannel()));
+                // 订单状态
+                deliverHandled.setOrderStatusVal(EOrderStatus.getLabelByValue(deliverHandled.getOrderStatus()));
+                // 发货方式
+                deliverHandled.setDeliveryWayVal(EDelivery.getLabelByValue(deliverHandled.getDeliveryWay()));
+                // 供应方式
+                deliverHandled.setOperateScopeVal(ESupplyWay.getLabelByVal(deliverHandled.getOperateScope()));
+                // 运输方式
+                deliverHandled.setTranTypeVal(ETransportType.getLabelByValue(deliverHandled.getTranType()));
+                // 预售状态
+                deliverHandled.setPreSaleStatusVal(EPresaleStatus.getLabelByValue(deliverHandled.getPreSaleStatus()));
+                // 打印状态
+                deliverHandled.setPrintStatusVal(EPrintStatus.getEnumByValue(deliverHandled.getPrintStatus()).getLabel());
             }
         }
         return getDataTable(resultList);
@@ -140,15 +156,22 @@ public class SaDeliverHandledController extends BaseController {
             for (DeliverHandledVO deliverHandled : resultList) {
                 // 省市区处理
                 OrderUtil.handleOrderAddress(areaMap, deliverHandled);
-
+                // 订单类型枚举转换
-                deliverHandled.setOrderStatusVal(transactionMap.get(EnumsPrefixConstants.ORDER_STATUS + deliverHandled.getOrderStatus()));
+                deliverHandled.setOrderTypeVal(EOrderType.getLabelByValue(deliverHandled.getOrderType()));
-                deliverHandled.setOrderTypeVal(transactionMap.get(EnumsPrefixConstants.ORDER_TYPE + deliverHandled.getOrderType()));
+                // 发货类型
-                deliverHandled.setDeliveryWayVal(transactionMap.get(EnumsPrefixConstants.DELIVERY + deliverHandled.getDeliveryWay()));
+                deliverHandled.setShippingChannelVal(EShippingChannel.getLabelByValue(deliverHandled.getShippingChannel()));
-                deliverHandled.setOperateScopeVal(transactionMap.get(EnumsPrefixConstants.SUPPLY_WAY + deliverHandled.getOperateScope()));
+                // 订单状态
-                deliverHandled.setPreSaleStatusVal(transactionMap.get(EnumsPrefixConstants.PRESALE_STATUS + deliverHandled.getPreSaleStatus()));
+                deliverHandled.setOrderStatusVal(EOrderStatus.getLabelByValue(deliverHandled.getOrderStatus()));
-                deliverHandled.setPrintStatusVal(transactionMap.get(EnumsPrefixConstants.E_PRINT_STATUS + deliverHandled.getPrintStatus()));
+                // 发货方式
-                deliverHandled.setTranTypeVal(transactionMap.get(EnumsPrefixConstants.ENU_TRA + deliverHandled.getTranType()));
+                deliverHandled.setDeliveryWayVal(EDelivery.getLabelByValue(deliverHandled.getDeliveryWay()));
-                deliverHandled.setShippingChannelVal(transactionMap.get(EnumsPrefixConstants.E_SHIPPING_CHANNEL + deliverHandled.getShippingChannel()));
+                // 供应方式
+                deliverHandled.setOperateScopeVal(ESupplyWay.getLabelByVal(deliverHandled.getOperateScope()));
+                // 运输方式
+                deliverHandled.setTranTypeVal(ETransportType.getLabelByValue(deliverHandled.getTranType()));
+                // 预售状态
+                deliverHandled.setPreSaleStatusVal(EPresaleStatus.getLabelByValue(deliverHandled.getPreSaleStatus()));
+                // 打印状态
+                deliverHandled.setPrintStatusVal(EPrintStatus.getEnumByValue(deliverHandled.getPrintStatus()).getLabel());
 
                 deliverHandled.setRecProvinceVal(deliverHandled.getRecProvinceVal());
                 deliverHandled.setRecCityVal(StringUtils.isNotEmpty(deliverHandled.getRecCityVal()) ? deliverHandled.getRecCityVal() : "");

bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/vo/DeliverHandledVO.java

@@ -58,7 +58,6 @@ public class DeliverHandledVO {
      * 订单类型（EOrderType）
      */
     @JsonIgnore
-    @Transaction(transactionKey = EnumsPrefixConstants.ORDER_TYPE)
     private Integer orderType;
     /**
      * 订单类型显示
@@ -69,7 +68,6 @@ public class DeliverHandledVO {
     /**
      * 订单状态（EOrderStatus）
      */
-    @Transaction(transactionKey = EnumsPrefixConstants.ORDER_STATUS)
     private Integer orderStatus;
     /**
      * 订单状态显示
@@ -177,7 +175,6 @@ public class DeliverHandledVO {
     /**
      * 发货类型
      */
-    @Transaction(transactionKey = EnumsPrefixConstants.E_SHIPPING_CHANNEL)
     @JsonIgnore
     private Integer shippingChannel;
     /**
@@ -196,7 +193,6 @@ public class DeliverHandledVO {
      * 打印状态（EPrintStatus）
      */
     @JsonIgnore
-    @Transaction(transactionKey = EnumsPrefixConstants.E_PRINT_STATUS)
     private Integer printStatus;
     /**
      * 打印状态显示
@@ -215,7 +211,6 @@ public class DeliverHandledVO {
      * 发货方式（EDelivery）
      */
     @JsonIgnore
-    @Transaction(transactionKey = EnumsPrefixConstants.DELIVERY)
     private Integer deliveryWay;
     /**
      * 发货方式显示
@@ -228,7 +223,6 @@ public class DeliverHandledVO {
      * 供应方式（ESupplyWay）
      */
     @JsonIgnore
-    @Transaction(transactionKey = EnumsPrefixConstants.SUPPLY_WAY)
     private Integer operateScope;
     /**
      * 供应方式显示
@@ -240,7 +234,6 @@ public class DeliverHandledVO {
      * 运输方式（ETransportType）
      */
     @JsonIgnore
-    @Transaction(transactionKey = EnumsPrefixConstants.ENU_TRA)
     private Integer tranType;
     /**
      * 运输方式显示
@@ -252,7 +245,6 @@ public class DeliverHandledVO {
      * 预售状态（EPresaleStatus）
      */
     @JsonIgnore
-    @Transaction(transactionKey = EnumsPrefixConstants.PRESALE_STATUS)
     private Integer preSaleStatus;
     /**
      * 预售状态显示

bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/vo/DeliverVO.java

@@ -41,7 +41,6 @@ public class DeliverVO {
      * 订单类型（EOrderType）
      */
     @JsonIgnore
-    @Transaction(transactionKey = EnumsPrefixConstants.ORDER_TYPE)
     private Integer orderType;
     /**
      * 订单类型显示
@@ -54,7 +53,6 @@ public class DeliverVO {
      * 发货单状态（EDeliveryStatus）
      */
     @JsonIgnore
-    @Transaction(transactionKey = EnumsPrefixConstants.DELIVERY_STATUS)
     private Integer deliverStatus;
     /**
      * 发货单状态显示
@@ -165,7 +163,6 @@ public class DeliverVO {
     /**
      * 发货类型
      */
-    @Transaction(transactionKey = EnumsPrefixConstants.E_SHIPPING_CHANNEL)
     private Integer shippingChannel;
     /**
      * 发货类型
@@ -195,7 +192,6 @@ public class DeliverVO {
      * 发货方式（EDelivery）
      */
     @JsonIgnore
-    @Transaction(transactionKey = EnumsPrefixConstants.DELIVERY)
     private Integer deliveryWay;
     /**
      * 发货方式显示
@@ -207,7 +203,6 @@ public class DeliverVO {
      * 供应方式（ESupplyWay）
      */
     @JsonIgnore
-    @Transaction(transactionKey = EnumsPrefixConstants.SUPPLY_WAY)
     private Integer operateScope;
     /**
      * 供应方式显示
@@ -219,7 +214,6 @@ public class DeliverVO {
      * 运输方式（ETransportType）
      */
     @JsonIgnore
-    @Transaction(transactionKey = EnumsPrefixConstants.ENU_TRA)
     private Integer tranType;
     /**
      * 运输方式显示