活动

business/model/dao/dao_order.go

@@ -1397,7 +1397,7 @@ func GetSupplySupportStoreSkus(db *DaoDB, fromDate, toDate time.Time, fromStoreI
 	return orderSkus, err
 }
 
-func GetPriceDefendOrder(db *DaoDB, storeIDs, skuIDs, issues []int) (priceDefendOrders []*model.PriceDefendOrder, err error) {
+func GetPriceDefendOrder(db *DaoDB, storeIDs, skuIDs, issues []int, defendPrice, isBuyNowPrice, isSuccess int) (priceDefendOrders []*model.PriceDefendOrder, err error) {
 	sql := ` 
 		SELECT *
 		  FROM price_defend_order
@@ -1416,6 +1416,19 @@ func GetPriceDefendOrder(db *DaoDB, storeIDs, skuIDs, issues []int) (priceDefend
 		sql += " AND issue IN (" + GenQuestionMarks(len(issues)) + ")"
 		sqlParams = append(sqlParams, issues)
 	}
+	if defendPrice != 0 {
+		sql += " AND defend_price = ?"
+		sqlParams = append(sqlParams, defendPrice)
+	}
+	if isBuyNowPrice != -1 {
+		sql += " AND is_buy_now_price = ?"
+		sqlParams = append(sqlParams, isBuyNowPrice)
+	}
+	if isSuccess != -1 {
+		sql += " AND is_success = ?"
+		sqlParams = append(sqlParams, isSuccess)
+	}
+	sql += " ORDER BY created_at"
 	err = GetRows(db, &priceDefendOrders, sql, sqlParams)
 	return priceDefendOrders, err
 }

business/model/order.go

@@ -28,7 +28,7 @@ const (
 
 const (
 	OrderTypeNormal      = 0 //普通订单
-	OrderTypeMatter      = 0 //物料订单
+	OrderTypeMatter      = 1 //物料订单
 	OrderTypeSupplyGoods = 2 //进货订单
 	OrderTypeDefendPrice = 3 //守价订单
 )
@@ -392,6 +392,7 @@ type PriceDefendOrder struct {
 	Count          int    `json:"count"`
 	DefendPrice    int64  `json:"defendPrice"`    //守的价格
 	ActualPayPrice int64  `json:"actualPayPrice"` //单位为分 顾客实际支付
+	RealPrice      int64  `json:"realPrice"`      //实际成交价
 	IsBuyNowPrice  int    `json:"isBuyNowPrice"`  //库存剩x(x=当前客户购买的数量)时以当时价抢购
 	Issue          int    `json:"issue"`          //期数，每晚22：00以后的守价单是归在第二天的期数中
 	IsSuccess      int    `json:"isSuccess"`      //是否抢购成功