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:
邹宗楠
2023-10-24 15:20:51 +08:00
parent 70d68a7821
commit 75ad9785f3
3 changed files with 4 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
business/jxcallback/scheduler/basesch/basesch_ext.go
View File

@@ -111,7 +111,6 @@ func (c *BaseScheduler) PickupGoodsAndUpdateStatus(ctx *jxcontext.Context, vendo
if err == nil { if err == nil {
flag := model.IsOrderDeliveryByStore(order) || model.IsOrderDeliveryBySelf(order) flag := model.IsOrderDeliveryByStore(order) || model.IsOrderDeliveryBySelf(order)
err = c.PickupGoods(order, flag, userName) err = c.PickupGoods(order, flag, userName)
globals.SugarLogger.Debugf("===========PickupGoodsAndUpdateStatus := %v", err)
if err == nil { if err == nil {
order.Status = model.OrderStatusFinishedPickup order.Status = model.OrderStatusFinishedPickup
if err = partner.CurOrderManager.UpdateOrderStatusAndDeliveryFlag(order); err != nil { if err = partner.CurOrderManager.UpdateOrderStatusAndDeliveryFlag(order); err != nil {

2
business/partner/purchase/tao_vegetable/order.go
View File

@@ -518,7 +518,6 @@ func (c *PurchaseHandler) PickupGoods(order *model.GoodsOrder, isSelfDelivery bo
for i := 0; i < 3; i++ { for i := 0; i < 3; i++ {
err2 := api.DeliveryFinish(param) err2 := api.DeliveryFinish(param)
if err2 != nil { if err2 != nil {
globals.SugarLogger.Debugf("=======err2 := %v", err2)
time.Sleep(200 * time.Millisecond) time.Sleep(200 * time.Millisecond)
err = err2 err = err2
continue continue
@@ -530,7 +529,6 @@ func (c *PurchaseHandler) PickupGoods(order *model.GoodsOrder, isSelfDelivery bo
} }
} }
globals.SugarLogger.Debugf("=======err := %v", err)
return err return err
} }

25
business/partner/purchase/tao_vegetable/tao.go
View File

@@ -3,7 +3,6 @@ package tao_vegetable
import ( import (
"fmt" "fmt"
"git.rosy.net.cn/baseapi/platformapi/tao_vegetable" "git.rosy.net.cn/baseapi/platformapi/tao_vegetable"
"git.rosy.net.cn/jx-callback/business/model/dao"
"strings" "strings"
"sync" "sync"
@@ -211,28 +210,12 @@ func (p *PurchaseHandler) getUploadImgPoiCode() (poiCode string) {
// getAPI 包含门店token // getAPI 包含门店token
func getAPI(appOrgCode string, storeID int, vendorStoreID string) (apiObj *tao_vegetable.API) { func getAPI(appOrgCode string, storeID int, vendorStoreID string) (apiObj *tao_vegetable.API) {
if appOrgCode != "" { if vendorStoreID != "" {
apiObj = partner.CurAPIManager.GetAPI(model.VendorIDTaoVegetable, appOrgCode).(*tao_vegetable.API)
} else if appOrgCode == "" && vendorStoreID != "" {
apiObj = partner.CurAPIManager.GetAPI(model.VendorIDTaoVegetable, getStoreVendorOrgCodeByVendorStoreID(vendorStoreID)).(*tao_vegetable.API) apiObj = partner.CurAPIManager.GetAPI(model.VendorIDTaoVegetable, getStoreVendorOrgCodeByVendorStoreID(vendorStoreID)).(*tao_vegetable.API)
} else if appOrgCode == "" && storeID != 0 { } else if storeID != 0 {
apiObj = partner.CurAPIManager.GetAPI(model.VendorIDTaoVegetable, getStoreVendorOrgCode(storeID)).(*tao_vegetable.API) apiObj = partner.CurAPIManager.GetAPI(model.VendorIDTaoVegetable, getStoreVendorOrgCode(storeID)).(*tao_vegetable.API)
} else { } else if appOrgCode != "" {
apiObj = nil apiObj = partner.CurAPIManager.GetAPI(model.VendorIDTaoVegetable, appOrgCode).(*tao_vegetable.API)
}
if apiObj != nil {
if storeID != model.NO {
storeMap, _ := dao.GetStoreDetail(dao.GetDB(), storeID, model.VendorIDTaoVegetable, "")
if storeMap.MtwmToken != "" {
apiObj.SetToken(storeMap.MtwmToken)
}
} else if vendorStoreID != "" {
storeMap, _ := dao.GetStoreDetailForDD(dao.GetDB(), 0, model.VendorIDTaoVegetable, vendorStoreID, "")
if storeMap.MtwmToken != "" {
apiObj.SetToken(storeMap.MtwmToken)
}
}
} }
return apiObj return apiObj
} }