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-01-25 11:37:20 +08:00
parent d967e67601
commit a2c3bf2238
4 changed files with 157 additions and 154 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,155 +1,149 @@
package cms package cms
import ( import (
"fmt"
"git.rosy.net.cn/baseapi/platformapi/ebaiapi"
"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"
beego "github.com/astaxie/beego/server/web"
"time" "time"
"git.rosy.net.cn/baseapi/platformapi/mtwmapi" "git.rosy.net.cn/baseapi/platformapi/mtwmapi"
"git.rosy.net.cn/baseapi/utils" "git.rosy.net.cn/baseapi/utils"
"git.rosy.net.cn/jx-callback/business/jxutils/jxcontext" "git.rosy.net.cn/jx-callback/business/jxutils/jxcontext"
"git.rosy.net.cn/jx-callback/business/jxutils/tasksch"
"git.rosy.net.cn/jx-callback/business/model/dao"
) )
// CopyOnStoreSkuToOther 将一个美团门店分类和商品复制到另一个门店 // CopyOnStoreSkuToOther 将一个美团门店分类和商品复制到另一个门店
func CopyOnStoreSkuToOther(ctx *jxcontext.Context, fromStoreId, toStoreId string, vendorId int, isAsync bool, offSet int) (hint string, err error) { func CopyOnStoreSkuToOther(ctx *jxcontext.Context, fromStoreId, toStoreId string, vendorId int, isAsync bool, offSet int) (hint string, err error) {
var ( return "", err
db = dao.GetDB() //var (
) // db = dao.GetDB()
//)
fromStoreDetail, _ := dao.GetStoreDetailByVendorStoreID(db, fromStoreId, vendorId, "") //
if fromStoreDetail == nil { //fromStoreDetail, _ := dao.GetStoreDetailByVendorStoreID(db, fromStoreId, vendorId, "")
return "", fmt.Errorf("%s,平台门店id未获取到", fromStoreId) //if fromStoreDetail == nil {
} // return "", fmt.Errorf("%s,平台门店id未获取到", fromStoreId)
if fromStoreDetail.VendorOrgCode == globals.Mtwm2Code { //}
fromAPI := partner.CurAPIManager.GetAPI(vendorId, fromStoreDetail.VendorOrgCode).(*mtwmapi.API) //if fromStoreDetail.VendorOrgCode == globals.Mtwm2Code {
fromAPI.SetToken(fromStoreDetail.MtwmToken) // fromAPI := partner.CurAPIManager.GetAPI(vendorId, fromStoreDetail.VendorOrgCode).(*mtwmapi.API)
} else { // fromAPI.SetToken(fromStoreDetail.MtwmToken)
switch vendorId { //} else {
case model.VendorIDMTWM: // switch vendorId {
fromAPI = partner.CurAPIManager.GetAPI(vendorId, fromStoreDetail.VendorOrgCode).(*mtwmapi.API) // case model.VendorIDMTWM:
case model.VendorIDEBAI: // fromAPI = partner.CurAPIManager.GetAPI(vendorId, fromStoreDetail.VendorOrgCode).(*mtwmapi.API)
fromAPI = partner.CurAPIManager.GetAPI(vendorId, fromStoreDetail.VendorOrgCode).(*ebaiapi.API) // case model.VendorIDEBAI:
} // fromAPI = partner.CurAPIManager.GetAPI(vendorId, fromStoreDetail.VendorOrgCode).(*ebaiapi.API)
} // }
//}
toStoreDetail, _ := dao.GetStoreDetailByVendorStoreID(db, toStoreId, vendorId, "") //
if toStoreDetail == nil { //toStoreDetail, _ := dao.GetStoreDetailByVendorStoreID(db, toStoreId, vendorId, "")
return "", fmt.Errorf("%s,平台门店id未获取到", fromStoreId) //if toStoreDetail == nil {
} // return "", fmt.Errorf("%s,平台门店id未获取到", fromStoreId)
if toStoreDetail.VendorOrgCode == globals.Mtwm2Code { //}
toAPI := partner.CurAPIManager.GetAPI(vendorId, toStoreDetail.VendorOrgCode).(*mtwmapi.API) //if toStoreDetail.VendorOrgCode == globals.Mtwm2Code {
toAPI.SetToken(fromStoreDetail.MtwmToken) // toAPI := partner.CurAPIManager.GetAPI(vendorId, toStoreDetail.VendorOrgCode).(*mtwmapi.API)
} // toAPI.SetToken(fromStoreDetail.MtwmToken)
//}
apiObj := partner.CurAPIManager.GetAPI(vendorId, appOrgCode).(*mtwmapi.API) //
if appOrgCode == globals.Mtwm2Code { //apiObj := partner.CurAPIManager.GetAPI(vendorId, appOrgCode).(*mtwmapi.API)
var storeDetail *dao.StoreDetail //if appOrgCode == globals.Mtwm2Code {
if storeID != 0 { // var storeDetail *dao.StoreDetail
storeDetail, _ = dao.GetStoreDetail(db, storeID, vendorId, appOrgCode) // if storeID != 0 {
} else if vendorStoreID != "" { // storeDetail, _ = dao.GetStoreDetail(db, storeID, vendorId, appOrgCode)
storeDetail, _ = dao.GetStoreDetailByVendorStoreID(db, vendorStoreID, vendorId, appOrgCode) // } else if vendorStoreID != "" {
} // storeDetail, _ = dao.GetStoreDetailByVendorStoreID(db, vendorStoreID, vendorId, appOrgCode)
if storeDetail != nil { // }
apiObj.SetToken(storeDetail.MtwmToken) // if storeDetail != nil {
} // apiObj.SetToken(storeDetail.MtwmToken)
} // }
//}
// 门店api加载 //
toStore, err := dao.GetStoreDetailByVendorStoreID(db, toStoreId, vendorId, "") //// 门店api加载
if err != nil { //toStore, err := dao.GetStoreDetailByVendorStoreID(db, toStoreId, vendorId, "")
return "", err //if err != nil {
} // return "", err
toApi := mtwmapi.New(beego.AppConfig.DefaultString("mtwmAppID2", ""), beego.AppConfig.DefaultString("mtwmSecret2", ""), beego.AppConfig.DefaultString("mtwmCallbackURL2", ""), "") //}
toApi.SetToken(toStore.MtwmToken) //toApi := mtwmapi.New(beego.AppConfig.DefaultString("mtwmAppID2", ""), beego.AppConfig.DefaultString("mtwmSecret2", ""), beego.AppConfig.DefaultString("mtwmCallbackURL2", ""), "")
//toApi.SetToken(toStore.MtwmToken)
fromStore, err := dao.GetStoreDetailByVendorStoreID(db, fromStoreId, vendorId, "") //
if err != nil { //fromStore, err := dao.GetStoreDetailByVendorStoreID(db, fromStoreId, vendorId, "")
return "", err //if err != nil {
} // return "", err
fromApi := mtwmapi.New(beego.AppConfig.DefaultString("mtwmAppID2", ""), beego.AppConfig.DefaultString("mtwmSecret2", ""), beego.AppConfig.DefaultString("mtwmCallbackURL2", ""), "") //}
fromApi.SetToken(fromStore.MtwmToken) //fromApi := mtwmapi.New(beego.AppConfig.DefaultString("mtwmAppID2", ""), beego.AppConfig.DefaultString("mtwmSecret2", ""), beego.AppConfig.DefaultString("mtwmCallbackURL2", ""), "")
//fromApi.SetToken(fromStore.MtwmToken)
taskName := fmt.Sprintf("将平台门店[%s],分类和商品复制到[%s]", fromStoreId, toStoreId) //
config := tasksch.NewParallelConfig().SetParallelCount(1).SetIsContinueWhenError(false) //taskName := fmt.Sprintf("将平台门店[%s],分类和商品复制到[%s]", fromStoreId, toStoreId)
work := func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) { //config := tasksch.NewParallelConfig().SetParallelCount(1).SetIsContinueWhenError(false)
step := batchItemList[0].(int) //work := func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) {
switch step { // step := batchItemList[0].(int)
// case 1: // switch step {
// 1.加载门店商品,删除商品.当分类下没有商品时.删除分类 // // case 1:
// errs := LoadingStoreSkuList(ctx, toApi, toStore.VendorStoreID) // // 1.加载门店商品,删除商品.当分类下没有商品时.删除分类
//if errs != nil && len(errs) > 0 { // // errs := LoadingStoreSkuList(ctx, toApi, toStore.VendorStoreID)
// return nil, errs[0] // //if errs != nil && len(errs) > 0 {
//} // // return nil, errs[0]
case 1: // //}
handler, _ := partner.GetPurchasePlatformFromVendorID(vendorId).(partner.ISingleStoreStoreSkuHandler) // case 1:
if handler == nil { // handler, _ := partner.GetPurchasePlatformFromVendorID(vendorId).(partner.ISingleStoreStoreSkuHandler)
return nil, fmt.Errorf(model.VendorChineseNames[vendorId] + ":不存在此平台") // if handler == nil {
} // return nil, fmt.Errorf(model.VendorChineseNames[vendorId] + ":不存在此平台")
fromCategory, err := handler.GetStoreAllCategories(ctx, fromStore.ID, fromStore.VendorStoreID) // }
// fromCategory, err := handler.GetStoreAllCategories(ctx, fromStore.ID, fromStore.VendorStoreID)
// 同步分类 //
fromCategoryList, err := fromApi.RetailCatList(utils.Int2Str(fromVendorStoreId)) // // 同步分类
//globals.SugarLogger.Debugf("err ============ %v", err) // fromCategoryList, err := fromApi.RetailCatList(utils.Int2Str(fromVendorStoreId))
//for _, v := range fromCategoryList { // //globals.SugarLogger.Debugf("err ============ %v", err)
// categoryErr := toApi.RetailCatUpdate(toStore.VendorStoreID, v.Name, &mtwmapi.Param4UpdateCat{ // //for _, v := range fromCategoryList {
// CategoryCode: v.Code, // // categoryErr := toApi.RetailCatUpdate(toStore.VendorStoreID, v.Name, &mtwmapi.Param4UpdateCat{
// Sequence: v.Sequence, // // CategoryCode: v.Code,
// }) // // Sequence: v.Sequence,
// if categoryErr != nil { // // })
// globals.SugarLogger.Debugf("err := RetailCatUpdate : %v", categoryErr) // // if categoryErr != nil {
// } // // globals.SugarLogger.Debugf("err := RetailCatUpdate : %v", categoryErr)
// if v.Children != nil && len(v.Children) != 0 { // // }
// for _, c := range v.Children { // // if v.Children != nil && len(v.Children) != 0 {
// if err3 := toApi.RetailCatUpdate(toStore.VendorStoreID, v.Name, &mtwmapi.Param4UpdateCat{ // // for _, c := range v.Children {
// CategoryNameOrigin: v.Name, // // if err3 := toApi.RetailCatUpdate(toStore.VendorStoreID, v.Name, &mtwmapi.Param4UpdateCat{
// //CategoryCodeOrigin: v.Code, // // CategoryNameOrigin: v.Name,
// //CategoryCode: v.Code, // // //CategoryCodeOrigin: v.Code,
// SecondaryCategoryCode: c.Code, // // //CategoryCode: v.Code,
// SecondaryCategoryName: c.Name, // // SecondaryCategoryCode: c.Code,
// Sequence: c.Sequence, // // SecondaryCategoryName: c.Name,
// }); err3 != nil { // // Sequence: c.Sequence,
// globals.SugarLogger.Debugf("err := RetailCatUpdate Children : %v", err3) // // }); err3 != nil {
// } // // globals.SugarLogger.Debugf("err := RetailCatUpdate Children : %v", err3)
// } // // }
// } // // }
//} // // }
// //}
case 2: //
i := offSet // case 2:
for { // i := offSet
// 同步商品 // for {
fromFoodList, err1 := fromApi.RetailListAll(fromStoreId, i) // // 同步商品
if len(fromFoodList) == 0 || fromFoodList == nil { // fromFoodList, err1 := fromApi.RetailListAll(fromStoreId, i)
return nil, fmt.Errorf("fromFoodList 为空 %s ,i:= %d", utils.Format4Output(err1, false), i) // if len(fromFoodList) == 0 || fromFoodList == nil {
} // return nil, fmt.Errorf("fromFoodList 为空 %s ,i:= %d", utils.Format4Output(err1, false), i)
// }
if err := BatchInitData(ctx, fromFoodList, toApi, toStore.VendorStoreID, i); err != nil { //
globals.SugarLogger.Debugf("BatchInitData : %s", utils.Format4Output(err, false)) // if err := BatchInitData(ctx, fromFoodList, toApi, toStore.VendorStoreID, i); err != nil {
} // globals.SugarLogger.Debugf("BatchInitData : %s", utils.Format4Output(err, false))
if len(fromFoodList) < 100 { // }
break // if len(fromFoodList) < 100 {
} // break
i++ // }
} // i++
// }
} //
return // }
} // return
task := tasksch.NewParallelTask(taskName, config, ctx, work, []int{1, 2}) //}
tasksch.HandleTask(task, nil, true).Run() //task := tasksch.NewParallelTask(taskName, config, ctx, work, []int{1, 2})
if !isAsync { //tasksch.HandleTask(task, nil, true).Run()
_, err = task.GetResult(0) //if !isAsync {
hint = "1" // _, err = task.GetResult(0)
} else { // hint = "1"
hint = task.ID //} else {
} // hint = task.ID
return hint, err //}
//return hint, err
} }
func LoadingStoreSkuList(ctx *jxcontext.Context, api *mtwmapi.API, poiCode string) (err []error) { func LoadingStoreSkuList(ctx *jxcontext.Context, api *mtwmapi.API, poiCode string) (err []error) {

3
business/partner/purchase/mtwm/order.go
View File

@@ -537,7 +537,7 @@ func (c *PurchaseHandler) PickupGoods(order *model.GoodsOrder, isSelfDelivery bo
// 美团专送、快送、混合送、美团企客 // 美团专送、快送、混合送、美团企客
logisticsCode := utils.Interface2String(orderDetail["logistics_code"]) logisticsCode := utils.Interface2String(orderDetail["logistics_code"])
isSelfDelivery = logisticsCode == mtwmapi.PeiSongTypeMTZSJM || logisticsCode == mtwmapi.PeiSongTypeMTZSZJ || logisticsCode == mtwmapi.PeiSongTypeKuaiDi || logisticsCode == mtwmapi.PeiSongTypeMixed || logisticsCode == mtwmapi.PeiSongTypeQiKe isSelfDelivery = logisticsCode == mtwmapi.PeiSongTypeMTZSJM || logisticsCode == mtwmapi.PeiSongTypeMTZSZJ || logisticsCode == mtwmapi.PeiSongTypeKuaiDi || logisticsCode == mtwmapi.PeiSongTypeMixed || logisticsCode == mtwmapi.PeiSongTypeQiKe || logisticsCode == mtwmapi.PeiSongTypeMixedExpressQiKe
//1001-专送（加盟）；1002-专送（自建） //1001-专送（加盟）；1002-专送（自建）
//2002-快送；3001-混合送（专送+快送) //2002-快送；3001-混合送（专送+快送)
//4015-企客远距离配送 //4015-企客远距离配送
@@ -554,6 +554,7 @@ func (c *PurchaseHandler) PickupGoods(order *model.GoodsOrder, isSelfDelivery bo
//PeiSongTypeKuaiDi = "2002" // 快送 //PeiSongTypeKuaiDi = "2002" // 快送
//PeiSongTypeWholeCity = "2010" // 全城送 //PeiSongTypeWholeCity = "2010" // 全城送
//PeiSongTypeMixed = "3001" // 混合送（即美团专送+快送） //PeiSongTypeMixed = "3001" // 混合送（即美团专送+快送）
//PeiSongTypeMixedExpressQiKe // 混合快送
if isSelfDelivery { if isSelfDelivery {
err = api.PreparationMealComplete(utils.Str2Int64(order.VendorOrderID)) err = api.PreparationMealComplete(utils.Str2Int64(order.VendorOrderID))
} }

2
controllers/cms_store_sku.go
View File

@@ -1057,7 +1057,7 @@ func (c *StoreSkuController) CopyMtToJd() {
// @router /CopyMtToMt [post] // @router /CopyMtToMt [post]
func (c *StoreSkuController) CopyMtToMt() { func (c *StoreSkuController) CopyMtToMt() {
c.callCopyMtToMt(func(params *tStoreSkuCopyMtToMtParams) (retVal interface{}, errCode string, err error) { c.callCopyMtToMt(func(params *tStoreSkuCopyMtToMtParams) (retVal interface{}, errCode string, err error) {
retVal, err = cms.CopyOnStoreSkuToOther(params.Ctx, params.FromStoreID, params.ToStoreID, false, params.OffSet) //retVal, err = cms.CopyOnStoreSkuToOther(params.Ctx, params.FromStoreID, params.ToStoreID, false, params.OffSet)
return retVal, errCode, err return retVal, errCode, err
}) })
} }

34
controllers/taobao_vegetable.go
View File

@@ -3,12 +3,6 @@ package controllers
import ( import (
"crypto/md5" "crypto/md5"
"fmt" "fmt"
"io/ioutil"
"net/http"
"net/url"
"sort"
"strings"
"git.rosy.net.cn/baseapi/platformapi/tao_vegetable" "git.rosy.net.cn/baseapi/platformapi/tao_vegetable"
"git.rosy.net.cn/baseapi/platformapi/tiktok_shop/tiktok_api" "git.rosy.net.cn/baseapi/platformapi/tiktok_shop/tiktok_api"
"git.rosy.net.cn/baseapi/utils" "git.rosy.net.cn/baseapi/utils"
@@ -18,6 +12,11 @@ import (
taoVegetable "git.rosy.net.cn/jx-callback/business/partner/purchase/tao_vegetable" taoVegetable "git.rosy.net.cn/jx-callback/business/partner/purchase/tao_vegetable"
"git.rosy.net.cn/jx-callback/globals/api" "git.rosy.net.cn/jx-callback/globals/api"
"github.com/astaxie/beego/server/web" "github.com/astaxie/beego/server/web"
"io/ioutil"
"net/http"
"net/url"
"sort"
"strings"
) )
type TaoBaoVegetableController struct { type TaoBaoVegetableController struct {
@@ -225,18 +224,27 @@ func (c *TaoBaoVegetableController) CancelOnSaleRefundOrder() {
return return
} }
default: default:
//callbackResponse := taoVegetable.OnCallbackMsg(tao_vegetable.OrderStatusOnSaleCancel, utils.Int64ToStr(afsOrder.PartCancelRequest.BizOrderId), afsOrder)
//c.Data["json"] = callbackResponse
order, err := partner.CurOrderManager.LoadOrder(utils.Int64ToStr(afsOrder.PartCancelRequest.BizOrderId), model.VendorIDTaoVegetable) order, err := partner.CurOrderManager.LoadOrder(utils.Int64ToStr(afsOrder.PartCancelRequest.BizOrderId), model.VendorIDTaoVegetable)
if err != nil || order.Status >= model.OrderStatusDelivering { if err != nil {
c.Data["json"] = tao_vegetable.CallBackResultOnSaleCancel(fmt.Errorf("不支持售中取消"))
c.ServeJSON()
} else {
c.Data["json"] = tao_vegetable.CallBackResultOnSaleCancel(nil) c.Data["json"] = tao_vegetable.CallBackResultOnSaleCancel(nil)
c.ServeJSON() c.ServeJSON()
return
} }
return if order.Status < model.OrderStatusDelivering || order.Status == model.OrderStatusCanceled {
if order.Status == model.OrderStatusCanceled {
c.Data["json"] = tao_vegetable.CallBackResultOnSaleCancel(nil)
c.ServeJSON()
}
if order.Status >= model.OrderStatusDelivering {
c.Data["json"] = tao_vegetable.CallBackResultOnSaleCancel(fmt.Errorf("不支持售中取消"))
c.ServeJSON()
} else {
c.Data["json"] = tao_vegetable.CallBackResultOnSaleCancel(nil)
c.ServeJSON()
}
}
} }
} }