tashow/tashow-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/feature/order' into feature/order

Browse Source
This commit is contained in:
xuelijun
2025-10-24 17:29:48 +08:00
parent b2e0cca804 22b96b6feb
commit 15e801e426
22 changed files with 729 additions and 523 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
tashow-feign/tashow-trade-api/src/main/java/com/tashow/cloud/tradeapi/enums/order/TradeOrderStatusEnum.java
View File

@@ -17,17 +17,15 @@ import java.util.Arrays;
@Getter
public enum TradeOrderStatusEnum implements ArrayValuable<Integer> {
UNPAID(0, "待支付"),
UNDELIVERED(10, "待发货"),
DELIVERED(20, "已发货"),
COMPLETED(30, "已完成"),
CANCELED(40, "已取消"),
WAITPAID(100, "等待付款"),
WAITCONFIRM(110, "等待确定"),
WAITSERVE(120, "等待服务"),
WAITACCEPT(130, "等待验收"),
SERVECANCELED(140, "取消服务");
WAITPAID(10, "等待付款"),
WAITCONFIRM(20, "等待确定"),
WAITSERVE(30, "等待服务"),
WAITACCEPT(40, "等待验收"),
COMPLETED(50, "已完成"),
CANCELED(60, "已取消"),
DELIVERED(70, "已退款"),
WAITDELIVERED(80, "待发货"),
;
public static final Integer[] ARRAYS = Arrays.stream(values()).map(TradeOrderStatusEnum::getStatus).toArray(Integer[]::new);
@@ -55,7 +53,7 @@ public enum TradeOrderStatusEnum implements ArrayValuable<Integer> {
* @return 是否
*/
public static boolean isUnpaid(Integer status) {
return ObjectUtil.equal(UNPAID.getStatus(), status);
return ObjectUtil.equal(WAITPAID.getStatus(), status);
}
/**
@@ -65,7 +63,7 @@ public enum TradeOrderStatusEnum implements ArrayValuable<Integer> {
* @return 是否
*/
public static boolean isUndelivered(Integer status) {
return ObjectUtil.equal(UNDELIVERED.getStatus(), status);
return ObjectUtil.equal(WAITDELIVERED.getStatus(), status);
}
/**
@@ -105,7 +103,7 @@ public enum TradeOrderStatusEnum implements ArrayValuable<Integer> {
* @return 是否
*/
public static boolean havePaid(Integer status) {
return ObjectUtils.equalsAny(status, UNDELIVERED.getStatus(),
return ObjectUtils.equalsAny(status, WAITCONFIRM.getStatus(),
DELIVERED.getStatus(), COMPLETED.getStatus());
}