From 8a4d2f24fe72b9b2f2afa6272d766e7b288c96c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= <zouzongnan1995@icloud.com>
Date: Wed, 22 Mar 2023 17:19:10 +0800
Subject: [PATCH] 1

---
 business/jxstore/cms/sku.go                 | 73 ++++++++++-----------
 business/partner/printer/jxprint/jxprint.go |  3 +-
 2 files changed, 37 insertions(+), 39 deletions(-)

diff --git a/business/jxstore/cms/sku.go b/business/jxstore/cms/sku.go
index 2b532b397..1d125ae7b 100644
--- a/business/jxstore/cms/sku.go
+++ b/business/jxstore/cms/sku.go
@@ -1175,15 +1175,15 @@ func updateOrCreateSkuVendorCategoryMap(db *dao.DaoDB, ctx *jxcontext.Context, n
 			if skuNameExt.JdCategoryID != "" {
 				updateOrCreate(model.VendorIDJD, nameID, skuNameExt.JdCategoryID)
 				flag = true
-			}
-			//else {
-			//	handler, _ := partner.GetPurchasePlatformFromVendorID(model.VendorIDJD).(partner.IPurchasePlatformStoreSkuHandler)
-			//	vendorCategoryId, _ := handler.GetSkuCategoryIdByName(beego.AppConfig.DefaultString("jdOrgCode", "320406"), skuNameExt.Name)
-			//	if vendorCategoryId != "" {
-			//		updateOrCreate(model.VendorIDJD, nameID, skuNameExt.JdCategoryID)
-			//		flag = true
-			//	}
-			//}
+			} /*else {
+				handler, _ := partner.GetPurchasePlatformFromVendorID(model.VendorIDJD).(partner.IPurchasePlatformStoreSkuHandler)
+				vendorCategoryId, _ := handler.GetSkuCategoryIdByName(beego.AppConfig.DefaultString("jdOrgCode", "320406"), skuNameExt.Name)
+				if vendorCategoryId != "" {
+					updateOrCreate(model.VendorIDJD, nameID, skuNameExt.JdCategoryID)
+					flag = true
+				}
+			}*/
+
 			if skuNameExt.JdsCategoryID != "" {
 				updateOrCreate(model.VendorIDJDShop, nameID, skuNameExt.JdsCategoryID)
 				flag = true
@@ -1201,29 +1201,27 @@ func updateOrCreateSkuVendorCategoryMap(db *dao.DaoDB, ctx *jxcontext.Context, n
 			if skuNameExt.DdCategoryID != "" {
 				updateOrCreate(model.VendorIDDD, nameID, skuNameExt.DdCategoryID)
 				flag = true
-			}
-			//else {
-			//	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)
-			//	vendorCategoryId, _ := handler.GetSkuCategoryIdByName("57939570", imgs)
-			//	if vendorCategoryId != "" {
-			//		updateOrCreate(model.VendorIDDD, nameID, skuNameExt.JdCategoryID)
-			//		flag = true
-			//	}
-			//}
+			} /*else {
+				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)
+				vendorCategoryId, _ := handler.GetSkuCategoryIdByName("57939570", imgs)
+				if vendorCategoryId != "" {
+					updateOrCreate(model.VendorIDDD, nameID, skuNameExt.JdCategoryID)
+					flag = true
+				}
+			}*/
 		} else {
 			if payload["jdCategoryID"] != nil {
 				updateOrCreate(model.VendorIDJD, nameID, payload["jdCategoryID"].(string))
 				flag = true
-			}
-			//else {
-			//	handler, _ := partner.GetPurchasePlatformFromVendorID(model.VendorIDJD).(partner.IPurchasePlatformStoreSkuHandler)
-			//	vendorCategoryId, _ := handler.GetSkuCategoryIdByName(beego.AppConfig.DefaultString("jdOrgCode", "320406"), skuNameExt.Name)
-			//	if vendorCategoryId != "" {
-			//		updateOrCreate(model.VendorIDJD, nameID, skuNameExt.JdCategoryID)
-			//		flag = true
-			//	}
-			//}
+			} /*else {
+				handler, _ := partner.GetPurchasePlatformFromVendorID(model.VendorIDJD).(partner.IPurchasePlatformStoreSkuHandler)
+				vendorCategoryId, _ := handler.GetSkuCategoryIdByName(beego.AppConfig.DefaultString("jdOrgCode", "320406"), skuNameExt.Name)
+				if vendorCategoryId != "" {
+					updateOrCreate(model.VendorIDJD, nameID, skuNameExt.JdCategoryID)
+					flag = true
+				}
+			}*/
 			if payload["jdsCategoryID"] != nil {
 				updateOrCreate(model.VendorIDJDShop, nameID, payload["jdsCategoryID"].(string))
 				flag = true
@@ -1239,16 +1237,15 @@ func updateOrCreateSkuVendorCategoryMap(db *dao.DaoDB, ctx *jxcontext.Context, n
 			if payload["ddCategoryID"] != nil {
 				updateOrCreate(model.VendorIDDD, nameID, payload["ddCategoryID"].(string))
 				flag = true
-			}
-			//else {
-			//	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)
-			//	vendorCategoryId, _ := handler.GetSkuCategoryIdByName("57939570", imgs)
-			//	if vendorCategoryId != "" {
-			//		updateOrCreate(model.VendorIDDD, nameID, skuNameExt.JdCategoryID)
-			//		flag = true
-			//	}
-			//}
+			} /*else {
+				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)
+				vendorCategoryId, _ := handler.GetSkuCategoryIdByName("57939570", imgs)
+				if vendorCategoryId != "" {
+					updateOrCreate(model.VendorIDDD, nameID, skuNameExt.JdCategoryID)
+					flag = true
+				}
+			}*/
 		}
 	}
 	return flag
diff --git a/business/partner/printer/jxprint/jxprint.go b/business/partner/printer/jxprint/jxprint.go
index 0f0032de2..cadd9d1fe 100644
--- a/business/partner/printer/jxprint/jxprint.go
+++ b/business/partner/printer/jxprint/jxprint.go
@@ -258,13 +258,14 @@ func (c *PrinterHandler) PrintOrder(ctx *jxcontext.Context, store *model.Store,
 		printData[OrderStatus] = utils.Int2Str(130)
 	}
 	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)
 	}
 	orderPrint, err := json.Marshal(printData)
 	if err != nil {
 		return nil, err
 	}
+	globals.SugarLogger.Debugf("==========jxprintMsg:%s", string(orderPrint))
 
 	orderSel := utils.Int2Str(order.VendorID) + utils.Int2Str(order.OrderSeq)
 	return c.PrintMsg(ctx, store.PrinterSN, orderSel, "", string(orderPrint))