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:
邹宗楠
2023-03-22 17:19:10 +08:00
parent 288c4a1607
commit 8a4d2f24fe
2 changed files with 37 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
business/jxstore/cms/sku.go
View File

@@ -1175,15 +1175,15 @@ func updateOrCreateSkuVendorCategoryMap(db *dao.DaoDB, ctx *jxcontext.Context, n
if skuNameExt.JdCategoryID != "" { if skuNameExt.JdCategoryID != "" {
updateOrCreate(model.VendorIDJD, nameID, skuNameExt.JdCategoryID) updateOrCreate(model.VendorIDJD, nameID, skuNameExt.JdCategoryID)
flag = true flag = true
} } /*else {
//else { handler, _ := partner.GetPurchasePlatformFromVendorID(model.VendorIDJD).(partner.IPurchasePlatformStoreSkuHandler)
// handler, _ := partner.GetPurchasePlatformFromVendorID(model.VendorIDJD).(partner.IPurchasePlatformStoreSkuHandler) vendorCategoryId, _ := handler.GetSkuCategoryIdByName(beego.AppConfig.DefaultString("jdOrgCode", "320406"), skuNameExt.Name)
// vendorCategoryId, _ := handler.GetSkuCategoryIdByName(beego.AppConfig.DefaultString("jdOrgCode", "320406"), skuNameExt.Name) if vendorCategoryId != "" {
// if vendorCategoryId != "" { updateOrCreate(model.VendorIDJD, nameID, skuNameExt.JdCategoryID)
// updateOrCreate(model.VendorIDJD, nameID, skuNameExt.JdCategoryID) flag = true
// flag = true }
// } }*/
//}
if skuNameExt.JdsCategoryID != "" { if skuNameExt.JdsCategoryID != "" {
updateOrCreate(model.VendorIDJDShop, nameID, skuNameExt.JdsCategoryID) updateOrCreate(model.VendorIDJDShop, nameID, skuNameExt.JdsCategoryID)
flag = true flag = true
@@ -1201,29 +1201,27 @@ func updateOrCreateSkuVendorCategoryMap(db *dao.DaoDB, ctx *jxcontext.Context, n
if skuNameExt.DdCategoryID != "" { if skuNameExt.DdCategoryID != "" {
updateOrCreate(model.VendorIDDD, nameID, skuNameExt.DdCategoryID) updateOrCreate(model.VendorIDDD, nameID, skuNameExt.DdCategoryID)
flag = true flag = true
} } /*else {
//else { handler, _ := partner.GetPurchasePlatformFromVendorID(model.VendorIDDD).(partner.IPurchasePlatformStoreSkuHandler)
// handler, _ := partner.GetPurchasePlatformFromVendorID(model.VendorIDDD).(partner.IPurchasePlatformStoreSkuHandler) imgs := fmt.Sprintf("%s|%s|%s|%s|%s|%s", skuNameExt.DescImg, skuNameExt.Img, skuNameExt.Img2, skuNameExt.Img3, skuNameExt.Img4, skuNameExt.Img5)
// imgs := fmt.Sprintf("%s,%s,%s,%s,%s,%s", skuNameExt.DescImg, skuNameExt.Img, skuNameExt.Img2, skuNameExt.Img3, skuNameExt.Img4, skuNameExt.Img5) vendorCategoryId, _ := handler.GetSkuCategoryIdByName("57939570", imgs)
// vendorCategoryId, _ := handler.GetSkuCategoryIdByName("57939570", imgs) if vendorCategoryId != "" {
// if vendorCategoryId != "" { updateOrCreate(model.VendorIDDD, nameID, skuNameExt.JdCategoryID)
// updateOrCreate(model.VendorIDDD, nameID, skuNameExt.JdCategoryID) flag = true
// flag = true }
// } }*/
//}
} else { } else {
if payload["jdCategoryID"] != nil { if payload["jdCategoryID"] != nil {
updateOrCreate(model.VendorIDJD, nameID, payload["jdCategoryID"].(string)) updateOrCreate(model.VendorIDJD, nameID, payload["jdCategoryID"].(string))
flag = true flag = true
} } /*else {
//else { handler, _ := partner.GetPurchasePlatformFromVendorID(model.VendorIDJD).(partner.IPurchasePlatformStoreSkuHandler)
// handler, _ := partner.GetPurchasePlatformFromVendorID(model.VendorIDJD).(partner.IPurchasePlatformStoreSkuHandler) vendorCategoryId, _ := handler.GetSkuCategoryIdByName(beego.AppConfig.DefaultString("jdOrgCode", "320406"), skuNameExt.Name)
// vendorCategoryId, _ := handler.GetSkuCategoryIdByName(beego.AppConfig.DefaultString("jdOrgCode", "320406"), skuNameExt.Name) if vendorCategoryId != "" {
// if vendorCategoryId != "" { updateOrCreate(model.VendorIDJD, nameID, skuNameExt.JdCategoryID)
// updateOrCreate(model.VendorIDJD, nameID, skuNameExt.JdCategoryID) flag = true
// flag = true }
// } }*/
//}
if payload["jdsCategoryID"] != nil { if payload["jdsCategoryID"] != nil {
updateOrCreate(model.VendorIDJDShop, nameID, payload["jdsCategoryID"].(string)) updateOrCreate(model.VendorIDJDShop, nameID, payload["jdsCategoryID"].(string))
flag = true flag = true
@@ -1239,16 +1237,15 @@ func updateOrCreateSkuVendorCategoryMap(db *dao.DaoDB, ctx *jxcontext.Context, n
if payload["ddCategoryID"] != nil { if payload["ddCategoryID"] != nil {
updateOrCreate(model.VendorIDDD, nameID, payload["ddCategoryID"].(string)) updateOrCreate(model.VendorIDDD, nameID, payload["ddCategoryID"].(string))
flag = true flag = true
} } /*else {
//else { handler, _ := partner.GetPurchasePlatformFromVendorID(model.VendorIDDD).(partner.IPurchasePlatformStoreSkuHandler)
// handler, _ := partner.GetPurchasePlatformFromVendorID(model.VendorIDDD).(partner.IPurchasePlatformStoreSkuHandler) imgs := fmt.Sprintf("%s,%s,%s,%s,%s,%s", skuNameExt.DescImg, skuNameExt.Img, skuNameExt.Img2, skuNameExt.Img3, skuNameExt.Img4, skuNameExt.Img5)
// imgs := fmt.Sprintf("%s,%s,%s,%s,%s,%s", skuNameExt.DescImg, skuNameExt.Img, skuNameExt.Img2, skuNameExt.Img3, skuNameExt.Img4, skuNameExt.Img5) vendorCategoryId, _ := handler.GetSkuCategoryIdByName("57939570", imgs)
// vendorCategoryId, _ := handler.GetSkuCategoryIdByName("57939570", imgs) if vendorCategoryId != "" {
// if vendorCategoryId != "" { updateOrCreate(model.VendorIDDD, nameID, skuNameExt.JdCategoryID)
// updateOrCreate(model.VendorIDDD, nameID, skuNameExt.JdCategoryID) flag = true
// flag = true }
// } }*/
//}
} }
} }
return flag return flag

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

@@ -258,13 +258,14 @@ func (c *PrinterHandler) PrintOrder(ctx *jxcontext.Context, store *model.Store,
printData[OrderStatus] = utils.Int2Str(130) printData[OrderStatus] = utils.Int2Str(130)
} }
printData[AppID] = "1000" // 菜市应用 printData[AppID] = "1000" // 菜市应用
if printData[VendorID] == utils.Int2Str(model.VendorIDEBAI) && printData[OrderStatus] == utils.Int2Str(model.OrderStatusFinishedPickup) { if printData[VendorID] == utils.Int2Str(model.VendorIDEBAI) && (printData[OrderStatus] == utils.Int2Str(model.OrderStatusFinishedPickup) || printData[OrderStatus] == utils.Int2Str(model.OrderStatusWaitAccepted)) {
printData[OrderStatus] = utils.Int2Str(model.OrderStatusNew) printData[OrderStatus] = utils.Int2Str(model.OrderStatusNew)
} }
orderPrint, err := json.Marshal(printData) orderPrint, err := json.Marshal(printData)
if err != nil { if err != nil {
return nil, err return nil, err
} }
globals.SugarLogger.Debugf("==========jxprintMsg:%s", string(orderPrint))
orderSel := utils.Int2Str(order.VendorID) + utils.Int2Str(order.OrderSeq) orderSel := utils.Int2Str(order.VendorID) + utils.Int2Str(order.OrderSeq)
return c.PrintMsg(ctx, store.PrinterSN, orderSel, "", string(orderPrint)) return c.PrintMsg(ctx, store.PrinterSN, orderSel, "", string(orderPrint))