1
This commit is contained in:
@@ -338,7 +338,6 @@ func OnCreateThing2Tiktok(ctx *jxcontext.Context, db *dao.DaoDB, appOrgCode stri
|
|||||||
}
|
}
|
||||||
errList := errlist.New()
|
errList := errlist.New()
|
||||||
for _, v := range vendorThingList {
|
for _, v := range vendorThingList {
|
||||||
globals.SugarLogger.Debugf("==========本地商品id:[%d],主商品id:[%d],主商品属性:[%s]", v.LocalSkuId, v.MainId, v.SkuAttrId)
|
|
||||||
thingMap := &model.ThingMap{
|
thingMap := &model.ThingMap{
|
||||||
ThingID: v.LocalSkuId,
|
ThingID: v.LocalSkuId,
|
||||||
ThingType: thingType,
|
ThingType: thingType,
|
||||||
|
|||||||
@@ -616,7 +616,6 @@ func syncStoreSkuNew(ctx *jxcontext.Context, parentTask tasksch.ITask, causeFlag
|
|||||||
}
|
}
|
||||||
return skuList
|
return skuList
|
||||||
}
|
}
|
||||||
globals.SugarLogger.Debugf("bareSku2Sync==========%s", utils.Format4Output(bareSku2Sync, false))
|
|
||||||
|
|
||||||
isContinueWhenError2 := true
|
isContinueWhenError2 := true
|
||||||
//如果是银豹平台,则要按照商品skuname维度同步
|
//如果是银豹平台,则要按照商品skuname维度同步
|
||||||
|
|||||||
@@ -152,7 +152,6 @@ func (p *PurchaseHandler) OrderDetail2Financial(result *order_orderDetail_respon
|
|||||||
} else {
|
} else {
|
||||||
err = nil
|
err = nil
|
||||||
}
|
}
|
||||||
globals.SugarLogger.Debugf("==========3%s", utils.Format4Output(order, false))
|
|
||||||
|
|
||||||
// 订单
|
// 订单
|
||||||
for _, x := range result.SkuOrderList {
|
for _, x := range result.SkuOrderList {
|
||||||
|
|||||||
@@ -275,7 +275,6 @@ func (c *PurchaseHandler) onOrderMsg(msgId, orderId string, msg interface{}) (re
|
|||||||
|
|
||||||
// 组装订单状态变化
|
// 组装订单状态变化
|
||||||
status, appOrgCode := c.callbackMsg2Status(msgId, orderId, msg)
|
status, appOrgCode := c.callbackMsg2Status(msgId, orderId, msg)
|
||||||
globals.SugarLogger.Debugf("==========-2%s,%d", utils.Format4Output(status, false), appOrgCode)
|
|
||||||
// 校验重复消息
|
// 校验重复消息
|
||||||
if partner.CurOrderManager.GetStatusDuplicatedCount(status) > 0 {
|
if partner.CurOrderManager.GetStatusDuplicatedCount(status) > 0 {
|
||||||
return tiktokShop.Err2CallbackResponse(nil, "")
|
return tiktokShop.Err2CallbackResponse(nil, "")
|
||||||
@@ -283,19 +282,14 @@ func (c *PurchaseHandler) onOrderMsg(msgId, orderId string, msg interface{}) (re
|
|||||||
|
|
||||||
// 已经支付的订单,当做新订单创建在平台内部 -----------------
|
// 已经支付的订单,当做新订单创建在平台内部 -----------------
|
||||||
if msgId == tiktokShop.CallbackPayOrderMsgTagId {
|
if msgId == tiktokShop.CallbackPayOrderMsgTagId {
|
||||||
globals.SugarLogger.Debugf("==========-1%d,%s", appOrgCode, orderId)
|
|
||||||
order, err := c.GetOrder(utils.Int64ToStr(appOrgCode), orderId, "") // 获取平台订单详情,制作本地订单
|
order, err := c.GetOrder(utils.Int64ToStr(appOrgCode), orderId, "") // 获取平台订单详情,制作本地订单
|
||||||
globals.SugarLogger.Debugf("==========0%s", utils.Format4Output(order, false))
|
|
||||||
globals.SugarLogger.Debugf("==========5%s", err)
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return tiktokShop.Err2CallbackResponse(err, "")
|
return tiktokShop.Err2CallbackResponse(err, "")
|
||||||
}
|
}
|
||||||
if err := partner.CurOrderManager.OnOrderNew(order, status); err != nil {
|
if err := partner.CurOrderManager.OnOrderNew(order, status); err != nil {
|
||||||
return tiktokShop.Err2CallbackResponse(err, "")
|
return tiktokShop.Err2CallbackResponse(err, "")
|
||||||
}
|
}
|
||||||
globals.SugarLogger.Debugf("==========1%s", utils.Format4Output(order, false))
|
|
||||||
orderMap, err := c.getOrderMap("", orderId, "")
|
orderMap, err := c.getOrderMap("", orderId, "")
|
||||||
globals.SugarLogger.Debugf("==========2%s", utils.Format4Output(orderMap, false))
|
|
||||||
utils.CallFuncAsync(func() {
|
utils.CallFuncAsync(func() {
|
||||||
switch msgId {
|
switch msgId {
|
||||||
case tiktokShop.CallbackPayOrderMsgTagId:
|
case tiktokShop.CallbackPayOrderMsgTagId:
|
||||||
@@ -360,7 +354,6 @@ func (c *PurchaseHandler) callbackMsg2Status(msgId, orderId string, msg interfac
|
|||||||
case tiktokShop.CallbackPayOrderMsgTagId:
|
case tiktokShop.CallbackPayOrderMsgTagId:
|
||||||
orderMsg := tiktokShop.PayOrderData{}
|
orderMsg := tiktokShop.PayOrderData{}
|
||||||
if err := utils.Map2StructByJson(msg, &orderMsg, false); err != nil {
|
if err := utils.Map2StructByJson(msg, &orderMsg, false); err != nil {
|
||||||
globals.SugarLogger.Debugf("==========-Map2StructByJson:%s", err)
|
|
||||||
return nil, 0
|
return nil, 0
|
||||||
}
|
}
|
||||||
orderStatus.VendorOrderID = utils.Int64ToStr(orderMsg.PId)
|
orderStatus.VendorOrderID = utils.Int64ToStr(orderMsg.PId)
|
||||||
@@ -619,7 +612,6 @@ func (c *PurchaseHandler) SelfDeliverDelivering(order *model.GoodsOrder, userNam
|
|||||||
AddressId: 0,
|
AddressId: 0,
|
||||||
StoreId: utils.Str2Int64(order.VendorStoreID),
|
StoreId: utils.Str2Int64(order.VendorStoreID),
|
||||||
}
|
}
|
||||||
globals.SugarLogger.Debugf("=============%s", utils.Format4Output(param, false))
|
|
||||||
return getAPI(order.VendorOrgCode, jxutils.GetSaleStoreIDFromOrder(order), "").OrderDelivering(param)
|
return getAPI(order.VendorOrgCode, jxutils.GetSaleStoreIDFromOrder(order), "").OrderDelivering(param)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -103,7 +103,6 @@ func (P *PurchaseHandler) CreateStore2(db *dao.DaoDB, storeID int, userName stri
|
|||||||
for j := 1; j <= 7; j++ {
|
for j := 1; j <= 7; j++ {
|
||||||
m[int64(j)] = timeStr
|
m[int64(j)] = timeStr
|
||||||
}
|
}
|
||||||
globals.SugarLogger.Debug("storeDetail.OpenTime1, storeDetail.CloseTime1, storeDetail.OpenTime2, storeDetail.CloseTime2,timeStr===========", storeDetail.OpenTime1, storeDetail.CloseTime1, storeDetail.OpenTime2, storeDetail.CloseTime2, timeStr)
|
|
||||||
}
|
}
|
||||||
list := shop_batchCreateStore_request.StoreListItem{
|
list := shop_batchCreateStore_request.StoreListItem{
|
||||||
RowId: 1,
|
RowId: 1,
|
||||||
@@ -175,7 +174,7 @@ func CreateOrUpdateAll(vendorOrgCode string, storeID, vendorStoreID int64) error
|
|||||||
if len(bindWarehouseAndFence) == 0 || utils.IsNil(bindWarehouseAndFence) { //未绑定仓库
|
if len(bindWarehouseAndFence) == 0 || utils.IsNil(bindWarehouseAndFence) { //未绑定仓库
|
||||||
if warehouseID, err := CreateWarehouse(vendorOrgCode, utils.Int64ToStr(storeID)); err != nil || warehouseID == 0 || utils.IsNil(warehouseID) {
|
if warehouseID, err := CreateWarehouse(vendorOrgCode, utils.Int64ToStr(storeID)); err != nil || warehouseID == 0 || utils.IsNil(warehouseID) {
|
||||||
errList.AddErr(fmt.Errorf("门店(%d) 创建仓库失败:%v", storeID, err))
|
errList.AddErr(fmt.Errorf("门店(%d) 创建仓库失败:%v", storeID, err))
|
||||||
} else { //绑定
|
} else { //绑定
|
||||||
if err = BindStoreWarehouse(vendorOrgCode, utils.Int64ToStr(storeID), vendorStoreID); err != nil { //仓库绑定通过自定义外部ID
|
if err = BindStoreWarehouse(vendorOrgCode, utils.Int64ToStr(storeID), vendorStoreID); err != nil { //仓库绑定通过自定义外部ID
|
||||||
errList.AddErr(fmt.Errorf("门店(%d) 绑定仓库:%d 失败:%v", storeID, warehouseID, err))
|
errList.AddErr(fmt.Errorf("门店(%d) 绑定仓库:%d 失败:%v", storeID, warehouseID, err))
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
@@ -206,7 +206,6 @@ func (p *PurchaseHandler) createOrUpdateStoreSkus(ctx *jxcontext.Context, storeI
|
|||||||
}
|
}
|
||||||
storeSku.VendorSkuAttrId = strings.Join(attrId, ",") // 属性id skuID
|
storeSku.VendorSkuAttrId = strings.Join(attrId, ",") // 属性id skuID
|
||||||
err = dao.CreateThingMap(int64(storeSku.SkuID), utils.Int64ToStr(tiktokResult.ProductId), storeDetail.VendorOrgCode, storeSku.VendorSkuAttrId)
|
err = dao.CreateThingMap(int64(storeSku.SkuID), utils.Int64ToStr(tiktokResult.ProductId), storeDetail.VendorOrgCode, storeSku.VendorSkuAttrId)
|
||||||
globals.SugarLogger.Debugf("err=============%s", err)
|
|
||||||
} else {
|
} else {
|
||||||
storeSku.VendorMainId = localThing[0].VendorThingID
|
storeSku.VendorMainId = localThing[0].VendorThingID
|
||||||
storeSku.VendorSkuAttrId = localThing[0].Remark // 属性id skuID
|
storeSku.VendorSkuAttrId = localThing[0].Remark // 属性id skuID
|
||||||
@@ -246,7 +245,6 @@ func (p *PurchaseHandler) createOrUpdateStoreSkus(ctx *jxcontext.Context, storeI
|
|||||||
param.SpecPrices = GetSpecPrices(param.Specs, vendorStoreID, tiktokResultProductId, storeSku)
|
param.SpecPrices = GetSpecPrices(param.Specs, vendorStoreID, tiktokResultProductId, storeSku)
|
||||||
|
|
||||||
param.StoreId = utils.Str2Int64(vendorStoreID)
|
param.StoreId = utils.Str2Int64(vendorStoreID)
|
||||||
globals.SugarLogger.Debugf("CreateStoreCommodity==========:%s", utils.Format4Output(param, false))
|
|
||||||
// 抖店创建子商品
|
// 抖店创建子商品
|
||||||
tiktokResultChildren, err := api.CreateStoreCommodity(param)
|
tiktokResultChildren, err := api.CreateStoreCommodity(param)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
|||||||
Reference in New Issue
Block a user