liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'jdshop' of https://e.coding.net/rosydev/jx-callback into jdshop

Browse Source
This commit is contained in:
richboo111
2023-02-16 17:06:39 +08:00
parent d504e54eaf d5aa0a41fc
commit 9dad61ed48
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
business/partner/printer/feie/feie_test.go
View File

@@ -44,7 +44,7 @@ func TestRegisterPrinter(t *testing.T) {
}
func TestGetPrinterStatus(t *testing.T) {
sn, err := CurPrinterHandler.GetPrinterStatus(nil, "922591501", "fczh8zwv")
sn, err := CurPrinterHandler.GetPrinterStatus(nil, "222514142", "sj572rdp")
t.Log(sn)
if err != nil {
t.Fatal(err)

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

@@ -251,8 +251,8 @@ func (p *PurchaseHandler) createOrUpdateStoreSkus(ctx *jxcontext.Context, storeI
updateParam.ProductId = mainOrderDetail.ProductId
updateParam.MainProductId = mainProductId
updateParam.SpecPrices = param.SpecPrices
if err := api.EditStoreCommodity(updateParam); err != nil {
failedList = putils.GetErrMsg2FailedSingleList(storeSku, err, storeID, model.VendorChineseNames[model.VendorIDDD], syncType)
if err2 := api.EditStoreCommodity(updateParam); err2 != nil {
failedList = putils.GetErrMsg2FailedSingleList(storeSku, err2, storeID, model.VendorChineseNames[model.VendorIDDD], syncType)
storeSku.VendorSkuID = utils.Int2Str(storeSku.SkuID)
}
failedList = putils.GetErrMsg2FailedSingleList(storeSku, errors.New("修改主品,主品审核中/失败,子商品未创建"), storeID, model.VendorChineseNames[model.VendorIDDD], syncType)
@@ -462,7 +462,7 @@ func makeMainProductSku(db *dao.DaoDB, api *tiktokShop.API, storeSku *dao.StoreS
return
}
}
param.StandardBrandId = 789194134 // 默认品牌京西菜市 596120136
param.StandardBrandId = 596120136 // 默认品牌京西菜市 596120136
param.FreightId, param.SaleLimitId, err = getFreightIdAndSaleLimitId(api, db, storeDetail, vendorStoreID)
if err != nil {
failedList = putils.GetErrMsg2FailedSingleList(storeSku, err, storeID, model.VendorChineseNames[model.VendorIDDD], syncType)