1

business/model/api.go

@@ -84,7 +84,8 @@ type OrderSkuExt struct {
 	Img4        string `orm:"size(512)" json:"image4"`  //第三张图片
 	Img5        string `orm:"size(512)" json:"image5"`  //第三张图片
 	DescImg     string `orm:"size(255)" json:"descImg"` // 商品详情图片描述
-	Upc         string `json:"upc"`
+	Upc         string `json:"upc"`                     //
+	Price       int64  `json:"price"`                   // 商品库价格
 	// RealEarningPrice int64  `json:"realEarningPrice"` // 实际单品结算给门店老板钱
 }
 

business/model/dao/dao_order.go

@@ -518,22 +518,14 @@ func GetStoreOrderSkuList4Afs2(db *DaoDB, vendorOrderIDs []string) (skuList []*O
 	return skuList, err
 }
 
-func GetStoreAfsOrderSkuList(db *DaoDB, storeIDs []int, finishedAtBegin, finishedAtEnd time.Time, statusList []int, isFinish bool) (afsSkuList []*model.OrderSkuFinancial, err error) {
+func GetStoreAfsOrderSkuList(db *DaoDB, storeIDs []int, statusList []int) (afsSkuList []*model.OrderSkuFinancial, err error) {
 	sql := `
 	SELECT t1.*
 	FROM order_sku_financial t1
 	JOIN afs_order t2 ON t2.vendor_order_id = t1.vendor_order_id AND t2.vendor_id = t1.vendor_id AND t2.afs_order_id = t1.afs_order_id
 	WHERE t1.is_afs_order = 1
 	`
-	if isFinish {
-		sql += " AND t2.afs_finished_at >= ? AND t2.afs_finished_at <= ?"
-	} else {
-		sql += " AND t2.afs_created_at >= ? AND t2.afs_created_at <= ?"
-	}
-	sqlParams := []interface{}{
-		finishedAtBegin,
-		finishedAtEnd,
-	}
+	sqlParams := []interface{}{}
 	if len(storeIDs) > 0 {
 		sql += " AND IF(t2.jx_store_id > 0, t2.jx_store_id, t2.store_id) IN (" + GenQuestionMarks(len(storeIDs)) + ")"
 		sqlParams = append(sqlParams, storeIDs)