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

Compare commits

base: angelo:82833928ca89361cff5c422d83c859f77b33ed57
Branches Tags
angelo:master
angelo:test
angelo:dev
angelo:online
..
compare: angelo:9cd5b3b742ce870a47179e4503bb728d3db11011
Branches Tags
angelo:test
angelo:dev
angelo:online
angelo:master

No commits in common. "82833928ca89361cff5c422d83c859f77b33ed57" and "9cd5b3b742ce870a47179e4503bb728d3db11011" have entirely different histories.
82833928ca ... 9cd5b3b742

4 changed files with 29 additions and 50 deletions
Show Stats Expand all files Collapse all files

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

@ -94,18 +94,6 @@ 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);
@ -154,12 +142,12 @@ public class SaDeliverController extends BaseController {
// 省市区处理
OrderUtil.handleOrderAddress(areaMap, deliver);
deliver.setDeliverStatusVal(EDeliveryStatus.getEnumByValue(deliver.getDeliverStatus()).getLabel());
deliver.setDeliveryWayVal(EDelivery.getLabelByValue(deliver.getDeliveryWay()));
deliver.setOperateScopeVal(ESupplyWay.getLabelByVal(deliver.getOperateScope()));
deliver.setOrderTypeVal(EOrderType.getLabelByValue(deliver.getOrderType()));
deliver.setTranTypeVal(ETransportType.getLabelByValue(deliver.getTranType()));
deliver.setShippingChannelVal(EShippingChannel.getLabelByValue(deliver.getShippingChannel()));
deliver.setDeliverStatusVal(transactionMap.get(EnumsPrefixConstants.DELIVERY_STATUS + deliver.getDeliverStatus()));
deliver.setDeliveryWayVal(transactionMap.get(EnumsPrefixConstants.DELIVERY + deliver.getDeliveryWay()));
deliver.setOperateScopeVal(transactionMap.get(EnumsPrefixConstants.SUPPLY_WAY + deliver.getOperateScope()));
deliver.setOrderTypeVal(transactionMap.get(EnumsPrefixConstants.ORDER_TYPE + deliver.getOrderType()));
deliver.setTranTypeVal(transactionMap.get(EnumsPrefixConstants.ENU_TRA + deliver.getTranType()));
deliver.setShippingChannelVal(transactionMap.get(EnumsPrefixConstants.E_SHIPPING_CHANNEL + deliver.getShippingChannel()));
}
}
ExcelUtil<DeliverVO> util = new ExcelUtil<>(DeliverVO.class);

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

@ -98,22 +98,6 @@ 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);
@ -156,22 +140,15 @@ 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());
deliverHandled.setOrderStatusVal(transactionMap.get(EnumsPrefixConstants.ORDER_STATUS + deliverHandled.getOrderStatus()));
deliverHandled.setOrderTypeVal(transactionMap.get(EnumsPrefixConstants.ORDER_TYPE + deliverHandled.getOrderType()));
deliverHandled.setDeliveryWayVal(transactionMap.get(EnumsPrefixConstants.DELIVERY + deliverHandled.getDeliveryWay()));
deliverHandled.setOperateScopeVal(transactionMap.get(EnumsPrefixConstants.SUPPLY_WAY + deliverHandled.getOperateScope()));
deliverHandled.setPreSaleStatusVal(transactionMap.get(EnumsPrefixConstants.PRESALE_STATUS + deliverHandled.getPreSaleStatus()));
deliverHandled.setPrintStatusVal(transactionMap.get(EnumsPrefixConstants.E_PRINT_STATUS + deliverHandled.getPrintStatus()));
deliverHandled.setTranTypeVal(transactionMap.get(EnumsPrefixConstants.ENU_TRA + deliverHandled.getTranType()));
deliverHandled.setShippingChannelVal(transactionMap.get(EnumsPrefixConstants.E_SHIPPING_CHANNEL + deliverHandled.getShippingChannel()));
deliverHandled.setRecProvinceVal(deliverHandled.getRecProvinceVal());
deliverHandled.setRecCityVal(StringUtils.isNotEmpty(deliverHandled.getRecCityVal()) ? deliverHandled.getRecCityVal() : "");

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

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

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

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