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:
邹宗楠
2025-02-07 11:11:02 +08:00
parent 43f2974e25
commit af03a000e6
4 changed files with 40 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
business/jxstore/cms/sync_store_sku.go
View File

@@ -533,6 +533,9 @@ func syncStoreSkuNew(ctx *jxcontext.Context, parentTask tasksch.ITask, causeFlag
} else {
skus, err = dao.GetStoreSkus(db, vendorID, storeID, skuIDs)
}
if storeID == 20002 {
globals.SugarLogger.Debugf("----skus1 := %s", utils.Format4Output(skus, false))
}
if err != nil || len(skus) == 0 {
return err
@@ -579,9 +582,15 @@ func syncStoreSkuNew(ctx *jxcontext.Context, parentTask tasksch.ITask, causeFlag
if sku.Status != model.SkuStatusNormal {
sku.MergedStatus = model.SkuStatusDontSale
}
if storeID == 20002 {
globals.SugarLogger.Debugf("----skus2 := %s", utils.Format4Output(skus, false))
}
var bareSku *partner.StoreSkuInfo
isNeedReorder := false
if isStoreSkuSyncNeedDelete(sku) {
if storeID == 20002 {
globals.SugarLogger.Debugf("----skus3 := %s", utils.Format4Output(skus, false))
}
if !dao.IsVendorThingIDEmpty(sku.VendorSkuID) {
bareSku = storeSkuSyncInfo2Bare(sku)
if singleStoreHandler == nil {
@@ -594,6 +603,9 @@ func syncStoreSkuNew(ctx *jxcontext.Context, parentTask tasksch.ITask, causeFlag
updateItems = append(updateItems, sku2Update(vendorID, sku, model.SyncFlagDeletedMask))
}
} else if model.IsSyncStatusNew(sku.SkuSyncStatus) {
if storeID == 20002 {
globals.SugarLogger.Debugf("----skus4 := %s", utils.Format4Output(skus, false))
}
calVendorPrice4StoreSku(sku, storeDetail.PricePercentagePackObj, int(storeDetail.PricePercentage))
if singleStoreHandler == nil {
if dao.IsVendorThingIDEmpty(sku.VendorSkuID) {
@@ -610,6 +622,9 @@ func syncStoreSkuNew(ctx *jxcontext.Context, parentTask tasksch.ITask, causeFlag
}
}
} else {
if storeID == 20002 {
globals.SugarLogger.Debugf("----skus5 := %s", utils.Format4Output(skus, false))
}
if sku.MergedStatus == model.SkuStatusNormal {
if dao.IsVendorThingIDEmpty(sku.VendorCatID) && !strings.Contains(sku.StoreName, model.ExdStoreName) && vendorID != model.VendorIDYB && vendorID != model.VendorIDDD && vendorID != model.VendorIDJDShop {
globals.SugarLogger.Warnf("syncStoreSkuNew 创建门店:%d商品:%d，但没有平台分类ID", storeID, sku.SkuID)
@@ -622,6 +637,9 @@ func syncStoreSkuNew(ctx *jxcontext.Context, parentTask tasksch.ITask, causeFlag
}
isNeedReorder = true
} else {
if storeID == 20002 {
globals.SugarLogger.Debugf("----skus6 := %s", utils.Format4Output(skus, false))
}
if dao.IsVendorThingIDEmpty(sku.VendorSkuID) && vendorID != model.VendorIDJDShop {
// err = fmt.Errorf("门店:%d，修改没有创建的商品:%d", storeID, sku.SkuID)
if vendorID != model.VendorIDJDShop || (vendorID == model.VendorIDJDShop && storeID == model.JdShopMainStoreID && sku.StoreSkuStatus != model.SkuStatusDontSale) {
@@ -634,6 +652,9 @@ func syncStoreSkuNew(ctx *jxcontext.Context, parentTask tasksch.ITask, causeFlag
parentTask.AddFailedList(failedList)
}
} else {
if storeID == 20002 {
globals.SugarLogger.Debugf("----skus7 := %s", utils.Format4Output(skus, false))
}
isAdded2Update := false
// 修改商品信息时不改价（以免活动引起的失败），而用单独的改价来改
if (model.IsSyncStatusUpdate(sku.SkuSyncStatus) || (model.IsSyncStatusSeq(sku.SkuSyncStatus) && reorderHandler == nil)) && singleStoreHandler != nil {
@@ -752,7 +773,15 @@ func syncStoreSkuNew(ctx *jxcontext.Context, parentTask tasksch.ITask, causeFlag
}
}
if storeID == 20002 {
globals.SugarLogger.Debugf("----skus5 := %s", utils.Format4Output(createList, false))
globals.SugarLogger.Debugf("----skus5 := %s", utils.Format4Output(updateList, false))
globals.SugarLogger.Debugf("----skus5 := %s", utils.Format4Output(deleteList, false))
globals.SugarLogger.Debugf("----skus5 := %s", utils.Format4Output(stockList, false))
globals.SugarLogger.Debugf("----skus5 := %s", utils.Format4Output(onlineList, false))
globals.SugarLogger.Debugf("----skus5 := %s", utils.Format4Output(offlineList, false))
globals.SugarLogger.Debugf("----skus5 := %s", utils.Format4Output(priceList, false))
}
task := tasksch.NewParallelTask("syncStoreSkuNew", tasksch.NewParallelConfig().SetParallelCount(1).SetIsContinueWhenError(isContinueWhenError2), ctx,
func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) {
step := batchItemList[0].(int)

8
business/jxutils/tasks/configrefresh.go
View File

@@ -184,11 +184,11 @@ func RefreshFnToken() (err error) {
token, refreshToken, "fn",
})
if _, err = fnpsapi.HttpToGuoYuanFN(map[string]interface{}{"token": curConfig.Token, "refresh_token": curConfig.RefreshToken}, fnpsapi.FengNiaoCallbackTypeToken); err != nil {
globals.SugarLogger.Debugf("菜市token通知到果园错误:%v", err)
if _, err = fnpsapi.HttpToGuoYuanFN(map[string]interface{}{"token": curConfig.Token, "refresh_token": curConfig.RefreshToken}, fnpsapi.FengNiaoCallbackTypeToken, model.ServerTypeVegetable); err != nil {
globals.SugarLogger.Debugf("菜市蜂鸟token通知到果园错误:%v", err)
}
if _, err = fnpsapi.HttpToPetFN(map[string]interface{}{"token": curConfig.Token, "refresh_token": curConfig.RefreshToken}, fnpsapi.FengNiaoCallbackTypeToken); err != nil {
globals.SugarLogger.Debugf("菜市token通知到宠物错误:%v", err)
if _, err = fnpsapi.HttpToGuoYuanFN(map[string]interface{}{"token": curConfig.Token, "refresh_token": curConfig.RefreshToken}, fnpsapi.FengNiaoCallbackTypeToken, model.ServerTypeFruits); err != nil {
globals.SugarLogger.Debugf("菜市蜂鸟token通知到宠物错误:%v", err)
}
return token, expireTimeStr, refreshToken

3
business/partner/delivery/fn/store.go
View File

@@ -10,6 +10,7 @@ import (
"git.rosy.net.cn/jx-callback/business/partner"
"git.rosy.net.cn/jx-callback/globals"
"git.rosy.net.cn/jx-callback/globals/api"
beego "github.com/astaxie/beego/server/web"
)
var (
@@ -150,7 +151,7 @@ func (c *DeliveryHandler) UpdateStore(ctx *jxcontext.Context, storeDetail *dao.S
func OnStoreStatus(msg *fnpsapi.ChainstoreStatusNotify, reallyData *fnpsapi.ShortStatus) (retVal *fnpsapi.CallbackResponse) {
store, err := dao.GetStoreDetail2(dao.GetDB(), 0, msg.Param.OutShopCode, model.VendorIDFengNiao)
if store == nil || store.ID == model.NO || err != nil {
if _, err = fnpsapi.HttpToGuoYuanFN(utils.Struct2MapByJson(reallyData), fnpsapi.FengNiaoCallbackTypeStore); err != nil {
if _, err = fnpsapi.HttpToGuoYuanFN(utils.Struct2MapByJson(reallyData), fnpsapi.FengNiaoCallbackTypeStore, beego.BConfig.RunMode); err != nil {
return fnpsapi.Err2CallbackResponse(err, "")
}
return fnpsapi.Err2CallbackResponse(nil, "")

6
business/partner/delivery/fn/waybill.go
View File

@@ -7,6 +7,7 @@ import (
"git.rosy.net.cn/jx-callback/business/jxcallback/orderman"
"git.rosy.net.cn/jx-callback/business/jxutils/jxcontext"
"git.rosy.net.cn/jx-callback/business/partner/purchase/tao_vegetable"
beego "github.com/astaxie/beego/server/web"
"strconv"
"strings"
"time"
@@ -254,7 +255,7 @@ func OnWaybillMsg(msg *fnpsapi.OrderStatusNottify, resultParam *fnpsapi.ShortSta
good, err := dao.GetSimpleOrder(dao.GetDB(), cc.PartnerOrderCode)
if good == nil || good.VendorOrderID == "" || err != nil {
if _, err = fnpsapi.HttpToGuoYuanFN(utils.Struct2MapByJson(resultParam), fnpsapi.FengNiaoCallbackTypeOrder); err != nil {
if _, err = fnpsapi.HttpToGuoYuanFN(utils.Struct2MapByJson(resultParam), fnpsapi.FengNiaoCallbackTypeOrder, beego.BConfig.RunMode); err != nil {
return fnpsapi.Err2CallbackResponse(err, "")
}
return fnpsapi.Err2CallbackResponse(nil, "")
@@ -379,11 +380,12 @@ func tiktokStatusPush(order *model.Waybill, orderStatus int64, lng, lat, vendorO
func OnWaybillExceptFn(msg *fnpsapi.AbnormalReportNotify, reallyData *fnpsapi.ShortStatus) (retVal *fnpsapi.CallbackResponse) {
order, err := dao.GetSimpleOrder(dao.GetDB(), msg.PartnerOrderCode)
if order == nil || order.VendorOrderID == "" || err != nil {
if _, err = fnpsapi.HttpToGuoYuanFN(utils.Struct2MapByJson(reallyData), fnpsapi.FengNiaoCallbackTypeAbnormal); err != nil {
if _, err = fnpsapi.HttpToGuoYuanFN(utils.Struct2MapByJson(reallyData), fnpsapi.FengNiaoCallbackTypeAbnormal, beego.BConfig.RunMode); err != nil {
return fnpsapi.Err2CallbackResponse(err, "")
}
return fnpsapi.Err2CallbackResponse(nil, "")
}
model.StoreSkuBind{}
return CurDeliveryHandler.OnWaybillExcept(msg)
}