ufo / yohoufo-fore · Commits

Go to a project

Authored by mali
Commit dcb28515bcb7a5067fef881f2ffcf7d661692f72 2 parents 77554e7b 6180eae0

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

Inline Side-by-side
Showing 2 changed files with 5 additions and 5 deletions
... ... @@ -38,7 +38,7 @@ public enum ButtonShow {
return bo;
}
public ButtonShowBo getBo(CancelType cancelType) {
public static ButtonShowBo getButtonShowBo(ButtonShowBo bo, CancelType cancelType) {
if(cancelType == null){
return bo;
}
... ...
... ... @@ -18,8 +18,8 @@ public enum SkupStatus {
*/
CAN_SELL(1, "出售中",
new Node(
Arrays.asList(ButtonShow.NOT_SOLD.getBo(CancelType.PLAY_SELF), ButtonShow.SHOW_DETAIL.getBo()),
Arrays.asList(ButtonShow.NOT_SOLD.getBo(CancelType.PLAY_SELF)),
Arrays.asList(ButtonShow.NOT_SOLD.getBo(), ButtonShow.SHOW_DETAIL.getBo()),
Arrays.asList(ButtonShow.NOT_SOLD.getBo()),
OrderDetailDesc.Seller.PAY_FINISH,
OrderDetailDesc.PaymentTips.AUTO_RETURN_SELLER
)
... ... @@ -29,8 +29,8 @@ public enum SkupStatus {
*/
CAN_NOT_SELL(0,"待付保证金",
new Node(
Arrays.asList(ButtonShow.NOT_SOLD.getBo(CancelType.SELF_BEFORE_PAY), ButtonShow.PAY_EARNESTMONEY.getBo()),
Arrays.asList(ButtonShow.NOT_SOLD.getBo(CancelType.SELF_BEFORE_PAY), ButtonShow.PAY_EARNESTMONEY.getBo()),
Arrays.asList(ButtonShow.NOT_SOLD.getBo(), ButtonShow.PAY_EARNESTMONEY.getBo()),
Arrays.asList(ButtonShow.NOT_SOLD.getBo(), ButtonShow.PAY_EARNESTMONEY.getBo()),
OrderDetailDesc.Seller.WAIT_PAY,
OrderDetailDesc.PaymentTips.AUTO_RETURN_SELLER
)
... ...