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:
邹宗楠
2022-10-28 19:30:01 +08:00
parent 7c56405f7e
commit 853a2712dc
6 changed files with 1 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
business/jxstore/cms/sync2.go
View File

@@ -338,7 +338,6 @@ func OnCreateThing2Tiktok(ctx *jxcontext.Context, db *dao.DaoDB, appOrgCode stri
}
errList := errlist.New()
for _, v := range vendorThingList {
globals.SugarLogger.Debugf("==========本地商品id:[%d],主商品id:[%d],主商品属性:[%s]", v.LocalSkuId, v.MainId, v.SkuAttrId)
thingMap := &model.ThingMap{
ThingID: v.LocalSkuId,
ThingType: thingType,

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

@@ -616,7 +616,6 @@ func syncStoreSkuNew(ctx *jxcontext.Context, parentTask tasksch.ITask, causeFlag
}
return skuList
}
globals.SugarLogger.Debugf("bareSku2Sync==========%s", utils.Format4Output(bareSku2Sync, false))
isContinueWhenError2 := true
//如果是银豹平台，则要按照商品skuname维度同步

1
business/partner/purchase/tiktok_store/financial.go
View File

@@ -152,7 +152,6 @@ func (p *PurchaseHandler) OrderDetail2Financial(result *order_orderDetail_respon
} else {
err = nil
}
globals.SugarLogger.Debugf("==========3%s", utils.Format4Output(order, false))
// 订单
for _, x := range result.SkuOrderList {

8
business/partner/purchase/tiktok_store/order.go
View File

@@ -275,7 +275,6 @@ func (c *PurchaseHandler) onOrderMsg(msgId, orderId string, msg interface{}) (re
// 组装订单状态变化
status, appOrgCode := c.callbackMsg2Status(msgId, orderId, msg)
globals.SugarLogger.Debugf("==========-2%s,%d", utils.Format4Output(status, false), appOrgCode)
// 校验重复消息
if partner.CurOrderManager.GetStatusDuplicatedCount(status) > 0 {
return tiktokShop.Err2CallbackResponse(nil, "")
@@ -283,19 +282,14 @@ func (c *PurchaseHandler) onOrderMsg(msgId, orderId string, msg interface{}) (re
// 已经支付的订单,当做新订单创建在平台内部 -----------------
if msgId == tiktokShop.CallbackPayOrderMsgTagId {
globals.SugarLogger.Debugf("==========-1%d,%s", 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 {
return tiktokShop.Err2CallbackResponse(err, "")
}
if err := partner.CurOrderManager.OnOrderNew(order, status); err != nil {
return tiktokShop.Err2CallbackResponse(err, "")
}
globals.SugarLogger.Debugf("==========1%s", utils.Format4Output(order, false))
orderMap, err := c.getOrderMap("", orderId, "")
globals.SugarLogger.Debugf("==========2%s", utils.Format4Output(orderMap, false))
utils.CallFuncAsync(func() {
switch msgId {
case tiktokShop.CallbackPayOrderMsgTagId:
@@ -360,7 +354,6 @@ func (c *PurchaseHandler) callbackMsg2Status(msgId, orderId string, msg interfac
case tiktokShop.CallbackPayOrderMsgTagId:
orderMsg := tiktokShop.PayOrderData{}
if err := utils.Map2StructByJson(msg, &orderMsg, false); err != nil {
globals.SugarLogger.Debugf("==========-Map2StructByJson:%s", err)
return nil, 0
}
orderStatus.VendorOrderID = utils.Int64ToStr(orderMsg.PId)
@@ -619,7 +612,6 @@ func (c *PurchaseHandler) SelfDeliverDelivering(order *model.GoodsOrder, userNam
AddressId: 0,
StoreId: utils.Str2Int64(order.VendorStoreID),
}
globals.SugarLogger.Debugf("=============%s", utils.Format4Output(param, false))
return getAPI(order.VendorOrgCode, jxutils.GetSaleStoreIDFromOrder(order), "").OrderDelivering(param)
}

3
business/partner/purchase/tiktok_store/store.go
View File

@@ -103,7 +103,6 @@ func (P *PurchaseHandler) CreateStore2(db *dao.DaoDB, storeID int, userName stri
for j := 1; j <= 7; j++ {
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{
RowId: 1,
@@ -175,7 +174,7 @@ func CreateOrUpdateAll(vendorOrgCode string, storeID, vendorStoreID int64) error
if len(bindWarehouseAndFence) == 0 || utils.IsNil(bindWarehouseAndFence) { //未绑定仓库
if warehouseID, err := CreateWarehouse(vendorOrgCode, utils.Int64ToStr(storeID)); err != nil || warehouseID == 0 || utils.IsNil(warehouseID) {
errList.AddErr(fmt.Errorf("门店(%d) 创建仓库失败:%v", storeID, err))
} else { //绑定
} else { //绑定
if err = BindStoreWarehouse(vendorOrgCode, utils.Int64ToStr(storeID), vendorStoreID); err != nil { //仓库绑定通过自定义外部ID
errList.AddErr(fmt.Errorf("门店(%d) 绑定仓库:%d 失败:%v", storeID, warehouseID, err))
} else {

2
business/partner/purchase/tiktok_store/store_sku2_utils.go
View File

@@ -206,7 +206,6 @@ func (p *PurchaseHandler) createOrUpdateStoreSkus(ctx *jxcontext.Context, storeI
}
storeSku.VendorSkuAttrId = strings.Join(attrId, ",") // 属性id skuID
err = dao.CreateThingMap(int64(storeSku.SkuID), utils.Int64ToStr(tiktokResult.ProductId), storeDetail.VendorOrgCode, storeSku.VendorSkuAttrId)
globals.SugarLogger.Debugf("err=============%s", err)
} else {
storeSku.VendorMainId = localThing[0].VendorThingID
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.StoreId = utils.Str2Int64(vendorStoreID)
globals.SugarLogger.Debugf("CreateStoreCommodity==========:%s", utils.Format4Output(param, false))
// 抖店创建子商品
tiktokResultChildren, err := api.CreateStoreCommodity(param)
if err != nil {