liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
邹宗楠
2022-07-14 14:01:38 +08:00
parent 3ff2c41fc8
commit 8d162be090
11 changed files with 40 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
business/model/dao/store.go
View File

@@ -1387,7 +1387,7 @@ func GetBrandBalance(db *DaoDB, brandID int) (result int, err error) {
return balance.Balance, err
}
func GetBrandBill(db *DaoDB, brandID int, vendorOrderID string, billType, feeType int) (result []*model.BrandBill, err error) {
func GetBrandBill(db *DaoDB, brandID int, vendorOrderID string, billType, feeType int, vendorWaybillOrderID string) (result []*model.BrandBill, err error) {
sql := `
SELECT *
FROM brand_bill
@@ -1410,6 +1410,10 @@ func GetBrandBill(db *DaoDB, brandID int, vendorOrderID string, billType, feeTyp
sql += " AND vendor_order_id = ?"
sqlParams = append(sqlParams, vendorOrderID)
}
if vendorWaybillOrderID != "" {
sql += " AND order_id = ?"
sqlParams = append(sqlParams, vendorWaybillOrderID)
}
err = GetRows(db, &result, sql, sqlParams)
return result, err
}
@@ -1486,6 +1490,7 @@ func InsertBrandCategories(db *DaoDB, userName string, brandID int) (err error)
_, err = ExecuteSQL(db, sql, sqlParams)
return err
}
//
//// 根据国美门店id获取门店名称
//func GetStoreByVendorId(db *DaoDB, vendorOrderID string, vendorCode int) (storeMaps []*model.StoreCourierMap, err error) {