删除日志

2022-10-24 11:22:38 +08:00
parent 5a47102894
commit 5d6a5a3226
139 changed files with 17 additions and 787 deletions
--- a/business/partner/purchase/ebai/act.go
+++ b/business/partner/purchase/ebai/act.go
@@ -100,7 +100,6 @@ func act2EbaiActivity(act *model.Act2, actOrderRules []*model.ActOrderRule) (act
 }

 func createOneShopAct(act *model.Act2, shopID string, oneStoreActSku []*model.ActStoreSku2) (ebaiActIDStr string, err error) {
-	globals.SugarLogger.Debugf("ebai createOneShopAct")
 	activity := act2EbaiActivity(act, nil)
 	if globals.EnableEbaiStoreWrite {
 		ebaiActID, err2 := api.EbaiAPI.ActivityCreate(shopID, 0, 0, activity)
@@ -117,7 +116,6 @@ func createOneShopAct(act *model.Act2, shopID string, oneStoreActSku []*model.Ac
 }

 func ActivitySkuAddBatch(activityID int64, shopID string, baiduShopID int64, activityType int, skuList []*ebaiapi.ActivitySkuInfo4Add, isSkuIDCustom bool) (successIDs []string, err error) {
-	globals.SugarLogger.Debugf("ebai ActivitySkuAddBatch")
 	if globals.EnableEbaiStoreWrite {
 		successIDs, err = api.EbaiAPI.ActivitySkuAddBatch(activityID, shopID, baiduShopID, activityType, skuList, isSkuIDCustom)
 	} else {
@@ -129,7 +127,6 @@ func ActivitySkuAddBatch(activityID int64, shopID string, baiduShopID int64, act
 }

 func ActivitySkuDeleteBatch(activityID int64, shopID string, baiduShopID int64, skuIDs []string, isSkuIDCustom bool) (successIDs []string, err error) {
-	globals.SugarLogger.Debugf("ebai ActivitySkuDeleteBatch")
 	if globals.EnableEbaiStoreWrite {
 		successIDs, err = api.EbaiAPI.ActivitySkuDeleteBatch(activityID, shopID, baiduShopID, skuIDs, isSkuIDCustom)
 	} else {
@@ -139,7 +136,6 @@ func ActivitySkuDeleteBatch(activityID int64, shopID string, baiduShopID int64,
 }

 func ActivitySkuUpdateBatch(activityID int64, actSkuInfoList []*ebaiapi.ActivitySkuInfo4Update) (faildInfoList []string, err error) {
-	globals.SugarLogger.Debugf("ebai ActivitySkuUpdateBatch")
 	if globals.EnableEbaiStoreWrite {
 		faildInfoList, err = api.EbaiAPI.ActivitySkuUpdateBatch(activityID, actSkuInfoList)
 	}
@@ -147,7 +143,6 @@ func ActivitySkuUpdateBatch(activityID int64, actSkuInfoList []*ebaiapi.Activity
 }

 func ActivityDisable(activityID int64, shopID string, baiduShopID, supplierID int64) (err error) {
-	globals.SugarLogger.Debugf("ebai ActivityDisable")
 	if globals.EnableEbaiStoreWrite {
 		err = api.EbaiAPI.ActivityDisable(activityID, shopID, baiduShopID, supplierID)
 	}
@@ -163,7 +158,6 @@ func getActStoreSkuFromTaskResult(taskReslt []interface{}) (list []*model.ActSto
 }

 func createSkuAct(ctx *jxcontext.Context, parentTask tasksch.ITask, act *model.Act2, actStoreSku []*model.ActStoreSku2) (createdList []*model.ActStoreSku2, err error) {
-	globals.SugarLogger.Debugf("ebai createSkuAct")
 	actStoreSkuListList := partner.SplitActStoreSku2List(actStoreSku)
 	task := tasksch.NewParallelTask("ebai createSkuAct", nil, ctx,
 		func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) {
@@ -183,7 +177,6 @@ func createSkuAct(ctx *jxcontext.Context, parentTask tasksch.ITask, act *model.A
 }

 func cancelSkuAct(ctx *jxcontext.Context, parentTask tasksch.ITask, actStoreSkuMap map[string][]*model.ActStoreSku2) (canceledList []*model.ActStoreSku2, err error) {
-	globals.SugarLogger.Debugf("ebai cancelSkuAct")
 	var vendorActIDs []string
 	for k := range actStoreSkuMap {
 		vendorActIDs = append(vendorActIDs, k)
@@ -206,7 +199,6 @@ func cancelSkuAct(ctx *jxcontext.Context, parentTask tasksch.ITask, actStoreSkuM
 }

 func deleteSkuActSkus(ctx *jxcontext.Context, parentTask tasksch.ITask, actStoreSkuMap, vendorActInfoMap map[string][]*model.ActStoreSku2) (deletedList []*model.ActStoreSku2, err error) {
-	globals.SugarLogger.Debugf("ebai deleteSkuActSkus")
 	var vendorActIDs []string
 	for k := range actStoreSkuMap {
 		if k != "" {
@@ -240,7 +232,6 @@ func deleteSkuActSkus(ctx *jxcontext.Context, parentTask tasksch.ITask, actStore
 }

 func addSkuActSkus(ctx *jxcontext.Context, parentTask tasksch.ITask, act *model.Act2, actStoreSku []*model.ActStoreSku2, vendorActIDMap map[int]string) (addedList []*model.ActStoreSku2, err error) {
-	globals.SugarLogger.Debugf("ebai addSkuActSkus, actID:%d", act.ID)
 	actStoreSkuListList := partner.SplitActStoreSku2List(actStoreSku)
 	if len(actStoreSkuListList) > 0 {
 		task := tasksch.NewParallelTask("ebai addSkuActSkus", nil, ctx,
@@ -271,7 +262,6 @@ func addSkuActSkus(ctx *jxcontext.Context, parentTask tasksch.ITask, act *model.
 }

 func (c *PurchaseHandler) SyncAct(ctx *jxcontext.Context, parentTask tasksch.ITask, act *model.Act2, actOrderRules []*model.ActOrderRule, actStoreSkuList []*model.ActStoreSku2) (err error) {
-	globals.SugarLogger.Debugf("ebai SyncAct, actID:%d", act.ID)
 	vendorActInfoMap := make(map[string][]*model.ActStoreSku2)
 	deleteActInfoMap := make(map[string][]*model.ActStoreSku2)
 	vendorActIDMap := make(map[int]string)
@@ -310,7 +300,6 @@ func (c *PurchaseHandler) SyncAct(ctx *jxcontext.Context, parentTask tasksch.ITa
 				updateItems = append(updateItems, partner.Act2Update(ctx, act, model.SyncFlagNewMask))
 			}
 		} else if model.IsSyncStatusUpdate(act.SyncStatus) {
-			// globals.SugarLogger.Debug(utils.Format4Output(updateItems, false))
 			if len(actStoreSkuList4Create) > 0 {
 				addedList, err2 := addSkuActSkus(ctx, nil, act, actStoreSkuList4Create, vendorActIDMap)
 				updateItems = append(updateItems, partner.ActStoreSku2Update(ctx, addedList, model.SyncFlagNewMask)...)
--- a/business/partner/purchase/ebai/callback.go
+++ b/business/partner/purchase/ebai/callback.go
@@ -8,21 +8,15 @@ import (
 	"git.rosy.net.cn/jx-callback/business/jxutils/netprinter"
 	"git.rosy.net.cn/jx-callback/business/model"
 	"git.rosy.net.cn/jx-callback/business/model/dao"
-	"git.rosy.net.cn/jx-callback/globals"
 	"git.rosy.net.cn/jx-callback/globals/api"
 )

 func OnCallbackMsg(msg *ebaiapi.CallbackMsg) (response *ebaiapi.CallbackResponse) {
-	globals.SugarLogger.Debugf("ebai OnCallbackMsg msg:%s", utils.Format4Output(msg, true))
 	if CurPurchaseHandler != nil {
-		globals.SugarLogger.Debugf("ebai OnCallbackMsg msg 1")
 		if orderID := GetOrderIDFromMsg(msg); orderID != "" {
-			globals.SugarLogger.Debugf("ebai OnCallbackMsg msg 2 ,%d", orderID)
 			jxutils.CallMsgHandler(func() {
-				globals.SugarLogger.Debugf("ebai OnCallbackMsg msg 2.5 ,%s", msg.Cmd)
 				switch msg.Cmd {
 				case ebaiapi.CmdOrderCreate, ebaiapi.CmdOrderStatus, ebaiapi.CmdOrderUserCancel, ebaiapi.CmdOrderPartRefund:
-					globals.SugarLogger.Debugf("ebai OnCallbackMsg msg 3 ,%s", msg.Cmd)
 					response = CurPurchaseHandler.onOrderMsg(msg)
 				case ebaiapi.CmdOrderDeliveryStatus:
 					response = CurPurchaseHandler.onWaybillMsg(msg)
--- a/business/partner/purchase/ebai/ebai.go
+++ b/business/partner/purchase/ebai/ebai.go
@@ -69,7 +69,6 @@ func (p *PurchaseHandler) GetVendorID() int {
 }

 func (p *PurchaseHandler) UploadImg(ctx *jxcontext.Context, vendorOrgCode, imgURL string, imgData []byte, imgName string, imgType int) (imgHint string, err error) {
-	globals.SugarLogger.Debugf("ebai UploadImg imgURL:%s, imgName:%s, imgType:%d", imgURL, imgName, imgType)
 	if globals.EnableEbaiStoreWrite {
 		if imgType == model.ImgTypeMain {
 			imgHint, err = api.EbaiAPI.PictureUpload(imgURL, imgData)
--- a/business/partner/purchase/ebai/financial.go
+++ b/business/partner/purchase/ebai/financial.go
@@ -38,7 +38,6 @@ func (p *PurchaseHandler) onFinancialMsg(msg *ebaiapi.CallbackMsg) (response *eb
 			// 获得退款订单ID，去本地数据库拿？饿百消息推送只给了订单号，但是没有查询全额退款的接口，只有部分退款才可以查询
 			orderFinancial, err := partner.CurOrderManager.LoadOrderFinancial(afsOrderID, model.VendorIDEBAI)
 			if err == nil {
-				globals.SugarLogger.Debug(utils.Format4Output(orderFinancial, false))
 				err = partner.CurOrderManager.SaveAfsOrderFinancialInfo(CurPurchaseHandler.OrderFinancialDetail2Refund(orderFinancial, msg))
 			} else {
 				globals.SugarLogger.Warnf("ebai OnFinancialMsg, afsOrderID:%s is not found from partner.CurOrderManager.LoadOrderFinancial", afsOrderID)
@@ -71,11 +70,9 @@ func (p *PurchaseHandler) OrderFinancialDetail2Refund(orderFinancial *model.Orde
 	// if msg.Body["timestamp"] != nil {
 	// 	afsOrder.AfsCreateAt = utils.Timestamp2Time(utils.Str2Int64(utils.Interface2String(msg.Body["timestamp"])))
 	// } else {
-	// 	globals.SugarLogger.Warnf("ebai OrderFinancialDetail2Refund timestamp is not found in afsOrder:%s", afsOrder.AfsOrderID)
 	// 	afsOrder.AfsCreateAt = time.Now()
 	// }
 	order, err := partner.CurOrderManager.LoadOrder(afsOrder.VendorOrderID, afsOrder.VendorID)
-	globals.SugarLogger.Debug(utils.Format4Output(order, false))
 	if err == nil {
 		afsOrder.JxStoreID = order.JxStoreID
 		afsOrder.VendorStoreID = order.VendorStoreID
@@ -132,7 +129,6 @@ func (p *PurchaseHandler) AfsOrderDetail2Financial(orderData map[string]interfac
 		afsOrder.PmRefundMoney = orderFinancial.PmMoney - utils.MustInterface2Int64(orderData["commission"])
 	} else {
 		// 此处应该报错
-		// globals.SugarLogger.Warnf("ebai AfsOrderDetail2Financial, afsOrderID:%s is not found from partner.CurOrderManager.LoadOrderFinancial", afsOrder.VendorOrderID)
 		err = nil
 	}
 	if orderData["refund_detail"] != nil {
--- a/business/partner/purchase/ebai/order.go
+++ b/business/partner/purchase/ebai/order.go
@@ -340,7 +340,6 @@ func getSkuSalePrice2(product *ebaiapi.OrderProductInfo) (salePrice, baiduRate i
 }

 func (p *PurchaseHandler) AcceptOrRefuseOrder(order *model.GoodsOrder, isAcceptIt bool, userName string) (err error) {
-	globals.SugarLogger.Debugf("ebai AcceptOrRefuseOrder orderID:%s, isAcceptIt:%t", order.VendorOrderID, isAcceptIt)
 	if isAcceptIt {
 		if globals.EnableEbaiStoreWrite {
 			err = api.EbaiAPI.OrderConfirm(order.VendorOrderID)
@@ -364,7 +363,6 @@ func (p *PurchaseHandler) AcceptOrRefuseOrder(order *model.GoodsOrder, isAcceptI
 }

 func (p *PurchaseHandler) PickupGoods(order *model.GoodsOrder, isSelfDelivery bool, userName string) (err error) {
-	globals.SugarLogger.Debugf("ebai PickupGoods orderID:%s, isSelfDelivery:%t", order.VendorOrderID, isSelfDelivery)
 	if globals.EnableEbaiStoreWrite {
 		// err = api.EbaiAPI.OrderPickComplete(order.VendorOrderID)
 	}
@@ -388,7 +386,6 @@ func (p *PurchaseHandler) ConfirmReceiveGoods(ctx *jxcontext.Context, order *mod

 // 将订单从购物平台配送转为自送
 func (p *PurchaseHandler) Swtich2SelfDeliver(order *model.GoodsOrder, userName string) (err error) {
-	globals.SugarLogger.Debugf("ebai Swtich2SelfDeliver orderID:%s", order.VendorOrderID)
 	if globals.EnableEbaiStoreWrite {
 		if err = api.EbaiAPI.OrderSwitchselfdelivery(order.VendorOrderID); err != nil {
 			if utils.IsErrMatch(err, "301251", nil) {
@@ -422,7 +419,6 @@ func (p *PurchaseHandler) trySyncCancelStatus(vendorOrderID string) (err error)

 // 将订单从购物平台配送转为自送后又送达
 func (p *PurchaseHandler) Swtich2SelfDelivered(order *model.GoodsOrder, userName string) (err error) {
-	globals.SugarLogger.Debugf("ebai Swtich2SelfDelivered orderID:%s", order.VendorOrderID)
 	// todo 饿百转商家自送后，没有确认送达的概念，空操作
 	if globals.EnableEbaiStoreWrite && order.WaybillVendorID > 100 {
 		err = api.EbaiAPI.OrderComplete(order.VendorOrderID, userName)
@@ -432,7 +428,6 @@ func (p *PurchaseHandler) Swtich2SelfDelivered(order *model.GoodsOrder, userName

 // 完全自送的门店表示开始配送
 func (p *PurchaseHandler) SelfDeliverDelivering(order *model.GoodsOrder, userName string) (err error) {
-	globals.SugarLogger.Debugf("ebai SelfDeliverDelivering orderID:%s", order.VendorOrderID)
 	if globals.EnableEbaiStoreWrite {
 		err = api.EbaiAPI.OrderselfDeliveryStateSync(order.VendorOrderID, userName)
 	}
@@ -445,7 +440,6 @@ func (p *PurchaseHandler) SelfDeliverDelivering(order *model.GoodsOrder, userNam

 // 完全自送的门店表示配送完成
 func (p *PurchaseHandler) SelfDeliverDelivered(order *model.GoodsOrder, userName string) (err error) {
-	globals.SugarLogger.Debugf("ebai SelfDeliverDelivered orderID:%s", order.VendorOrderID)
 	if globals.EnableEbaiStoreWrite {
 		err = api.EbaiAPI.OrderComplete(order.VendorOrderID, userName)
 	}
@@ -457,10 +451,8 @@ func (c *PurchaseHandler) onOrderMsg(msg *ebaiapi.CallbackMsg) (retVal *ebaiapi.
 	if c.isAfsMsg(msg) {
 		retVal = c.onAfsOrderMsg(msg)
 	} else {
-		globals.SugarLogger.Debugf("ebai OnCallbackMsg msg 4 ,%v", utils.Format4Output(msg, true))
 		status := c.callbackMsg2Status(msg)
 		if partner.CurOrderManager.GetStatusDuplicatedCount(status) > 0 {
-			globals.SugarLogger.Debugf("ebai OnCallbackMsg msg 5 %d", partner.CurOrderManager.GetStatusDuplicatedCount(status))
 			return nil
 		}
 		if ebaiapi.CmdOrderCreate == msg.Cmd {
--- a/business/partner/purchase/ebai/order_comment.go
+++ b/business/partner/purchase/ebai/order_comment.go
@@ -35,7 +35,6 @@ func (c *PurchaseHandler) refreshCommentOnce() {
 }

 func (c *PurchaseHandler) RefreshComment(fromTime, toTime time.Time) (err error) {
-	globals.SugarLogger.Debugf("RefreshComment fromTime:%s, toTime:%s", utils.Time2Str(fromTime), utils.Time2Str(toTime))
 	var orderCommentList []*model.OrderComment
 	//stepGap := 24 * time.Hour
 	//stepFromTime := fromTime
@@ -110,7 +109,6 @@ func (c *PurchaseHandler) RefreshComment(fromTime, toTime time.Time) (err error)
 	//			orderComment.StoreID = jxutils.GetSaleStoreIDFromOrder(order)
 	//			orderComment.ConsigneeMobile = order.ConsigneeMobile
 	//		} else {
-	//			globals.SugarLogger.Infof("RefreshComment, load orderID:%s failed", orderComment.VendorOrderID)
 	//		}
 	//		orderCommentList = append(orderCommentList, orderComment)
 	//	}
--- a/business/partner/purchase/ebai/store.go
+++ b/business/partner/purchase/ebai/store.go
@@ -178,7 +178,6 @@ func (p *PurchaseHandler) ReadStore(ctx *jxcontext.Context, vendorOrgCode, vendo
 	}
 	result, err := api.EbaiAPI.ShopGet("", baiduShopID)
 	if err == nil {
-		// globals.SugarLogger.Debug(utils.Format4Output(result, false))
 		retVal := &dao.StoreDetail{
 			Store: model.Store{
 				Address: utils.Interface2String(result["address"]),
@@ -242,8 +241,6 @@ func (p *PurchaseHandler) ReadStore(ctx *jxcontext.Context, vendorOrgCode, vendo
 }

 func (p *PurchaseHandler) UpdateStore(db *dao.DaoDB, storeID int, userName string) (err error) {
-	globals.SugarLogger.Debugf("ebai UpdateStore storeID:%d, userName:%s", storeID, userName)
-
 	var stores []*tEbaiStoreInfo
 	sql := `
 	SELECT
@@ -264,7 +261,6 @@ func (p *PurchaseHandler) UpdateStore(db *dao.DaoDB, storeID int, userName strin
 					shopID = store.ID
 				}
 				store2, err2 := p.ReadStore(jxcontext.AdminCtx, store.VendorOrgCode, store.VendorStoreID, "")
-				// globals.SugarLogger.Debugf("ebai UpdateStore2 store2:%s, err2:%v", utils.Format4Output(store2, true), err2)
 				if err = err2; err == nil {
 					if store2.ID == store.ID {
 						shopID = -1
@@ -313,7 +309,6 @@ func isStoreStatusSame(status1, status2 int) bool {
 }

 func (p *PurchaseHandler) RefreshAllStoresID(ctx *jxcontext.Context, parentTask tasksch.ITask, isAsync bool) (hint string, err error) {
-	globals.SugarLogger.Debugf("ebai RefreshAllStoresID")
 	const batchSize = 50
 	const stepCount = 3
 	var stores []*tEbaiStoreInfo
--- a/business/partner/purchase/ebai/waybill.go
+++ b/business/partner/purchase/ebai/waybill.go
@@ -8,7 +8,6 @@ import (
 	"git.rosy.net.cn/jx-callback/business/jxcallback/scheduler"
 	"git.rosy.net.cn/jx-callback/business/model"
 	"git.rosy.net.cn/jx-callback/business/partner"
-	"git.rosy.net.cn/jx-callback/globals"
 	"git.rosy.net.cn/jx-callback/globals/api"
 )

@@ -42,10 +41,8 @@ func (p *PurchaseHandler) GetWaybillStatusFromVendorStatus(vendorStatus string)

 func (c *PurchaseHandler) onWaybillMsg(msg *ebaiapi.CallbackMsg) (retVal *ebaiapi.CallbackResponse) {
 	order := c.callbackMsg2Waybill(msg)
-	globals.SugarLogger.Debugf("ebai onWaybillMsg orderID:%s", order.VendorOrderID)
 	if order.Status == model.WaybillStatusNew || order.Status == model.WaybillStatusAccepted { // 饿百新运单事件要查询快递员信息，因为可能事件错序
 		if result, err := api.EbaiAPI.OrderDeliveryGet(order.VendorOrderID); err != nil {
-			globals.SugarLogger.Warnf("ebai onWaybillMsg orderID:%s OrderDeliveryGet failed with error:%v", order.VendorOrderID, err)
 			return api.EbaiAPI.Err2CallbackResponse(msg.Cmd, err, order.VendorOrderID)
 		} else {
 			order.CourierName = utils.Interface2String(result["name"])