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

- 修复addStoreCourierMap中的BUG

Browse Source
This commit is contained in:
gazebo
2019-07-29 10:54:51 +08:00
parent 0b4f953800
commit 91530d4e57
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
business/jxstore/cms/store.go
View File

@@ -1015,14 +1015,14 @@ func AddStoreCourierMap(ctx *jxcontext.Context, db *dao.DaoDB, storeID, vendorID
} }
func addStoreCourierMap(ctx *jxcontext.Context, db *dao.DaoDB, storeID, vendorID int, storeCourierMap *model.StoreCourierMap, isNeedUpdateRemote bool) (outStoreCourierMap *model.StoreCourierMap, err error) { func addStoreCourierMap(ctx *jxcontext.Context, db *dao.DaoDB, storeID, vendorID int, storeCourierMap *model.StoreCourierMap, isNeedUpdateRemote bool) (outStoreCourierMap *model.StoreCourierMap, err error) {
storeCourierMap.StoreID = storeID
storeCourierMap.VendorID = vendorID
globals.SugarLogger.Debugf("addStoreCourierMap %s, storeCourierMap:%s, isNeedUpdateRemote:%t", model.VendorChineseNames[vendorID], utils.Format4Output(storeCourierMap, true), isNeedUpdateRemote) globals.SugarLogger.Debugf("addStoreCourierMap %s, storeCourierMap:%s, isNeedUpdateRemote:%t", model.VendorChineseNames[vendorID], utils.Format4Output(storeCourierMap, true), isNeedUpdateRemote)
if handler := partner.GetDeliveryPlatformFromVendorID(vendorID); handler != nil { if handler := partner.GetDeliveryPlatformFromVendorID(vendorID); handler != nil {
if db == nil { if db == nil {
db = dao.GetDB() db = dao.GetDB()
} }
storeCourierMap.StoreID = storeID
storeCourierMap.VendorID = vendorID
if isNeedUpdateRemote { if isNeedUpdateRemote {
storeDetail, err2 := dao.GetStoreDetail2(db, storeID, "", vendorID) storeDetail, err2 := dao.GetStoreDetail2(db, storeID, "", vendorID)
if err = err2; err != nil { if err = err2; err != nil {
@@ -1031,6 +1031,7 @@ func addStoreCourierMap(ctx *jxcontext.Context, db *dao.DaoDB, storeID, vendorID
if storeDetail.VendorStoreID != "" { if storeDetail.VendorStoreID != "" {
return nil, fmt.Errorf("门店已经绑定了%s, ID:%s, 如需重新绑定, 请先解绑", model.VendorChineseNames[vendorID], storeDetail.VendorStoreID) return nil, fmt.Errorf("门店已经绑定了%s, ID:%s, 如需重新绑定, 请先解绑", model.VendorChineseNames[vendorID], storeDetail.VendorStoreID)
} }
storeDetail.VendorID = vendorID
storeDetail.VendorStoreID = storeCourierMap.VendorStoreID storeDetail.VendorStoreID = storeCourierMap.VendorStoreID
if err = updateCourierStore(ctx, storeDetail); err != nil { if err = updateCourierStore(ctx, storeDetail); err != nil {
return nil, err return nil, err