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:
邹宗楠
2024-05-16 14:20:32 +08:00
parent befb0e6906
commit aaa31d57de
2 changed files with 20 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
business/jxstore/act/act.go
View File

@@ -721,7 +721,6 @@ func CreateActForMtByOrder(ctx *jxcontext.Context, act *model.Act, vendorIDs []i
// }
// }
//}
globals.SugarLogger.Debugf("================createACte := %s", utils.Format4Output(1111, false))
txDB, _ := dao.Begin(db)
defer func() {
if r := recover(); r != nil {
@@ -730,7 +729,6 @@ func CreateActForMtByOrder(ctx *jxcontext.Context, act *model.Act, vendorIDs []i
}
}()
dao.WrapAddIDCULDEntity(act, ctx.GetUserName())
globals.SugarLogger.Debugf("================createACte := %s", utils.Format4Output(2222, false))
err = dao.CreateEntityTx(txDB, act)
if err != nil {
dao.Rollback(db, txDB)
@@ -741,14 +739,12 @@ func CreateActForMtByOrder(ctx *jxcontext.Context, act *model.Act, vendorIDs []i
VendorID: vendorID,
VendorOrgCode: vendorOrgCode,
}
globals.SugarLogger.Debugf("================createACte := %s", utils.Format4Output(3333, false))
dao.WrapAddIDCULDEntity(actMap, ctx.GetUserName())
err = dao.CreateEntityTx(txDB, actMap)
if err != nil {
dao.Rollback(db, txDB)
return err
}
globals.SugarLogger.Debugf("================createACte := %s", utils.Format4Output(444, false))
for storeID, storeSkus := range actStoreSkuMap {
for _, storeSku := range storeSkus {
actStoreSkuModel := &model.ActStoreSku{
@@ -760,7 +756,6 @@ func CreateActForMtByOrder(ctx *jxcontext.Context, act *model.Act, vendorIDs []i
ActPrice: int64(storeSku.JdsPrice),
}
dao.WrapAddIDCULDEntity(actStoreSkuModel, ctx.GetUserName())
globals.SugarLogger.Debugf("================createACte := %s", utils.Format4Output(555, false))
err = dao.CreateEntityTx(txDB, actStoreSkuModel)
if err != nil {
dao.Rollback(db, txDB)
@@ -776,7 +771,6 @@ func CreateActForMtByOrder(ctx *jxcontext.Context, act *model.Act, vendorIDs []i
ActualActPrice: int64(storeSku.JdsPrice),
}
dao.WrapAddIDCULDEntity(actStoreSkuMapModel, ctx.GetUserName())
globals.SugarLogger.Debugf("================createACte := %s", utils.Format4Output(666, false))
err = dao.CreateEntityTx(txDB, actStoreSkuMapModel)
if err != nil {
dao.Rollback(db, txDB)
@@ -784,13 +778,11 @@ func CreateActForMtByOrder(ctx *jxcontext.Context, act *model.Act, vendorIDs []i
}
}
}
globals.SugarLogger.Debugf("================createACte := %s", utils.Format4Output(1111, false))
dao.Commit(db, txDB)
if !globals.IsProductEnv() {
return err
}
//同步建到美团
globals.SugarLogger.Debugf("================actStoreSkuMap := %s", utils.Format4Output(actStoreSkuMap, false))
for storeID, storeSkus := range actStoreSkuMap {
if storeDetail, _ := dao.GetStoreDetail(db, storeID, vendorID, vendorOrgCode); storeDetail != nil {
var actData []*mtwmapi.RetailDiscountActData
@@ -807,10 +799,8 @@ func CreateActForMtByOrder(ctx *jxcontext.Context, act *model.Act, vendorIDs []i
})
}
actIdResult := make(map[string]int64, 0)
actResult, faileInfoList, err := api.MtwmAPI.RetailDiscountBatchSave2(storeDetail.VendorStoreID, actType, actData)
globals.SugarLogger.Debugf("================actResult := %s", utils.Format4Output(actResult, false))
globals.SugarLogger.Debugf("================faileInfoList := %s", utils.Format4Output(faileInfoList, false))
globals.SugarLogger.Debugf("================err := %v", err)
mtApi := mtwm.GetAPI(vendorOrgCode, storeID, storeDetail.VendorStoreID)
actResult, fileInfoList, _ := mtApi.RetailDiscountBatchSave2(storeDetail.VendorStoreID, actType, actData)
for _, v := range actResult {
var (
actStoreSkuMapUpdate *model.ActStoreSkuMap
@@ -842,9 +832,9 @@ func CreateActForMtByOrder(ctx *jxcontext.Context, act *model.Act, vendorIDs []i
actData2[i-1].Sequence = i
actData2[i-1].OrderLimit = 1
}
api.MtwmAPI.RetailDiscountBatchSave2(storeDetail.VendorStoreID, actType, actData2)
mtApi.RetailDiscountBatchSave2(storeDetail.VendorStoreID, actType, actData2)
}
for _, v := range faileInfoList {
for _, v := range fileInfoList {
err2 += fmt.Sprintf("创建失败！门店ID：[%v]，商品ID：[%v]，原因：[%v]", storeID, v.AppFoodCode, v.ErrorMsg)
}
}

33
business/jxstore/cms/system_store_sku.go
View File

@@ -6,10 +6,9 @@ import (
"git.rosy.net.cn/jx-callback/business/jxutils/tasksch"
"git.rosy.net.cn/jx-callback/business/model"
"git.rosy.net.cn/jx-callback/business/model/dao"
"git.rosy.net.cn/jx-callback/business/partner"
"git.rosy.net.cn/jx-callback/business/partner/purchase/mtwm"
"git.rosy.net.cn/jx-callback/globals"
"git.rosy.net.cn/jx-callback/globals/api"
beego "github.com/astaxie/beego/server/web"
"time"
"git.rosy.net.cn/baseapi/platformapi/mtwmapi"
@@ -180,24 +179,24 @@ func BatchInitSkuEBai2EBai(ctx *jxcontext.Context, fromSku []*ebaiapi.SkuInfo, t
// CopyMtToMT 美团商品复制到美团
func CopyMtToMT(ctx *jxcontext.Context, fromStore, toStore *dao.StoreDetail, isAsync bool, offSet int) (hint string, data []string, err error) {
var fromApi *mtwmapi.API
var toApi *mtwmapi.API
var fromApi *mtwmapi.API = mtwm.GetAPI(fromStore.VendorOrgCode, fromStore.ID, fromStore.VendorStoreID)
var toApi *mtwmapi.API = mtwm.GetAPI(toStore.VendorOrgCode, toStore.ID, toStore.VendorStoreID)
var errList = make([]*mtwmapi.AppFoodResult, 0, 0)
var errData = make([]string, 0, 0)
if fromStore.VendorOrgCode == globals.Mtwm2Code {
fromApi = mtwmapi.New(beego.AppConfig.DefaultString("mtwmAppID2", ""), beego.AppConfig.DefaultString("mtwmSecret2", ""), beego.AppConfig.DefaultString("mtwmCallbackURL2", ""), "")
fromApi.SetToken(fromStore.MtwmToken)
} else {
fromApi = partner.CurAPIManager.GetAPI(model.VendorIDMTWM, fromStore.VendorOrgCode).(*mtwmapi.API)
}
if toStore.VendorOrgCode == globals.Mtwm2Code {
toApi = mtwmapi.New(beego.AppConfig.DefaultString("mtwmAppID2", ""), beego.AppConfig.DefaultString("mtwmSecret2", ""), beego.AppConfig.DefaultString("mtwmCallbackURL2", ""), "")
toApi.SetToken(toStore.MtwmToken)
} else {
toApi = partner.CurAPIManager.GetAPI(model.VendorIDMTWM, toStore.VendorOrgCode).(*mtwmapi.API)
}
//if fromStore.VendorOrgCode == globals.Mtwm2Code {
// fromApi = mtwmapi.New(beego.AppConfig.DefaultString("mtwmAppID2", ""), beego.AppConfig.DefaultString("mtwmSecret2", ""), beego.AppConfig.DefaultString("mtwmCallbackURL2", ""), "")
// fromApi.SetToken(fromStore.MtwmToken)
//} else {
// fromApi = partner.CurAPIManager.GetAPI(model.VendorIDMTWM, fromStore.VendorOrgCode).(*mtwmapi.API)
//}
//
//if toStore.VendorOrgCode == globals.Mtwm2Code {
// toApi = mtwmapi.New(beego.AppConfig.DefaultString("mtwmAppID2", ""), beego.AppConfig.DefaultString("mtwmSecret2", ""), beego.AppConfig.DefaultString("mtwmCallbackURL2", ""), "")
// toApi.SetToken(toStore.MtwmToken)
//} else {
// toApi = partner.CurAPIManager.GetAPI(model.VendorIDMTWM, toStore.VendorOrgCode).(*mtwmapi.API)
//}
taskName := fmt.Sprintf("将美团平台门店[%s],分类和商品复制到[%s]", fromStore.VendorStoreID, toStore.VendorStoreID)
config := tasksch.NewParallelConfig().SetParallelCount(1).SetIsContinueWhenError(false)