1

business/jxcallback/scheduler/basesch/basesch_ext.go

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

business/partner/purchase/tao_vegetable/order.go

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

business/partner/purchase/tao_vegetable/tao.go

@@ -3,7 +3,6 @@ package tao_vegetable
 import (
 	"fmt"
 	"git.rosy.net.cn/baseapi/platformapi/tao_vegetable"
-	"git.rosy.net.cn/jx-callback/business/model/dao"
 	"strings"
 	"sync"
 
@@ -211,28 +210,12 @@ func (p *PurchaseHandler) getUploadImgPoiCode() (poiCode string) {
 
 // getAPI 包含门店token
 func getAPI(appOrgCode string, storeID int, vendorStoreID string) (apiObj *tao_vegetable.API) {
-	if appOrgCode != "" {
-		apiObj = partner.CurAPIManager.GetAPI(model.VendorIDTaoVegetable, appOrgCode).(*tao_vegetable.API)
-	} else if appOrgCode == "" && vendorStoreID != "" {
+	if vendorStoreID != "" {
 		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)
-	} else {
-		apiObj = nil
-	}
-
-	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)
-			}
-		}
+	} else if appOrgCode != "" {
+		apiObj = partner.CurAPIManager.GetAPI(model.VendorIDTaoVegetable, appOrgCode).(*tao_vegetable.API)
 	}
 	return apiObj
 }