价格统计

2020-01-02 15:32:24 +08:00
parent b2ff93af36 c444202330
commit 3572cace45
9 changed files with 115 additions and 57 deletions
--- a/business/model/const.go
+++ b/business/model/const.go
@@ -41,8 +41,10 @@ var (
 		OrderStatusUnlocked: "解锁",
 		OrderStatusLocked:   "锁定",
 		// OrderStatusApplyRefund:    "申请退款",
-		OrderStatusUndoApplyCancel: "取消申请取消",
-		OrderStatusApplyCancel:     "申请取消",
+		OrderStatusUndoApplyCancel:    "取消申请取消",
+		OrderStatusVendorRejectCancel: "拒绝取消",
+		OrderStatusVendorAgreeCancel:  "同意取消",
+		OrderStatusApplyCancel:        "申请取消",

 		OrderStatusUnknown: "一般事件",

--- a/business/model/dao/act.go
+++ b/business/model/dao/act.go
@@ -395,14 +395,8 @@ func GetEffectiveActStoreSkuInfo(db *DaoDB, actID int, vendorIDs []int, actType
 		model.SyncFlagNewMask,
 		model.ActSkuFake,

-		utils.DefaultTimeValue,
-		model.SyncFlagNewMask,
-		model.ActSkuFake,
-
-		utils.DefaultTimeValue,
-		model.ActStatusCreated,
-		endAt,
-		beginAt,
+		utils.DefaultTimeValue, model.SyncFlagNewMask, model.ActSkuFake,
+		utils.DefaultTimeValue, model.ActStatusCreated, endAt, beginAt,
 	}
 	if len(vendorIDs) > 0 {
 		sql += " AND (t1.vendor_mask & ?) <> 0 AND t3.vendor_id IN (" + GenQuestionMarks(len(vendorIDs)) + ")"
--- a/business/model/sku.go
+++ b/business/model/sku.go
@@ -93,6 +93,7 @@ var (
 		"鲜切",
 		"进口",
 		"冰镇",
+		"预售",
 	}

 	SpecialUnit        = "份"