From 5e2bca840d34006aa5d03bef250a81f90ef4295c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Tue, 21 Mar 2023 15:20:47 +0800 Subject: [PATCH 01/13] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E5=88=9B=E5=BB=BA=E5=88=86=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/jxstore/cms/sku.go | 32 ++++++++ business/jxutils/unipush/push.go | 31 +++++--- business/partner/partner_store_sku.go | 2 + business/partner/purchase/ebai/store_sku2.go | 4 + business/partner/purchase/elm/store.go | 4 + business/partner/purchase/jd/sku2.go | 13 ++++ business/partner/purchase/jdshop/store_sku.go | 4 + business/partner/purchase/jx/sku.go | 4 + business/partner/purchase/mtwm/store_sku2.go | 4 + business/partner/purchase/tiktok_store/dy.go | 78 ------------------- .../purchase/tiktok_store/store_sku2.go | 5 ++ .../partner/purchase/weimob/wsc/store_sku2.go | 3 + business/partner/purchase/yb/store_sku.go | 3 + 13 files changed, 98 insertions(+), 89 deletions(-) diff --git a/business/jxstore/cms/sku.go b/business/jxstore/cms/sku.go index 3b0e5dc1f..02502243d 100644 --- a/business/jxstore/cms/sku.go +++ b/business/jxstore/cms/sku.go @@ -1175,6 +1175,13 @@ 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 + } } if skuNameExt.JdsCategoryID != "" { updateOrCreate(model.VendorIDJDShop, nameID, skuNameExt.JdsCategoryID) @@ -1187,15 +1194,32 @@ func updateOrCreateSkuVendorCategoryMap(db *dao.DaoDB, ctx *jxcontext.Context, n if skuNameExt.MtwmCategoryID != "" { updateOrCreate(model.VendorIDMTWM, nameID, skuNameExt.MtwmCategoryID) flag = true + } else { + } 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 { 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 + } } if payload["jdsCategoryID"] != nil { updateOrCreate(model.VendorIDJDShop, nameID, payload["jdsCategoryID"].(string)) @@ -1212,6 +1236,14 @@ 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 + } } } } diff --git a/business/jxutils/unipush/push.go b/business/jxutils/unipush/push.go index 003567ba1..658b98350 100644 --- a/business/jxutils/unipush/push.go +++ b/business/jxutils/unipush/push.go @@ -15,6 +15,12 @@ import ( "git.rosy.net.cn/jx-callback/globals/api" ) +const ( + SoundsFileNewOrder = "newOrder.mp4" + SoundsFileNewAfsOrder = "newAfsOrder.mp4" + SoundsFileNewCancelOrder = "newCancelOrder.mp4" +) + // NotifyNewOrder 推送新订单 func NotifyNewOrder(order *model.GoodsOrder) { storeId := order.StoreID @@ -38,9 +44,10 @@ func NotifyNewOrder(order *model.GoodsOrder) { msg.VendorName = model.VendorChineseNames[order.VendorID] msg.OrderSqs = utils.Int2Str(order.OrderSeq) msg.StoreTitle = storeDetail.Name - msg.Context = "老板,你有新的订单了" + msg.Context = "老板,你有新的订单了!" context, _ := json.Marshal(msg) - pushMsgByUniApp(storeDetail.ID, storeDetail.Name, cid, string(context)) + body := msg.Context + model.VendorChineseNames[order.VendorID] + "#" + msg.OrderSqs + pushMsgByUniApp(storeDetail.ID, storeDetail.Name, cid, string(context), body, SoundsFileNewOrder) } func NotifyAfsOrder(afsOrder *model.AfsOrder) (err error) { @@ -63,11 +70,12 @@ func NotifyAfsOrder(afsOrder *model.AfsOrder) (err error) { msg.MsgType = "newAfsOrder" msg.VendorName = model.VendorChineseNames[afsOrder.VendorID] - msg.OrderSqs = "0" + msg.OrderSqs = afsOrder.VendorOrderID msg.StoreTitle = storeDetail.Name - msg.Context = "老板订单申请退款了" + msg.Context = "老板订单申请退款了!" context, _ := json.Marshal(msg) - pushMsgByUniApp(storeDetail.ID, storeDetail.Name, cid, string(context)) + body := msg.Context + model.VendorChineseNames[afsOrder.VendorID] + "#" + msg.OrderSqs + pushMsgByUniApp(storeDetail.ID, storeDetail.Name, cid, string(context), body, SoundsFileNewAfsOrder) return err } @@ -91,11 +99,12 @@ func NotifyOrderCanceled(order *model.GoodsOrder) (err error) { msg.MsgType = "newCancelOrder" msg.VendorName = model.VendorChineseNames[order.VendorID] - msg.OrderSqs = "0" + msg.OrderSqs = utils.Int2Str(order.OrderSeq) msg.StoreTitle = storeDetail.Name - msg.Context = "老板订单被取消了" + msg.Context = "老板订单被取消了!" context, _ := json.Marshal(msg) - pushMsgByUniApp(storeDetail.ID, storeDetail.Name, cid, string(context)) + body := msg.Context + model.VendorChineseNames[order.VendorID] + "#" + msg.OrderSqs + pushMsgByUniApp(storeDetail.ID, storeDetail.Name, cid, string(context), body, SoundsFileNewCancelOrder) return err } @@ -134,7 +143,7 @@ type MsgContext struct { OrderSqs string `json:"order_sqs"` // 订单流水号 } -func pushMsgByUniApp(storeId int, storeName string, cID []string, msg string) { +func pushMsgByUniApp(storeId int, storeName string, cID []string, msg string, body string, soundsFileName string) { var errs []error for _, v := range cID { param := map[string]interface{}{ @@ -160,10 +169,10 @@ func pushMsgByUniApp(storeId int, storeName string, cID []string, msg string) { "aps": map[string]interface{}{ "alert": map[string]interface{}{ "title": storeName, - "body": msg, + "body": body, }, "content-available": 0, - "sound": "ring.mp3", + "sound": soundsFileName, }, "auto_badge": "+1", }, diff --git a/business/partner/partner_store_sku.go b/business/partner/partner_store_sku.go index 8b212223a..650d5061e 100644 --- a/business/partner/partner_store_sku.go +++ b/business/partner/partner_store_sku.go @@ -166,6 +166,8 @@ type IPurchasePlatformStoreSkuHandler interface { CreateStoreSkusAct(ctx *jxcontext.Context, vendorOrgCode string, storeID int, vendorStoreID string, storeSkuList []*StoreSkuInfo) (failedList []*StoreSkuInfoWithErr, err error) CancelActs(ctx *jxcontext.Context, vendorOrgCode string, storeID int, vendorStoreID string, storeSkuList []*StoreSkuInfo) (failedList []*StoreSkuInfoWithErr, err error) UpdateStoreSkusSpecTag(ctx *jxcontext.Context, vendorOrgCode string, storeID int, vendorStoreID string, storeSkuList []*StoreSkuInfo) (err error) + // GetSkuCategoryIdByName 获取各个平台推荐分类 + GetSkuCategoryIdByName(vendorOrgCode, skuName string) (vendorCategoryId string, err error) } type ISingleStoreStoreSkuHandler interface { diff --git a/business/partner/purchase/ebai/store_sku2.go b/business/partner/purchase/ebai/store_sku2.go index 4fc1a1cf9..1f2ceacb9 100644 --- a/business/partner/purchase/ebai/store_sku2.go +++ b/business/partner/purchase/ebai/store_sku2.go @@ -714,3 +714,7 @@ func (p *PurchaseHandler) CancelActs(ctx *jxcontext.Context, vendorOrgCode strin func (p *PurchaseHandler) UpdateStoreSkusSpecTag(ctx *jxcontext.Context, vendorOrgCode string, storeID int, vendorStoreID string, storeSkuList []*partner.StoreSkuInfo) (err error) { return err } + +func (p *PurchaseHandler) GetSkuCategoryIdByName(vendorOrgCode, skuName string) (vendorCategoryId string, err error) { + return "", err +} diff --git a/business/partner/purchase/elm/store.go b/business/partner/purchase/elm/store.go index ff863d62a..fe6bf27a2 100644 --- a/business/partner/purchase/elm/store.go +++ b/business/partner/purchase/elm/store.go @@ -23,3 +23,7 @@ func (p *PurchaseHandler) RefreshAllStoresID(ctx *jxcontext.Context, parentTask func (p *PurchaseHandler) GetStoreStatus(ctx *jxcontext.Context, vendorOrgCode string, storeID int, vendorStoreID string) (storeStatus int, err error) { return storeStatus, err } + +func (p *PurchaseHandler) GetSkuCategoryIdByName(vendorOrgCode, skuName string) (vendorCategoryId string, err error) { + return "", err +} diff --git a/business/partner/purchase/jd/sku2.go b/business/partner/purchase/jd/sku2.go index dbeff6519..b743af333 100644 --- a/business/partner/purchase/jd/sku2.go +++ b/business/partner/purchase/jd/sku2.go @@ -285,6 +285,19 @@ func (p *PurchaseHandler) GetSkus(ctx *jxcontext.Context, vendorOrgCode string, return skuNameList, err } +func (p *PurchaseHandler) GetSkuCategoryIdByName(vendorOrgCode, skuName string) (vendorCategoryId string, err error) { + vendorCategory, err := getAPI(vendorOrgCode).GetSkuCategoryBySkuName(skuName) + if err != nil { + return "", err + } + + if vendorCategory == nil { + return "", nil + } + + return utils.Int2Str(vendorCategory.CategoryId), nil +} + func setSkuNameListPic(vendorOrgCode string, skuNameList []*partner.SkuNameInfo) []*partner.SkuNameInfo { jdSkuIDs := make([]int64, len(skuNameList)) for k, v := range skuNameList { diff --git a/business/partner/purchase/jdshop/store_sku.go b/business/partner/purchase/jdshop/store_sku.go index 2a756c3a0..f4dd476ba 100644 --- a/business/partner/purchase/jdshop/store_sku.go +++ b/business/partner/purchase/jdshop/store_sku.go @@ -1299,3 +1299,7 @@ func buildUpdateSkusParam(storeSku *dao.StoreSkuSyncInfo, v *dao.StoreSkuSyncInf updateSkusParam.Skus = skus return updateSkusParam, wareSku, err } + +func (p *PurchaseHandler) GetSkuCategoryIdByName(vendorOrgCode, skuName string) (vendorCategoryId string, err error) { + return "", err +} diff --git a/business/partner/purchase/jx/sku.go b/business/partner/purchase/jx/sku.go index 32daa9b18..e6c80a1d1 100644 --- a/business/partner/purchase/jx/sku.go +++ b/business/partner/purchase/jx/sku.go @@ -80,3 +80,7 @@ func (p *PurchaseHandler) GetVendorCategories(ctx *jxcontext.Context) (vendorCat func (p *PurchaseHandler) GetSkus(ctx *jxcontext.Context, vendorOrgCode string, skuID int, vendorSkuID string) (skuNameList []*partner.SkuNameInfo, err error) { return skuNameList, err } + +func (p *PurchaseHandler) GetSkuCategoryIdByName(vendorOrgCode, skuName string) (vendorCategoryId string, err error) { + return "", err +} diff --git a/business/partner/purchase/mtwm/store_sku2.go b/business/partner/purchase/mtwm/store_sku2.go index f5946f3eb..44d1f53f7 100644 --- a/business/partner/purchase/mtwm/store_sku2.go +++ b/business/partner/purchase/mtwm/store_sku2.go @@ -764,3 +764,7 @@ func (p *PurchaseHandler) UpdateStoreSkusSpecTag(ctx *jxcontext.Context, vendorO } return err } + +func (p *PurchaseHandler) GetSkuCategoryIdByName(vendorOrgCode, skuName string) (vendorCategoryId string, err error) { + return "", err +} diff --git a/business/partner/purchase/tiktok_store/dy.go b/business/partner/purchase/tiktok_store/dy.go index f2772c3b4..17f2c05f6 100644 --- a/business/partner/purchase/tiktok_store/dy.go +++ b/business/partner/purchase/tiktok_store/dy.go @@ -3,12 +3,9 @@ package tiktok_store import ( "fmt" "git.rosy.net.cn/baseapi/platformapi/tiktok_shop/tiktok_api" - "strings" "sync" - "git.rosy.net.cn/baseapi/platformapi/mtwmapi" "git.rosy.net.cn/baseapi/utils" - "git.rosy.net.cn/jx-callback/business/jxutils" "git.rosy.net.cn/jx-callback/business/jxutils/jxcontext" "git.rosy.net.cn/jx-callback/business/model" "git.rosy.net.cn/jx-callback/business/partner" @@ -84,61 +81,6 @@ func skuCategory(param1 []*tiktok_api.RetailCategoryInfo) (vendorCats []*model.S return } -func rangeMtwm2JX(areaStr string) string { - var area []interface{} - if err := utils.UnmarshalUseNumber([]byte(areaStr), &area); err == nil { - if len(area) > 0 { - coordList := make([]string, len(area)) - for k, v := range area { - vv := v.(map[string]interface{}) - coordList[k] = fmt.Sprintf("%.6f,%.6f", jxutils.IntCoordinate2Standard(int(utils.ForceInterface2Int64(vv["x"]))), jxutils.IntCoordinate2Standard(int(utils.ForceInterface2Int64(vv["y"])))) - } - return strings.Join(coordList, ";") - } - } - return "" -} - -func rangeJX2Mtwm(coords string) string { - pairs := strings.Split(strings.Trim(coords, ";"), ";") - if len(pairs) > 0 { - coordList := make([]map[string]interface{}, len(pairs)) - for k, v := range pairs { - pair := strings.Split(v, ",") - coordList[k] = map[string]interface{}{ - "x": jxutils.StandardCoordinate2Int(utils.Str2Float64(pair[0])), - "y": jxutils.StandardCoordinate2Int(utils.Str2Float64(pair[1])), - } - } - return string(utils.MustMarshal(coordList)) - } - return "" -} - -func openTimeMtwm2JX(vendorOpenTime string) (opTimeList []int16) { - timePairs := strings.Split(vendorOpenTime, ",") - for _, v := range timePairs { - times := strings.Split(v, "-") - if len(times) >= 2 { - opTimeList = append(opTimeList, jxutils.StrTime2JxOperationTime(times[0]+":00", 700), jxutils.StrTime2JxOperationTime(times[1]+":00", 2000)) - } - } - return opTimeList -} - -func openTimeJX2Mtwm(opTimeList []int16) string { - timesLen := len(opTimeList) / 2 * 2 - var strPairs []string - for i := 0; i < timesLen; i += 2 { - if opTimeList[i] != 0 { - strPairs = append(strPairs, jxutils.JxOperationTime2StrTime(opTimeList[i])+"-"+jxutils.JxOperationTime2StrTime(opTimeList[i+1])) - } else { - break - } - } - return strings.Join(strPairs, ",") -} - func bizStatusTiktok2JX(status int64) int { switch status { case tiktok_api.StoreStateNormalBusiness: @@ -149,22 +91,6 @@ func bizStatusTiktok2JX(status int64) int { return model.StoreStatusDisabled } -func bizStatusJX2Mtwm(status int) (openLevel, online int) { - if status == model.StoreStatusDisabled { - return mtwmapi.PoiOpenLevelHaveRest, mtwmapi.PoiStatusOnline //mtwmapi.PoiStatusOffline - } else if status == model.StoreStatusHaveRest || status == model.StoreStatusClosed { - return mtwmapi.PoiOpenLevelHaveRest, mtwmapi.PoiStatusOnline - } - return mtwmapi.PoiOpenLevelNormal, mtwmapi.PoiStatusOnline -} - -func skuStatusJX2Tiktok(status int) int { - if status == model.SkuStatusNormal { - return mtwmapi.SellStatusOnline - } - return mtwmapi.SellStatusOffline -} - func (p *PurchaseHandler) UploadImg(ctx *jxcontext.Context, vendorOrgCode, imgURL string, imgData []byte, imgName string, imgType int) (imgHint string, err error) { poiCode4UploadImg := p.getUploadImgPoiCode() if poiCode4UploadImg == "" { @@ -227,7 +153,3 @@ func getAPI(appOrgCode string, storeID int, vendorStoreID string) (apiObj *tikto func GetTiktokApi(appOrgCode string, storeID int, vendorStoreID string) *tiktok_api.API { return getAPI(appOrgCode, storeID, vendorStoreID) } - -func getAPIWithoutToken(appOrgCode string) (apiObj *tiktok_api.API) { - return partner.CurAPIManager.GetAPI(model.VendorIDDD, appOrgCode).(*tiktok_api.API) -} diff --git a/business/partner/purchase/tiktok_store/store_sku2.go b/business/partner/purchase/tiktok_store/store_sku2.go index 7f1c7ec13..ac0d638a0 100644 --- a/business/partner/purchase/tiktok_store/store_sku2.go +++ b/business/partner/purchase/tiktok_store/store_sku2.go @@ -336,3 +336,8 @@ func GetProductAuditList(vendorOrgCode string, page, pageSize int64) (map[string } return updateCategory, total } + +func (p *PurchaseHandler) GetSkuCategoryIdByName(vendorOrgCode, skuName string) (string, error) { + vendorCategoryId, err := getAPI(vendorOrgCode, 0, "").GetRecommendCategory(strings.Split(skuName, "|")) + return utils.Int64ToStr(vendorCategoryId), err +} diff --git a/business/partner/purchase/weimob/wsc/store_sku2.go b/business/partner/purchase/weimob/wsc/store_sku2.go index 8c5bf18d2..fa21dbd64 100644 --- a/business/partner/purchase/weimob/wsc/store_sku2.go +++ b/business/partner/purchase/weimob/wsc/store_sku2.go @@ -201,3 +201,6 @@ func (p *PurchaseHandler) GetStoreSkusInfo(ctx *jxcontext.Context, parentTask ta func composeFakeDelName(name string) string { return "del_" + name } +func (p *PurchaseHandler) GetSkuCategoryIdByName(vendorOrgCode, skuName string) (vendorCategoryId string, err error) { + return "", err +} diff --git a/business/partner/purchase/yb/store_sku.go b/business/partner/purchase/yb/store_sku.go index 8511dfc39..afbd90858 100644 --- a/business/partner/purchase/yb/store_sku.go +++ b/business/partner/purchase/yb/store_sku.go @@ -398,6 +398,9 @@ func (p *PurchaseHandler) IsErrSkuNotExist(err error) (isNotExist bool) { return yinbaoapi.IsErrSkuNotExist(err) } +func (p *PurchaseHandler) GetSkuCategoryIdByName(vendorOrgCode, skuName string) (vendorCategoryId string, err error) { + return "", err +} func ybSkuStatus2Jx(ybStatus int) (jxSkuStatus int) { if ybStatus == yinbaoapi.SkuStatusEnable { jxSkuStatus = model.SkuStatusNormal From 1c44b0a8f1ec30a3b8dff86ef4a4560f36b0e1bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Tue, 21 Mar 2023 16:12:58 +0800 Subject: [PATCH 02/13] =?UTF-8?q?=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/jxcallback/scheduler/defsch/defsch.go | 2 ++ business/jxutils/unipush/push.go | 6 +++--- business/partner/printer/jxprint/jxprint.go | 3 +++ 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/business/jxcallback/scheduler/defsch/defsch.go b/business/jxcallback/scheduler/defsch/defsch.go index 128b0f34b..c7309a44b 100644 --- a/business/jxcallback/scheduler/defsch/defsch.go +++ b/business/jxcallback/scheduler/defsch/defsch.go @@ -378,12 +378,14 @@ func Init() { func (s *DefScheduler) OnOrderNew(order *model.GoodsOrder, isPending bool, isAuto bool) (err error) { savedOrderInfo := s.loadSavedOrderFromMap(model.Order2Status(order), false) savedOrderInfo.SetOrder(order) + globals.SugarLogger.Debugf("===order========:%s", utils.Format4Output(order, false)) if order.VendorID == model.VendorIDEBAI { //饿百订单待接单的时候就推所有东西 if order.Status == model.OrderStatusWaitAccepted || order.Status == model.OrderStatusNew || order.Status >= model.OrderStatusFinishedPickup { //错序 s.resetTimer(savedOrderInfo, nil, isPending) if order.Flag&model.OrderFlagMaskFake == 0 { utils.CallFuncAsync(func() { // order = setFakeActualPayPrice(order) + globals.SugarLogger.Debugf("===order2========:%s", utils.Format4Output(order, false)) netprinter.PrintOrderByOrder(jxcontext.AdminCtx, order, model.PrintTypeOrder, nil) //目前暂且认为AdjustCount > 0 就是调整单 if order.AdjustCount > 0 { diff --git a/business/jxutils/unipush/push.go b/business/jxutils/unipush/push.go index 658b98350..c439f5fc9 100644 --- a/business/jxutils/unipush/push.go +++ b/business/jxutils/unipush/push.go @@ -16,9 +16,9 @@ import ( ) const ( - SoundsFileNewOrder = "newOrder.mp4" - SoundsFileNewAfsOrder = "newAfsOrder.mp4" - SoundsFileNewCancelOrder = "newCancelOrder.mp4" + SoundsFileNewOrder = "pushsound.caf" + SoundsFileNewAfsOrder = "pushsound.caf" + SoundsFileNewCancelOrder = "pushsound.caf" ) // NotifyNewOrder 推送新订单 diff --git a/business/partner/printer/jxprint/jxprint.go b/business/partner/printer/jxprint/jxprint.go index fbb472a8d..a0833b73a 100644 --- a/business/partner/printer/jxprint/jxprint.go +++ b/business/partner/printer/jxprint/jxprint.go @@ -265,6 +265,9 @@ func (c *PrinterHandler) PrintOrder(ctx *jxcontext.Context, store *model.Store, } orderSel := utils.Int2Str(order.VendorID) + utils.Int2Str(order.OrderSeq) + globals.SugarLogger.Debugf("=store.PrinterSN=====:%s", store.PrinterSN) + globals.SugarLogger.Debugf("=store.orderSel=====:%s", orderSel) + globals.SugarLogger.Debugf("string(orderPrint)======%s", string(orderPrint)) return c.PrintMsg(ctx, store.PrinterSN, orderSel, "", string(orderPrint)) } From 94d6db383a8c4e90ccf9396119ef27f44c892de4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Tue, 21 Mar 2023 16:47:12 +0800 Subject: [PATCH 03/13] 1 --- business/partner/printer/jxprint/jxPrint_test.go | 2 +- business/partner/printer/jxprint/jxprint.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/business/partner/printer/jxprint/jxPrint_test.go b/business/partner/printer/jxprint/jxPrint_test.go index 5a970b0b0..0f3164d48 100644 --- a/business/partner/printer/jxprint/jxPrint_test.go +++ b/business/partner/printer/jxprint/jxPrint_test.go @@ -7,7 +7,7 @@ import ( ) func TestPrintMsg(t *testing.T) { - status, err := CurPrinterHandler.PrintMsg(jxcontext.AdminCtx, "20220818000001", "1", "test", "11") + status, err := CurPrinterHandler.PrintMsg(jxcontext.AdminCtx, "120220915001877", "1", "test", `{"allSkuCount":"1","allSkuTypeCount":"1","appId":"1000","businessType":"1","buyerComment":"(缺货时电话与我联系)","consigneeAddress":"胜浦街道苏州市吴中区新胜路1号","consigneeMobile":"18468579157,459","consigneeName":"刘*****","eBaiOrderNo":"好菜鲜生","eBailCode":"0003","officialName":"京西菜市","orderNo":"4016410104511380003","orderStatus":"15","payOrderTime":"2023-03-21 16:18:26","qrcOrder":"4016410104511380003","skuList":"[{\"skuName\":\"【火锅食堂】雪花肥牛卷 牛肉卷约200g/份\",\"skuCount\":\"X1\",\"salePrice\":\"￥34.10\",\"totalCountPrice\":\"￥34.10\",\"upc\":\"\"}]","storeName":"好菜鲜生(胜浦中胜路店)","storeTel":"13205196216","trySendTime":"2023-03-21 16:54:33","userPayMoney":"￥33.10","vendorID":"3","vendorName":"饿百新零售","vendorOrderNo":"4"}`) t.Log(utils.Format4Output(status, false)) if err != nil { t.Fatal(err) diff --git a/business/partner/printer/jxprint/jxprint.go b/business/partner/printer/jxprint/jxprint.go index a0833b73a..2541df520 100644 --- a/business/partner/printer/jxprint/jxprint.go +++ b/business/partner/printer/jxprint/jxprint.go @@ -33,7 +33,7 @@ func (c *PrinterHandler) GetVendorID() int { } func (c *PrinterHandler) PrintMsg(ctx *jxcontext.Context, printSn, orderSeq, msgTitle, msgContent string) (printerStatus *partner.PrinterStatus, err error) { - if printSn != "" && globals.EnableStoreWrite { + if printSn != "" { printSn = strings.Split(printSn, "_")[0] if _, err := api.JxPrintAPI.DoPrint(printSn, msgContent, utils.Str2Int(orderSeq)); err == nil { return c.GetPrinterStatus(ctx, printSn, "") From 926cea22da2eef025b0c20f8ef46f05f6d571d9f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Tue, 21 Mar 2023 17:25:17 +0800 Subject: [PATCH 04/13] 1 --- business/partner/printer/jxprint/jxPrint_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/business/partner/printer/jxprint/jxPrint_test.go b/business/partner/printer/jxprint/jxPrint_test.go index 0f3164d48..8d0565819 100644 --- a/business/partner/printer/jxprint/jxPrint_test.go +++ b/business/partner/printer/jxprint/jxPrint_test.go @@ -7,7 +7,7 @@ import ( ) func TestPrintMsg(t *testing.T) { - status, err := CurPrinterHandler.PrintMsg(jxcontext.AdminCtx, "120220915001877", "1", "test", `{"allSkuCount":"1","allSkuTypeCount":"1","appId":"1000","businessType":"1","buyerComment":"(缺货时电话与我联系)","consigneeAddress":"胜浦街道苏州市吴中区新胜路1号","consigneeMobile":"18468579157,459","consigneeName":"刘*****","eBaiOrderNo":"好菜鲜生","eBailCode":"0003","officialName":"京西菜市","orderNo":"4016410104511380003","orderStatus":"15","payOrderTime":"2023-03-21 16:18:26","qrcOrder":"4016410104511380003","skuList":"[{\"skuName\":\"【火锅食堂】雪花肥牛卷 牛肉卷约200g/份\",\"skuCount\":\"X1\",\"salePrice\":\"￥34.10\",\"totalCountPrice\":\"￥34.10\",\"upc\":\"\"}]","storeName":"好菜鲜生(胜浦中胜路店)","storeTel":"13205196216","trySendTime":"2023-03-21 16:54:33","userPayMoney":"￥33.10","vendorID":"3","vendorName":"饿百新零售","vendorOrderNo":"4"}`) + status, err := CurPrinterHandler.PrintMsg(jxcontext.AdminCtx, "120220915001877", "1", "test", `{"allSkuCount":"1","allSkuTypeCount":"1","app_Id":"1000","businessType":"1","buyerComment":"(缺货时电话与我联系)","consigneeAddress":"胜浦街道苏州市吴中区新胜路1号","consigneeMobile":"18468579157,459","consigneeName":"刘*****","eBaiOrderNo":"好菜鲜生","eBailCode":"0003","officialName":"京西菜市","orderNo":"4016410104511380003","orderStatus":"15","payOrderTime":"2023-03-21 16:18:26","qrcOrder":"4016410104511380003","skuList":"[{\"skuName\":\"【火锅食堂】雪花肥牛卷 牛肉卷约200g/份\",\"skuCount\":\"X1\",\"salePrice\":\"￥34.10\",\"totalCountPrice\":\"￥34.10\",\"upc\":\"\"}]","storeName":"好菜鲜生(胜浦中胜路店)","storeTel":"13205196216","trySendTime":"2023-03-21 16:54:33","userPayMoney":"￥33.10","vendorID":"3","vendorName":"饿百新零售","vendorOrderNo":"4"}`) t.Log(utils.Format4Output(status, false)) if err != nil { t.Fatal(err) From 10ad46ea295767b32cc306c07bf7c70ebc0a78e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Tue, 21 Mar 2023 17:33:26 +0800 Subject: [PATCH 05/13] 1 --- .../jxcallback/scheduler/defsch/defsch.go | 2 - business/jxstore/cms/sku.go | 64 ++++++++++--------- business/partner/printer/jxprint/jxprint.go | 3 - 3 files changed, 34 insertions(+), 35 deletions(-) diff --git a/business/jxcallback/scheduler/defsch/defsch.go b/business/jxcallback/scheduler/defsch/defsch.go index c7309a44b..128b0f34b 100644 --- a/business/jxcallback/scheduler/defsch/defsch.go +++ b/business/jxcallback/scheduler/defsch/defsch.go @@ -378,14 +378,12 @@ func Init() { func (s *DefScheduler) OnOrderNew(order *model.GoodsOrder, isPending bool, isAuto bool) (err error) { savedOrderInfo := s.loadSavedOrderFromMap(model.Order2Status(order), false) savedOrderInfo.SetOrder(order) - globals.SugarLogger.Debugf("===order========:%s", utils.Format4Output(order, false)) if order.VendorID == model.VendorIDEBAI { //饿百订单待接单的时候就推所有东西 if order.Status == model.OrderStatusWaitAccepted || order.Status == model.OrderStatusNew || order.Status >= model.OrderStatusFinishedPickup { //错序 s.resetTimer(savedOrderInfo, nil, isPending) if order.Flag&model.OrderFlagMaskFake == 0 { utils.CallFuncAsync(func() { // order = setFakeActualPayPrice(order) - globals.SugarLogger.Debugf("===order2========:%s", utils.Format4Output(order, false)) netprinter.PrintOrderByOrder(jxcontext.AdminCtx, order, model.PrintTypeOrder, nil) //目前暂且认为AdjustCount > 0 就是调整单 if order.AdjustCount > 0 { diff --git a/business/jxstore/cms/sku.go b/business/jxstore/cms/sku.go index 02502243d..2b532b397 100644 --- a/business/jxstore/cms/sku.go +++ b/business/jxstore/cms/sku.go @@ -1175,14 +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 @@ -1200,27 +1201,29 @@ 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 @@ -1236,15 +1239,16 @@ 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 2541df520..455297c95 100644 --- a/business/partner/printer/jxprint/jxprint.go +++ b/business/partner/printer/jxprint/jxprint.go @@ -265,9 +265,6 @@ func (c *PrinterHandler) PrintOrder(ctx *jxcontext.Context, store *model.Store, } orderSel := utils.Int2Str(order.VendorID) + utils.Int2Str(order.OrderSeq) - globals.SugarLogger.Debugf("=store.PrinterSN=====:%s", store.PrinterSN) - globals.SugarLogger.Debugf("=store.orderSel=====:%s", orderSel) - globals.SugarLogger.Debugf("string(orderPrint)======%s", string(orderPrint)) return c.PrintMsg(ctx, store.PrinterSN, orderSel, "", string(orderPrint)) } From 8394029380e731a0ed5b73a3a0b328cfcca0b19a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Tue, 21 Mar 2023 17:46:15 +0800 Subject: [PATCH 06/13] 1 --- business/jxutils/unipush/push.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/business/jxutils/unipush/push.go b/business/jxutils/unipush/push.go index c439f5fc9..4baa74d79 100644 --- a/business/jxutils/unipush/push.go +++ b/business/jxutils/unipush/push.go @@ -16,9 +16,9 @@ import ( ) const ( - SoundsFileNewOrder = "pushsound.caf" - SoundsFileNewAfsOrder = "pushsound.caf" - SoundsFileNewCancelOrder = "pushsound.caf" + SoundsFileNewOrder = "newOrder.caf" + SoundsFileNewAfsOrder = "afsOrder.caf" + SoundsFileNewCancelOrder = "cancelOrder.caf" ) // NotifyNewOrder 推送新订单 @@ -46,7 +46,7 @@ func NotifyNewOrder(order *model.GoodsOrder) { msg.StoreTitle = storeDetail.Name msg.Context = "老板,你有新的订单了!" context, _ := json.Marshal(msg) - body := msg.Context + model.VendorChineseNames[order.VendorID] + "#" + msg.OrderSqs + body := fmt.Sprintf(msg.Context+"(%s)", model.VendorChineseNames[order.VendorID]+"#"+msg.OrderSqs) pushMsgByUniApp(storeDetail.ID, storeDetail.Name, cid, string(context), body, SoundsFileNewOrder) } @@ -74,7 +74,7 @@ func NotifyAfsOrder(afsOrder *model.AfsOrder) (err error) { msg.StoreTitle = storeDetail.Name msg.Context = "老板订单申请退款了!" context, _ := json.Marshal(msg) - body := msg.Context + model.VendorChineseNames[afsOrder.VendorID] + "#" + msg.OrderSqs + body := fmt.Sprintf(msg.Context+"(%s)", model.VendorChineseNames[afsOrder.VendorID]+"#"+msg.OrderSqs) pushMsgByUniApp(storeDetail.ID, storeDetail.Name, cid, string(context), body, SoundsFileNewAfsOrder) return err } @@ -103,7 +103,7 @@ func NotifyOrderCanceled(order *model.GoodsOrder) (err error) { msg.StoreTitle = storeDetail.Name msg.Context = "老板订单被取消了!" context, _ := json.Marshal(msg) - body := msg.Context + model.VendorChineseNames[order.VendorID] + "#" + msg.OrderSqs + body := fmt.Sprintf(msg.Context+"(%s)", model.VendorChineseNames[order.VendorID]+"#"+msg.OrderSqs) pushMsgByUniApp(storeDetail.ID, storeDetail.Name, cid, string(context), body, SoundsFileNewCancelOrder) return err } From d2e9ebf39ca5758a208fe02fd13ef7bc6c6ac0f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Wed, 22 Mar 2023 09:25:28 +0800 Subject: [PATCH 07/13] 1 --- business/jxcallback/scheduler/defsch/defsch.go | 1 + business/partner/printer/jxprint/jxprint.go | 1 + 2 files changed, 2 insertions(+) diff --git a/business/jxcallback/scheduler/defsch/defsch.go b/business/jxcallback/scheduler/defsch/defsch.go index 128b0f34b..0fc346f09 100644 --- a/business/jxcallback/scheduler/defsch/defsch.go +++ b/business/jxcallback/scheduler/defsch/defsch.go @@ -384,6 +384,7 @@ func (s *DefScheduler) OnOrderNew(order *model.GoodsOrder, isPending bool, isAut if order.Flag&model.OrderFlagMaskFake == 0 { utils.CallFuncAsync(func() { // order = setFakeActualPayPrice(order) + globals.SugarLogger.Debugf("ebai============:%s", utils.Format4Output(order, false)) netprinter.PrintOrderByOrder(jxcontext.AdminCtx, order, model.PrintTypeOrder, nil) //目前暂且认为AdjustCount > 0 就是调整单 if order.AdjustCount > 0 { diff --git a/business/partner/printer/jxprint/jxprint.go b/business/partner/printer/jxprint/jxprint.go index 455297c95..b654cc188 100644 --- a/business/partner/printer/jxprint/jxprint.go +++ b/business/partner/printer/jxprint/jxprint.go @@ -264,6 +264,7 @@ func (c *PrinterHandler) PrintOrder(ctx *jxcontext.Context, store *model.Store, return nil, err } + globals.SugarLogger.Debugf("==========printData:%s", utils.Format4Output(printData, false)) orderSel := utils.Int2Str(order.VendorID) + utils.Int2Str(order.OrderSeq) return c.PrintMsg(ctx, store.PrinterSN, orderSel, "", string(orderPrint)) } From fc8fe9efb4d7cecb17a81d2547a0db27089d9312 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Wed, 22 Mar 2023 09:50:01 +0800 Subject: [PATCH 08/13] 1 --- business/partner/printer/jxprint/jxprint.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/business/partner/printer/jxprint/jxprint.go b/business/partner/printer/jxprint/jxprint.go index b654cc188..ca9e3e199 100644 --- a/business/partner/printer/jxprint/jxprint.go +++ b/business/partner/printer/jxprint/jxprint.go @@ -258,7 +258,9 @@ func (c *PrinterHandler) PrintOrder(ctx *jxcontext.Context, store *model.Store, printData[OrderStatus] = utils.Int2Str(130) } printData[AppID] = "1000" // 菜市应用 - + if printData[VendorOrderNo] == utils.Int2Str(model.VendorIDEBAI) && printData[OrderStatus] == utils.Int2Str(model.OrderStatusFinishedPickup) { + printData[OrderStatus] = utils.Int2Str(model.OrderStatusNew) + } orderPrint, err := json.Marshal(printData) if err != nil { return nil, err From 5d508152045af347ce61d1e7ca4fe42447efd99f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Wed, 22 Mar 2023 09:57:03 +0800 Subject: [PATCH 09/13] 1 --- business/jxcallback/scheduler/basesch/basesch_ext.go | 1 + 1 file changed, 1 insertion(+) diff --git a/business/jxcallback/scheduler/basesch/basesch_ext.go b/business/jxcallback/scheduler/basesch/basesch_ext.go index 5cb87a980..c6bc68f6f 100644 --- a/business/jxcallback/scheduler/basesch/basesch_ext.go +++ b/business/jxcallback/scheduler/basesch/basesch_ext.go @@ -278,6 +278,7 @@ func (c *BaseScheduler) AgreeOrRefuseRefund(ctx *jxcontext.Context, afsOrderID s } if storeDetail.IsPrintRefundOrder == model.YES { // 打印退款订单 order2, _ := partner.CurOrderManager.LoadOrder(afsOrder.VendorOrderID, afsOrder.VendorID) + order2.Status = model.AfsOrderStatusFinished _, err = netprinter.PrintRefundOrCancelOrder(jxcontext.AdminCtx, model.NO, order2, afsOrder.StoreID) } } From a75fb572d639b443c6f10e0f8e4fa4496bee52b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Wed, 22 Mar 2023 10:14:16 +0800 Subject: [PATCH 10/13] 1 --- business/jxcallback/scheduler/defsch/defsch.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/business/jxcallback/scheduler/defsch/defsch.go b/business/jxcallback/scheduler/defsch/defsch.go index 0fc346f09..3a2b2cde5 100644 --- a/business/jxcallback/scheduler/defsch/defsch.go +++ b/business/jxcallback/scheduler/defsch/defsch.go @@ -493,10 +493,10 @@ func (s *DefScheduler) OnOrderStatusChanged(order *model.GoodsOrder, status *mod } // 京西云打印机打印数据-如果门店使用京西打印机才使用如下代码块 - store, _ := dao.GetStoreDetail(dao.GetDB(), order.JxStoreID, order.VendorID, order.VendorOrgCode) - if err == nil && store.PrinterVendorID == model.VendorIDJxprint { - netprinter.PrintOrderByOrder(jxcontext.AdminCtx, order, model.PrintTypeOrder, nil) - } + //store, _ := dao.GetStoreDetail(dao.GetDB(), order.JxStoreID, order.VendorID, order.VendorOrgCode) + //if err == nil && store.PrinterVendorID == model.VendorIDJxprint { + // netprinter.PrintOrderByOrder(jxcontext.AdminCtx, order, model.PrintTypeOrder, nil) + //} } } return err From e96a3cbad6481b7e3b36ac2b31954a614e467884 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Wed, 22 Mar 2023 11:28:09 +0800 Subject: [PATCH 11/13] 1 --- .../partner/printer/jxprint/jxPrint_test.go | 26 ++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/business/partner/printer/jxprint/jxPrint_test.go b/business/partner/printer/jxprint/jxPrint_test.go index 8d0565819..3ea6f45b6 100644 --- a/business/partner/printer/jxprint/jxPrint_test.go +++ b/business/partner/printer/jxprint/jxPrint_test.go @@ -7,7 +7,31 @@ import ( ) func TestPrintMsg(t *testing.T) { - status, err := CurPrinterHandler.PrintMsg(jxcontext.AdminCtx, "120220915001877", "1", "test", `{"allSkuCount":"1","allSkuTypeCount":"1","app_Id":"1000","businessType":"1","buyerComment":"(缺货时电话与我联系)","consigneeAddress":"胜浦街道苏州市吴中区新胜路1号","consigneeMobile":"18468579157,459","consigneeName":"刘*****","eBaiOrderNo":"好菜鲜生","eBailCode":"0003","officialName":"京西菜市","orderNo":"4016410104511380003","orderStatus":"15","payOrderTime":"2023-03-21 16:18:26","qrcOrder":"4016410104511380003","skuList":"[{\"skuName\":\"【火锅食堂】雪花肥牛卷 牛肉卷约200g/份\",\"skuCount\":\"X1\",\"salePrice\":\"￥34.10\",\"totalCountPrice\":\"￥34.10\",\"upc\":\"\"}]","storeName":"好菜鲜生(胜浦中胜路店)","storeTel":"13205196216","trySendTime":"2023-03-21 16:54:33","userPayMoney":"￥33.10","vendorID":"3","vendorName":"饿百新零售","vendorOrderNo":"4"}`) + status, err := CurPrinterHandler.PrintMsg(jxcontext.AdminCtx, "120220915001877", "1", "test", `{ + "allSkuCount": "2", + "allSkuTypeCount": "1", + "appId": "1000", + "businessType": "1", + "buyerComment": "(缺货时电话与我联系)", + "consigneeAddress": "胜浦街道苏州市吴中区新胜路1号", + "consigneeMobile": "18468578703,380", + "consigneeName": "刘*****", + "eBaiOrderNo": "好菜鲜生", + "eBailCode": "1126", + "officialName": "京西菜市", + "orderNo": "4016410104553361126", + "orderStatus": "5", + "payOrderTime": "2023-03-22 11:15:06", + "qrcOrder": "4016410104553361126", + "skuList": "[{\"skuName\":\"【精选好价】肥瘦五花肉（下午易缺货）250g/组\",\"skuCount\":\"X2\",\"salePrice\":\"￥22.10\",\"totalCountPrice\":\"￥44.20\",\"upc\":\"\"}]", + "storeName": "好菜鲜生(胜浦中胜路店)", + "storeTel": "13205196216", + "trySendTime": "2023-03-22 11:45:13", + "userPayMoney": "￥43.20", + "vendorID": "3", + "vendorName": "饿百新零售", + "vendorOrderNo": "5" +}`) t.Log(utils.Format4Output(status, false)) if err != nil { t.Fatal(err) From 288c4a16071c366a986c6d9d607ca1cd93aa1944 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Wed, 22 Mar 2023 11:32:56 +0800 Subject: [PATCH 12/13] 1 --- business/partner/printer/jxprint/jxprint.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/business/partner/printer/jxprint/jxprint.go b/business/partner/printer/jxprint/jxprint.go index ca9e3e199..0f0032de2 100644 --- a/business/partner/printer/jxprint/jxprint.go +++ b/business/partner/printer/jxprint/jxprint.go @@ -258,7 +258,7 @@ func (c *PrinterHandler) PrintOrder(ctx *jxcontext.Context, store *model.Store, printData[OrderStatus] = utils.Int2Str(130) } printData[AppID] = "1000" // 菜市应用 - if printData[VendorOrderNo] == 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.OrderStatusNew) } orderPrint, err := json.Marshal(printData) @@ -266,7 +266,6 @@ func (c *PrinterHandler) PrintOrder(ctx *jxcontext.Context, store *model.Store, return nil, err } - globals.SugarLogger.Debugf("==========printData:%s", utils.Format4Output(printData, false)) orderSel := utils.Int2Str(order.VendorID) + utils.Int2Str(order.OrderSeq) return c.PrintMsg(ctx, store.PrinterSN, orderSel, "", string(orderPrint)) } From 8a4d2f24fe72b9b2f2afa6272d766e7b288c96c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Wed, 22 Mar 2023 17:19:10 +0800 Subject: [PATCH 13/13] 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))