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

storedetail

Browse Source
This commit is contained in:
苏尹岚
2020-11-18 10:22:12 +08:00
parent 5a6dae8d53
commit d14bb10be7
29 changed files with 81 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
business/partner/purchase/jx/localjx/order.go
View File

@@ -428,7 +428,7 @@ func findDiscountCard(dicountCards []*model.DiscountCard, thingID int) (dicountC
func GetAvailableDeliverTime(ctx *jxcontext.Context, storeID int) (deliverTimerList []*DeliveryDayTimeInfo, err error) {
db := dao.GetDB()
storeDetail, err := dao.GetStoreDetail(db, storeID, model.VendorIDJX)
storeDetail, err := dao.GetStoreDetail(db, storeID, model.VendorIDJX, "")
if err != nil {
return nil, err
}
@@ -590,7 +590,7 @@ func generateOrder(ctx *jxcontext.Context, jxOrder *JxOrderInfo, addressID int64
return nil, nil, fmt.Errorf("没有指定门店信息")
}
// 配送范围检查
storeDetail, err := dao.GetStoreDetail(db, jxOrder.StoreID, model.VendorIDJX)
storeDetail, err := dao.GetStoreDetail(db, jxOrder.StoreID, model.VendorIDJX, "")
if err != nil {
return nil, nil, err
}
@@ -874,7 +874,7 @@ func generateOrder(ctx *jxcontext.Context, jxOrder *JxOrderInfo, addressID int64
//表示此订单为物料配送订单
if jxOrder.OrderType != model.OrderTypeNormal {
// if fromStoreID != 0 {
storeDetail2, err2 := dao.GetStoreDetail(db, fromStoreID, model.VendorIDJX)
storeDetail2, err2 := dao.GetStoreDetail(db, fromStoreID, model.VendorIDJX, "")
if err = err2; err != nil {
return nil, nil, fmt.Errorf("fromStoreID有误,[%v]", fromStoreID)
}