Authored by mali

Merge branch 'master' of http://git.yoho.cn/ufo/yohoufo-fore

... ... @@ -38,7 +38,7 @@ public enum OrderStatus {
"待发货",
Arrays.asList(ButtonShow.NOT_SOLD, ButtonShow.DELIVER_GOODS),
Arrays.asList(ButtonShow.NOT_SOLD, ButtonShow.DELIVER_GOODS),
OrderDetailDesc.Seller.BUYER_HAS_PAID, CancelType.PLAY_BUYER
OrderDetailDesc.Seller.BUYER_HAS_PAID
)
}),
... ... @@ -280,18 +280,6 @@ public enum OrderStatus {
this.detailDesc = detailDesc;
}
public Node(String statusStr,
List<ButtonShow> listButtons,
List<ButtonShow> detailButtons,
String detailDesc, CancelType cancelType) {
this.statusStr = statusStr;
if (listButtons != null && !listButtons.isEmpty()){
this.listButtons = listButtons.parallelStream().map(buttonShow -> buttonShow.getBo(cancelType)).collect(Collectors.toList());
}
if (detailButtons !=null && !detailButtons.isEmpty()){
this.detailButtons = detailButtons.parallelStream().map(buttonShow -> buttonShow.getBo(cancelType)).collect(Collectors.toList());
};
this.detailDesc = detailDesc;
}
}
}
... ...