ufo / yohoufo-fore · Commits

Go to a project

Authored by sailing-PC\sailing
Commit f5a41be5414ab274ea361db8c5f1b1e3c150fc07 1 parent dcb28515

fix

Inline Side-by-side
Showing 5 changed files with 68 additions and 48 deletions
... ... @@ -28,10 +28,12 @@ public enum ButtonShow {
bo = new ButtonShowBo(name(), code, value);
}
ButtonShow(String code,String value, String confirmTips) {
this.code = code;
this.value = value;
bo = new ButtonShowBo(name(), code, value, confirmTips);
public String getCode() {
return code;
}
public String getValue() {
return value;
}
public ButtonShowBo getBo() {
... ...
package com.yohoufo.order.common;
import com.google.common.collect.Lists;
import com.yohoufo.order.constants.ConfirmDesc;
import com.yohoufo.order.constants.OrderDetailDesc;
import com.yohoufo.order.model.bo.ButtonShowBo;
... ... @@ -15,13 +16,13 @@ public enum OrderStatus {
WAITING_PAY(0, "未付款", new Node[]{
new Node(
"待付款",
Arrays.asList(ButtonShow.CANCEL_ORDER, ButtonShow.NOW_BUY),
Arrays.asList(ButtonShow.CANCEL_ORDER, ButtonShow.NOW_BUY),
Arrays.asList(ButtonShow.CANCEL_ORDER.getBo(), ButtonShow.NOW_BUY.getBo()),
Arrays.asList(ButtonShow.CANCEL_ORDER.getBo(), ButtonShow.NOW_BUY.getBo()),
OrderDetailDesc.NO_PAY
),
new Node(
"待买家付款",
Arrays.asList(ButtonShow.SHOW_DETAIL),
Arrays.asList(ButtonShow.SHOW_DETAIL.getBo()),
null,
OrderDetailDesc.Seller.BUYER_NO_PAY
)
... ... @@ -30,14 +31,14 @@ public enum OrderStatus {
HAS_PAYED(1, "已付款", new Node[]{
new Node(
"商品调拨中",
Arrays.asList(ButtonShow.SHOW_DETAIL),
Arrays.asList(ButtonShow.SHOW_DETAIL.getBo()),
Lists.newArrayList(),
OrderDetailDesc.BUY_HAS_PAID
),
new Node(
"待发货",
Arrays.asList(ButtonShow.NOT_SOLD, ButtonShow.DELIVER_GOODS),
Arrays.asList(ButtonShow.NOT_SOLD, ButtonShow.DELIVER_GOODS),
Arrays.asList(new ButtonShowBo(ButtonShow.NOT_SOLD, ConfirmDesc.PLAY_BUYER), ButtonShow.DELIVER_GOODS.getBo()),
Arrays.asList(new ButtonShowBo(ButtonShow.NOT_SOLD, ConfirmDesc.PLAY_BUYER), ButtonShow.DELIVER_GOODS.getBo()),
OrderDetailDesc.Seller.BUYER_HAS_PAID
)
}),
... ... @@ -45,14 +46,14 @@ public enum OrderStatus {
SELLER_SEND_OUT(2, "商品调拨中(卖家发货，可查物流)", new Node[]{
new Node(
"商品调拨中",
Arrays.asList(ButtonShow.SHOW_DETAIL),
Arrays.asList(ButtonShow.SHOW_DETAIL.getBo()),
Lists.newArrayList(),
OrderDetailDesc.SELL_HAS_SENDED
),
new Node(
"已发货",
Arrays.asList(ButtonShow.SHOW_DETAIL, ButtonShow.SHOW_EXPRESS),
Arrays.asList(ButtonShow.SHOW_EXPRESS),
Arrays.asList(ButtonShow.SHOW_DETAIL.getBo(), ButtonShow.SHOW_EXPRESS.getBo()),
Arrays.asList(ButtonShow.SHOW_EXPRESS.getBo()),
null
)
}),
... ... @@ -60,14 +61,14 @@ public enum OrderStatus {
PLATFORM_CHECKING(3, "有货平台鉴定中", new Node[]{
new Node(
"有货平台鉴定中",
Arrays.asList(ButtonShow.SHOW_DETAIL),
Arrays.asList(ButtonShow.SHOW_DETAIL.getBo()),
Lists.newArrayList(),
OrderDetailDesc.PLATFORM_SEND
),
new Node(
"有货平台鉴定中",
Arrays.asList(ButtonShow.SHOW_DETAIL, ButtonShow.SHOW_EXPRESS),
Arrays.asList(ButtonShow.SHOW_EXPRESS),
Arrays.asList(ButtonShow.SHOW_DETAIL.getBo(), ButtonShow.SHOW_EXPRESS.getBo()),
Arrays.asList(ButtonShow.SHOW_EXPRESS.getBo()),
OrderDetailDesc.Seller.IN_CHECK
)
}),
... ... @@ -75,15 +76,15 @@ public enum OrderStatus {
WAITING_RECEIVE(4, "待收货", new Node[]{
new Node(
"待收货",
Arrays.asList(ButtonShow.SHOW_EXPRESS, ButtonShow.CONFIRM_DELIVERY),
Arrays.asList(ButtonShow.SHOW_EXPRESS, ButtonShow.CONFIRM_DELIVERY),
Arrays.asList(ButtonShow.SHOW_EXPRESS.getBo(), ButtonShow.CONFIRM_DELIVERY.getBo()),
Arrays.asList(ButtonShow.SHOW_EXPRESS.getBo(), ButtonShow.CONFIRM_DELIVERY.getBo()),
OrderDetailDesc.CHECK_OK_SEND
),
new Node(
"交易成功",
Arrays.asList(ButtonShow.SHOW_DETAIL, ButtonShow.DEL_ORDER),
Arrays.asList( ButtonShow.DEL_ORDER),
Arrays.asList(ButtonShow.SHOW_DETAIL.getBo(), ButtonShow.DEL_ORDER.getBo()),
Arrays.asList( ButtonShow.DEL_ORDER.getBo()),
OrderDetailDesc.Seller.TRADE_DONE
)
}),
... ... @@ -91,14 +92,14 @@ public enum OrderStatus {
DONE(5, "已完成", new Node[]{
new Node(
"交易成功",
Arrays.asList(ButtonShow.BUY_AGAIN, ButtonShow.DEL_ORDER),
Arrays.asList(ButtonShow.BUY_AGAIN, ButtonShow.DEL_ORDER),
Arrays.asList(ButtonShow.BUY_AGAIN.getBo(), ButtonShow.DEL_ORDER.getBo()),
Arrays.asList(ButtonShow.BUY_AGAIN.getBo(), ButtonShow.DEL_ORDER.getBo()),
OrderDetailDesc.DONE
),
new Node(
"交易成功",
Arrays.asList(ButtonShow.SHOW_DETAIL, ButtonShow.DEL_ORDER),
Arrays.asList( ButtonShow.DEL_ORDER),
Arrays.asList(ButtonShow.SHOW_DETAIL.getBo(), ButtonShow.DEL_ORDER.getBo()),
Arrays.asList( ButtonShow.DEL_ORDER.getBo()),
OrderDetailDesc.Seller.TRADE_DONE
)
} ),
... ... @@ -114,8 +115,8 @@ public enum OrderStatus {
SELLER_CANCEL_AFTER_PAY(11, "买家付款后卖家取消", new Node[]{
new Node(
"交易失败",
Arrays.asList(ButtonShow.BUY_AGAIN, ButtonShow.DEL_ORDER),
Arrays.asList(ButtonShow.BUY_AGAIN, ButtonShow.DEL_ORDER),
Arrays.asList(ButtonShow.BUY_AGAIN.getBo(), ButtonShow.DEL_ORDER.getBo()),
Arrays.asList(ButtonShow.BUY_AGAIN.getBo(), ButtonShow.DEL_ORDER.getBo()),
OrderDetailDesc.SELL_CANCEL_SEND
),
buildFail4Seller(OrderDetailDesc.Seller.NO_SALE)
... ... @@ -125,8 +126,8 @@ public enum OrderStatus {
SEND_OUT_TIMEOUT(12, "超时未发货取消", new Node[]{
new Node(
"交易失败",
Arrays.asList(ButtonShow.BUY_AGAIN, ButtonShow.DEL_ORDER),
Arrays.asList(ButtonShow.BUY_AGAIN, ButtonShow.DEL_ORDER),
Arrays.asList(ButtonShow.BUY_AGAIN.getBo(), ButtonShow.DEL_ORDER.getBo()),
Arrays.asList(ButtonShow.BUY_AGAIN.getBo(), ButtonShow.DEL_ORDER.getBo()),
OrderDetailDesc.SELL_TIMETOUT_CANCEL
),
buildFail4Seller(OrderDetailDesc.Seller.DELIVER_GOODS_TIMEOUT)
... ... @@ -136,8 +137,8 @@ public enum OrderStatus {
CHECKING_FAKE(13, "鉴定不通过取消", new Node[]{
new Node(
"交易失败",
Arrays.asList(ButtonShow.BUY_AGAIN, ButtonShow.DEL_ORDER),
Arrays.asList(ButtonShow.BUY_AGAIN, ButtonShow.DEL_ORDER),
Arrays.asList(ButtonShow.BUY_AGAIN.getBo(), ButtonShow.DEL_ORDER.getBo()),
Arrays.asList(ButtonShow.BUY_AGAIN.getBo(), ButtonShow.DEL_ORDER.getBo()),
OrderDetailDesc.CHECK_FAKE
),
buildFail4Seller(OrderDetailDesc.Seller.CHECK_FAIL)
... ... @@ -146,8 +147,8 @@ public enum OrderStatus {
BUYER_CANCEL_BEFORE_PAY(14, "支付前取消", new Node[]{
new Node(
"交易失败",
Arrays.asList(ButtonShow.BUY_AGAIN, ButtonShow.DEL_ORDER),
Arrays.asList(ButtonShow.BUY_AGAIN, ButtonShow.DEL_ORDER),
Arrays.asList(ButtonShow.BUY_AGAIN.getBo(), ButtonShow.DEL_ORDER.getBo()),
Arrays.asList(ButtonShow.BUY_AGAIN.getBo(), ButtonShow.DEL_ORDER.getBo()),
OrderDetailDesc.BUY_CANCEL
),
buildFail4Seller(OrderDetailDesc.Seller.BUYER_CANCEL)
... ... @@ -156,8 +157,8 @@ public enum OrderStatus {
BUYER_CANCEL_TIMEOUT(15, "超时未支付取消", new Node[]{
new Node(
"交易失败",
Arrays.asList(ButtonShow.BUY_AGAIN, ButtonShow.DEL_ORDER),
Arrays.asList(ButtonShow.BUY_AGAIN, ButtonShow.DEL_ORDER),
Arrays.asList(ButtonShow.BUY_AGAIN.getBo(), ButtonShow.DEL_ORDER.getBo()),
Arrays.asList(ButtonShow.BUY_AGAIN.getBo(), ButtonShow.DEL_ORDER.getBo()),
OrderDetailDesc.BUY_TIMEOUT_CANCEL
),
buildFail4Seller(OrderDetailDesc.Seller.BUYER_CANCEL_OF_TIMEOUT)
... ... @@ -180,8 +181,8 @@ public enum OrderStatus {
static Node buildFail4Seller(String detailDesc){
return new Node(
"交易失败",
Arrays.asList(ButtonShow.SHOW_DETAIL, ButtonShow.DEL_ORDER),
Arrays.asList(ButtonShow.DEL_ORDER),
Arrays.asList(ButtonShow.SHOW_DETAIL.getBo(), ButtonShow.DEL_ORDER.getBo()),
Arrays.asList(ButtonShow.DEL_ORDER.getBo()),
detailDesc
);
}
... ... @@ -267,16 +268,12 @@ public enum OrderStatus {
public Node(String statusStr,
List<ButtonShow> listButtons,
List<ButtonShow> detailButtons,
List<ButtonShowBo> listButtons,
List<ButtonShowBo> detailButtons,
String detailDesc) {
this.statusStr = statusStr;
if (listButtons != null && !listButtons.isEmpty()){
this.listButtons = listButtons.parallelStream().map(ButtonShow::getBo).collect(Collectors.toList());
}
if (detailButtons !=null && !detailButtons.isEmpty()){
this.detailButtons = detailButtons.parallelStream().map(ButtonShow::getBo).collect(Collectors.toList());
};
this.listButtons = listButtons;
this.detailButtons = detailButtons;
this.detailDesc = detailDesc;
}
... ...
package com.yohoufo.order.common;
import com.yohoufo.order.constants.ConfirmDesc;
import com.yohoufo.order.constants.OrderDetailDesc;
import com.yohoufo.order.model.bo.ButtonShowBo;
... ... @@ -18,8 +19,8 @@ public enum SkupStatus {
*/
CAN_SELL(1, "出售中",
new Node(
Arrays.asList(ButtonShow.NOT_SOLD.getBo(), ButtonShow.SHOW_DETAIL.getBo()),
Arrays.asList(ButtonShow.NOT_SOLD.getBo()),
Arrays.asList(new ButtonShowBo(ButtonShow.NOT_SOLD, ConfirmDesc.PLAY_SELF), ButtonShow.SHOW_DETAIL.getBo()),
Arrays.asList(new ButtonShowBo(ButtonShow.NOT_SOLD, ConfirmDesc.PLAY_SELF)),
OrderDetailDesc.Seller.PAY_FINISH,
OrderDetailDesc.PaymentTips.AUTO_RETURN_SELLER
)
... ... @@ -29,8 +30,8 @@ public enum SkupStatus {
*/
CAN_NOT_SELL(0,"待付保证金",
new Node(
Arrays.asList(ButtonShow.NOT_SOLD.getBo(), ButtonShow.PAY_EARNESTMONEY.getBo()),
Arrays.asList(ButtonShow.NOT_SOLD.getBo(), ButtonShow.PAY_EARNESTMONEY.getBo()),
Arrays.asList(new ButtonShowBo(ButtonShow.NOT_SOLD, ConfirmDesc.SELF_BEFORE_PAY), ButtonShow.PAY_EARNESTMONEY.getBo()),
Arrays.asList(new ButtonShowBo(ButtonShow.NOT_SOLD, ConfirmDesc.SELF_BEFORE_PAY), ButtonShow.PAY_EARNESTMONEY.getBo()),
OrderDetailDesc.Seller.WAIT_PAY,
OrderDetailDesc.PaymentTips.AUTO_RETURN_SELLER
)
... ...
package com.yohoufo.order.constants;
/**
* Created by chenchao on 2018/10/15.
*/
public interface ConfirmDesc {
String SELF_BEFORE_PAY = "您确定不卖此商品吗？";
String PLAY_SELF = "您确定不卖此商品么？取消后保证金将原路退换至您的支付宝账户";
String PLAY_BUYER = "您确定不卖此商品么？取消后保证金将作为赔偿金打入买家账户";
}
... ...
package com.yohoufo.order.model.bo;
import com.yohoufo.order.common.ButtonShow;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
... ... @@ -18,6 +19,12 @@ public class ButtonShowBo {
String confirmTips;
public ButtonShowBo(ButtonShow buttonShow, String confirmTips){
this.name = buttonShow.name();
this.code = buttonShow.getCode();
this.text = buttonShow.getValue();
this.confirmTips = confirmTips;
}
public ButtonShowBo(String name, String code, String text) {
this.name = name;
... ...