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-12-12 14:29:27 +08:00
parent c9be3f4bf0
commit 7eadd314b8
2 changed files with 31 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
business/partner/printer/jxprint/jxprint.go
View File

@@ -242,22 +242,23 @@ func (c *PrinterHandler) PrintOrder(ctx *jxcontext.Context, store *model.Store,
return return
} }
var printData = make(map[string]string, 0) var printData = make(map[string]string, 0)
printData[AppID] = "1000" // 菜市应用
switch printType { switch printType {
case "order": // 订单状态 case "order": // 订单状态
printData = ManagerOrderPrint(order, store.Tel1, storeDetail, printType, afs)
printData[OrderStatus] = utils.Int2Str(order.Status) printData[OrderStatus] = utils.Int2Str(order.Status)
printData = ManagerOrderPrint(order, store.Tel1, storeDetail, printType, afs)
case "wayBill": // 运单状态 case "wayBill": // 运单状态
printData[WayBillStatus] = order.VendorStatus
printData = ManagerOrderPrint(order, store.Tel1, storeDetail, printType, afs) printData = ManagerOrderPrint(order, store.Tel1, storeDetail, printType, afs)
printData[WayBillStatus] = order.VendorStatus
case "store": // 门店状态 case "store": // 门店状态
printData[StoreStatus] = utils.Int2Str(store.Status) printData[StoreStatus] = utils.Int2Str(store.Status)
case "enter": // 催单 case "enter": // 催单
printData[ReminderStatus] = "1" printData[ReminderStatus] = "1"
case "afs": // 售后 case "afs": // 售后
printData[OrderStatus] = utils.Int2Str(130)
printData = ManagerOrderPrint(order, store.Tel1, storeDetail, printType, afs) printData = ManagerOrderPrint(order, store.Tel1, storeDetail, printType, afs)
printData[OrderStatus] = utils.Int2Str(130)
} }
printData[AppID] = "1000" // 菜市应用
orderPrint, err := json.Marshal(printData) orderPrint, err := json.Marshal(printData)
if err != nil { if err != nil {
return nil, err return nil, err

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

@@ -211,7 +211,6 @@ func (p *PurchaseHandler) createOrUpdateStoreSkus(ctx *jxcontext.Context, storeI
param.StandardBrandId = 789194134 // 默认品牌京西菜市 596120136 param.StandardBrandId = 789194134 // 默认品牌京西菜市 596120136
// 创建子商品
temp, err := dao.QueryStoreBindInfo(storeDetail.Store.ID) temp, err := dao.QueryStoreBindInfo(storeDetail.Store.ID)
if err != nil || temp == nil || temp.ID == 0 { if err != nil || temp == nil || temp.ID == 0 {
// 运费模板 // 运费模板
@@ -266,21 +265,32 @@ func (p *PurchaseHandler) createOrUpdateStoreSkus(ctx *jxcontext.Context, storeI
// 获取本地存储映射关系,获取本地主商品id是否存在 // 获取本地存储映射关系,获取本地主商品id是否存在
localThing, err := dao.GetThingToTiktokMapList(db, model.VendorIDDD, int64(storeSku.SkuID)) localThing, err := dao.GetThingToTiktokMapList(db, model.VendorIDDD, int64(storeSku.SkuID))
if len(localThing) == 0 { if len(localThing) == 0 {
// 看看本地保存了没,没有的话可能该商品没创建主商品 // 看看本地保存了没,没有的话可能该商品没创建主商品!查查线上有没有
tiktokResult, err := api.CreateStoreCommodity(param) // 创建主商品 mainOrderDetail, err := api.GetSkuDetailLocalID("", utils.Int2Str(storeSku.SkuID))
if err != nil { if err != nil || mainOrderDetail == nil || mainOrderDetail.ProductIdStr == "" {
failedList = putils.GetErrMsg2FailedSingleList(storeSkuList, err, storeID, model.VendorChineseNames[model.VendorIDDD], syncType) tiktokResult, err := api.CreateStoreCommodity(param) // 创建主商品
storeSku.VendorSkuID = utils.Int2Str(storeSku.SkuID) if err != nil {
continue failedList = putils.GetErrMsg2FailedSingleList(storeSkuList, err, storeID, model.VendorChineseNames[model.VendorIDDD], syncType)
} storeSku.VendorSkuID = utils.Int2Str(storeSku.SkuID)
continue
}
tiktokResultProductId = tiktokResult.ProductId tiktokResultProductId = tiktokResult.ProductId
var attrId []string var attrId []string
for _, v := range tiktokResult.Sku { for _, v := range tiktokResult.Sku {
attrId = append(attrId, utils.Int64ToStr(v.SkuId)) 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 { } 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
@@ -296,7 +306,7 @@ func (p *PurchaseHandler) createOrUpdateStoreSkus(ctx *jxcontext.Context, storeI
} }
continue continue
} }
storeSku.VendorSonSkuID = utils.Int64ToStr(childrenProductId) // 属性id skuID storeSku.VendorSonSkuID = utils.Int64ToStr(childrenProductId) // 属性id skuID(自商品的商品id)
storeSku.VendorSkuID = utils.Int64ToStr(childrenProductId) // 子商品主id storeSku.VendorSkuID = utils.Int64ToStr(childrenProductId) // 子商品主id
storeSku.VendorMainId = utils.Int64ToStr(tiktokResultProductId) // 商品主id storeSku.VendorMainId = utils.Int64ToStr(tiktokResultProductId) // 商品主id
//param.MainProductId = tiktokResultProductId //param.MainProductId = tiktokResultProductId
@@ -316,7 +326,7 @@ func (p *PurchaseHandler) createOrUpdateStoreSkus(ctx *jxcontext.Context, storeI
//for _, v := range tiktokResultChildren.Sku { //for _, v := range tiktokResultChildren.Sku {
// attrId2 = append(attrId2, utils.Int64ToStr(v.SkuId)) // 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.VendorSkuID = utils.Int64ToStr(tiktokResultChildren.ProductId) // 子商品主id
//storeSku.VendorMainId = utils.Int64ToStr(tiktokResultProductId) // 商品主id //storeSku.VendorMainId = utils.Int64ToStr(tiktokResultProductId) // 商品主id
} }