+OrderStatusVendorRejectCancel,OrderStatusVendorAgreeCancel

business/model/const.go

@@ -35,7 +35,6 @@ var (
 		OrderStatusMsg:                  "通知消息",
 		OrderStatusRefuseFailedGetGoods: "取货失败审核驳回",
 		OrderStatusAdjust:               "订单调整完成",
-		OrderStatusWait4Pay:             "待付款",
 		OrderStatusApplyUrgeOrder:       "催单",
 
 		OrderStatusUnlocked: "解锁",
@@ -46,7 +45,7 @@ var (
 
 		OrderStatusUnknown: "一般事件",
 
-		OrderStatusCreated:             "待支付",
+		OrderStatusWait4Pay:            "待付款",
 		OrderStatusNew:                 "新订单",
 		OrderStatusAccepted:            "待拣货",
 		OrderStatusFinishedPickup:      "待配送",
@@ -163,17 +162,17 @@ const (
 
 	OrderStatusRefuseFailedGetGoods = -70 // 取货失败审核驳回
 	OrderStatusAdjust               = -65 // 原值-35 订单调整完成
-	OrderStatusWait4Pay             = -60 // 原值-30 下单待支付，微盟在这个时间发新订单事件
 	OrderStatusApplyUrgeOrder       = -55 // 原值-15
 
-	OrderStatusUnlocked = -25
-	OrderStatusLocked   = -20
-	// OrderStatusApplyRefund    = -10
-	OrderStatusUndoApplyCancel = -10
-	OrderStatusApplyCancel     = -5
+	OrderStatusUnlocked           = -25
+	OrderStatusLocked             = -20
+	OrderStatusUndoApplyCancel    = -10
+	OrderStatusVendorRejectCancel = -7
+	OrderStatusVendorAgreeCancel  = -6
+	OrderStatusApplyCancel        = -5
 
 	OrderStatusUnknown        = 0
-	OrderStatusCreated        = 2  // 已支付
+	OrderStatusWait4Pay       = 2  // 原值-60 下单待支付
 	OrderStatusNew            = 5  // 新订单，实际是已经支付
 	OrderStatusAccepted       = 10 // 已经接单，也即待出库，待拣货
 	OrderStatusFinishedPickup = 15 // 拣货完成
@@ -336,7 +335,7 @@ func IsOrderLockStatus(status int) bool {
 }
 
 func IsOrderUnlockStatus(status int) bool {
-	return status == OrderStatusUnlocked || status == OrderStatusUndoApplyCancel
+	return status == OrderStatusUnlocked || status == OrderStatusUndoApplyCancel || status == OrderStatusVendorAgreeCancel || status == OrderStatusVendorRejectCancel
 }
 
 func IsOrderMainStatus(status int) bool {

business/model/order.go

@@ -76,7 +76,7 @@ type GoodsOrder struct {
 	GoodsCount            int        `json:"goodsCount"`   // 商品个数
 	Status                int        `json:"status"`       // 参见OrderStatus*相关的常量定义
 	VendorStatus          string     `orm:"size(255)" json:"vendorStatus"`
-	LockStatus            int        `json:"lockStatus"`
+	LockStatus            int        `json:"lockStatus"`                               // 当前只支持单一锁定
 	LockStatusTime        time.Time  `orm:"type(datetime);null" json:"lockStatusTime"` // last lock status time
 	OrderSeq              int        `json:"orderSeq"`                                 // 门店订单序号
 	BuyerComment          string     `orm:"size(255)" json:"buyerComment"`