From 7eadd314b806ed67a7b6ed9b3b4f82ec384c9fdc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Mon, 12 Dec 2022 14:29:27 +0800 Subject: [PATCH] 1 --- business/partner/printer/jxprint/jxprint.go | 9 ++-- .../purchase/tiktok_store/store_sku2_utils.go | 42 ++++++++++++------- 2 files changed, 31 insertions(+), 20 deletions(-) diff --git a/business/partner/printer/jxprint/jxprint.go b/business/partner/printer/jxprint/jxprint.go index 4485b7a90..05d238e69 100644 --- a/business/partner/printer/jxprint/jxprint.go +++ b/business/partner/printer/jxprint/jxprint.go @@ -242,22 +242,23 @@ func (c *PrinterHandler) PrintOrder(ctx *jxcontext.Context, store *model.Store, return } var printData = make(map[string]string, 0) - printData[AppID] = "1000" // 菜市应用 switch printType { case "order": // 订单状态 + printData = ManagerOrderPrint(order, store.Tel1, storeDetail, printType, afs) printData[OrderStatus] = utils.Int2Str(order.Status) - printData = ManagerOrderPrint(order, store.Tel1, storeDetail, printType, afs) case "wayBill": // 运单状态 - printData[WayBillStatus] = order.VendorStatus printData = ManagerOrderPrint(order, store.Tel1, storeDetail, printType, afs) + printData[WayBillStatus] = order.VendorStatus case "store": // 门店状态 printData[StoreStatus] = utils.Int2Str(store.Status) case "enter": // 催单 printData[ReminderStatus] = "1" case "afs": // 售后 - printData[OrderStatus] = utils.Int2Str(130) printData = ManagerOrderPrint(order, store.Tel1, storeDetail, printType, afs) + printData[OrderStatus] = utils.Int2Str(130) } + printData[AppID] = "1000" // 菜市应用 + orderPrint, err := json.Marshal(printData) if err != nil { return nil, err diff --git a/business/partner/purchase/tiktok_store/store_sku2_utils.go b/business/partner/purchase/tiktok_store/store_sku2_utils.go index ac29ad660..1c6800681 100644 --- a/business/partner/purchase/tiktok_store/store_sku2_utils.go +++ b/business/partner/purchase/tiktok_store/store_sku2_utils.go @@ -211,7 +211,6 @@ func (p *PurchaseHandler) createOrUpdateStoreSkus(ctx *jxcontext.Context, storeI param.StandardBrandId = 789194134 // 默认品牌京西菜市 596120136 - // 创建子商品 temp, err := dao.QueryStoreBindInfo(storeDetail.Store.ID) if err != nil || temp == nil || temp.ID == 0 { // 运费模板 @@ -266,21 +265,32 @@ func (p *PurchaseHandler) createOrUpdateStoreSkus(ctx *jxcontext.Context, storeI // 获取本地存储映射关系,获取本地主商品id是否存在 localThing, err := dao.GetThingToTiktokMapList(db, model.VendorIDDD, int64(storeSku.SkuID)) if len(localThing) == 0 { - // 看看本地保存了没,没有的话可能该商品没创建主商品 - tiktokResult, err := api.CreateStoreCommodity(param) // 创建主商品 - if err != nil { - failedList = putils.GetErrMsg2FailedSingleList(storeSkuList, err, storeID, model.VendorChineseNames[model.VendorIDDD], syncType) - storeSku.VendorSkuID = utils.Int2Str(storeSku.SkuID) - continue - } + // 看看本地保存了没,没有的话可能该商品没创建主商品!查查线上有没有 + mainOrderDetail, err := api.GetSkuDetailLocalID("", utils.Int2Str(storeSku.SkuID)) + if err != nil || mainOrderDetail == nil || mainOrderDetail.ProductIdStr == "" { + tiktokResult, err := api.CreateStoreCommodity(param) // 创建主商品 + if err != nil { + failedList = putils.GetErrMsg2FailedSingleList(storeSkuList, err, storeID, model.VendorChineseNames[model.VendorIDDD], syncType) + storeSku.VendorSkuID = utils.Int2Str(storeSku.SkuID) + continue + } - tiktokResultProductId = tiktokResult.ProductId - var attrId []string - for _, v := range tiktokResult.Sku { - attrId = append(attrId, utils.Int64ToStr(v.SkuId)) + tiktokResultProductId = tiktokResult.ProductId + var attrId []string + for _, v := range tiktokResult.Sku { + attrId = append(attrId, utils.Int64ToStr(v.SkuId)) + } + storeSku.VendorSkuAttrId = strings.Join(attrId, ",") // 属性id skuID + err = dao.CreateThingMap(int64(storeSku.SkuID), utils.Int64ToStr(tiktokResult.ProductId), storeDetail.VendorOrgCode, storeSku.VendorSkuAttrId) + } else { + storeSku.VendorMainId = mainOrderDetail.ProductIdStr + var attrId []string + for _, v := range mainOrderDetail.SpecPrices { + attrId = append(attrId, utils.Int64ToStr(v.SkuId)) + } + storeSku.VendorSkuAttrId = strings.Join(attrId, ",") // 属性id skuID + tiktokResultProductId = mainOrderDetail.ProductId } - storeSku.VendorSkuAttrId = strings.Join(attrId, ",") // 属性id skuID - err = dao.CreateThingMap(int64(storeSku.SkuID), utils.Int64ToStr(tiktokResult.ProductId), storeDetail.VendorOrgCode, storeSku.VendorSkuAttrId) } else { storeSku.VendorMainId = localThing[0].VendorThingID storeSku.VendorSkuAttrId = localThing[0].Remark // 属性id skuID @@ -296,7 +306,7 @@ func (p *PurchaseHandler) createOrUpdateStoreSkus(ctx *jxcontext.Context, storeI } continue } - storeSku.VendorSonSkuID = utils.Int64ToStr(childrenProductId) // 属性id skuID + storeSku.VendorSonSkuID = utils.Int64ToStr(childrenProductId) // 属性id skuID(自商品的商品id) storeSku.VendorSkuID = utils.Int64ToStr(childrenProductId) // 子商品主id storeSku.VendorMainId = utils.Int64ToStr(tiktokResultProductId) // 商品主id //param.MainProductId = tiktokResultProductId @@ -316,7 +326,7 @@ func (p *PurchaseHandler) createOrUpdateStoreSkus(ctx *jxcontext.Context, storeI //for _, v := range tiktokResultChildren.Sku { // attrId2 = append(attrId2, utils.Int64ToStr(v.SkuId)) //} - //storeSku.VendorSonSkuID = strings.Join(attrId2, ",") // 属性id skuID + //storeSku.VendorSonSkuID = strings.Join(attrId2, ",") // 属性id skuID(子商品的属性id) //storeSku.VendorSkuID = utils.Int64ToStr(tiktokResultChildren.ProductId) // 子商品主id //storeSku.VendorMainId = utils.Int64ToStr(tiktokResultProductId) // 商品主id }