- 新增OrderStatusUndoApplyCancel

business/model/const.go

@@ -73,8 +73,8 @@ var (
 		OrderStatusUnlocked:       "解锁",
 		OrderStatusLocked:         "锁定",
 		OrderStatusApplyUrgeOrder: "催单",
-		OrderStatusApplyRefund:    "申请退款",
-		OrderStatusApplyCancel:    "申请取消",
+		// OrderStatusApplyRefund:    "申请退款",
+		OrderStatusApplyCancel: "申请取消",
 
 		OrderStatusUnknown: "一般事件",
 
@@ -159,13 +159,15 @@ const (
 const (
 	OrderStatusMsg = -100
 
-	OrderStatusAdjust         = -35 // 订单调整完成
-	OrderStatusWait4Pay       = -30 // 下单待支付，微盟在这个时间发新订单事件
-	OrderStatusUnlocked       = -25
-	OrderStatusLocked         = -20
-	OrderStatusApplyUrgeOrder = -15
-	OrderStatusApplyRefund    = -10
-	OrderStatusApplyCancel    = -5
+	OrderStatusAdjust         = -65 // 原值-35 订单调整完成
+	OrderStatusWait4Pay       = -60 // 原值-30 下单待支付，微盟在这个时间发新订单事件
+	OrderStatusApplyUrgeOrder = -55 // 原值-15
+
+	OrderStatusUnlocked = -25
+	OrderStatusLocked   = -20
+	// OrderStatusApplyRefund    = -10
+	OrderStatusUndoApplyCancel = -10
+	OrderStatusApplyCancel     = -5
 
 	OrderStatusUnknown = 0
 
@@ -239,3 +241,23 @@ func IsPrinterVendorExist(vendorID int) bool {
 	_, ok := VendorNames[vendorID]
 	return ok && vendorID >= VendorIDPrinterBegin && vendorID <= VendorIDPrinterEnd
 }
+
+func IsOrderLockStatus(status int) bool {
+	return status == OrderStatusLocked || status == OrderStatusApplyCancel
+}
+
+func IsOrderUnlockStatus(status int) bool {
+	return status == OrderStatusUnlocked || status == OrderStatusUndoApplyCancel
+}
+
+func IsOrderMainStatus(status int) bool {
+	return status > OrderStatusUnknown
+}
+
+func IsOrderFinalStatus(status int) bool {
+	return status >= OrderStatusEndBegin
+}
+
+func IsOrderImportantStatus(status int) bool {
+	return IsOrderMainStatus(status) || IsOrderLockStatus(status) || IsOrderUnlockStatus(status)
+}