From fca7283d9b7700eac5f18d3b5c3e8160bd73291f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Thu, 18 Jan 2024 11:30:15 +0800 Subject: [PATCH 1/8] 1 --- business/jxstore/cms/store.go | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/business/jxstore/cms/store.go b/business/jxstore/cms/store.go index a553df1f8..12fa98d47 100644 --- a/business/jxstore/cms/store.go +++ b/business/jxstore/cms/store.go @@ -6403,24 +6403,19 @@ func BatchGetMTStoreLogos(vendorOrgCode string, mtStoreIDs []string) (storeLogos //批量更新美团门店logos func BatchUpdateMTStoreLogos(vendorOrgCode string, relInfo []MtRelInfo) (hint string) { + param := map[string]interface{}{} + if len(relInfo[0].PicUrl) > 0 { + param["pic_url"] = relInfo[0].PicUrl + } for _, v := range relInfo { if len(v.PicUrl) == 0 && len(v.Address) == 0 { return "暂无需要更新数据" } - param := map[string]interface{}{} - if len(v.PicUrl) > 0 { - param["pic_url"] = v.PicUrl - } if len(v.Address) > 0 { param["address"] = v.Address } - - storeDetail, err1 := dao.GetStoreDetailForDD(dao.GetDB(), 0, model.VendorIDMTWM, v.PoiCode, "") - if err1 != nil { - hint += fmt.Sprintf("%s:%v\n", v.PoiCode, err1) - } - globals.SugarLogger.Debugf("BatchUpdateMTStoreLogos param=%s", utils.Format4Output(param, false)) - if err := mtwm.GetAPI(vendorOrgCode, storeDetail.Store.ID, "").PoiSave(v.PoiCode, param); err != nil { + apiObj := mtwm.GetAPI(vendorOrgCode, 0, v.PoiCode) + if err := apiObj.PoiSave(v.PoiCode, param); err != nil { hint += fmt.Sprintf("%s:%v\n", v.PoiCode, err) } } From dd9bf27c3795e5ddfc1c38eb8dcdebfb068f1199 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Thu, 18 Jan 2024 13:41:21 +0800 Subject: [PATCH 2/8] 1 --- controllers/taobao_vegetable.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/controllers/taobao_vegetable.go b/controllers/taobao_vegetable.go index 4483cc91b..bdc5cf331 100644 --- a/controllers/taobao_vegetable.go +++ b/controllers/taobao_vegetable.go @@ -227,7 +227,7 @@ func (c *TaoBaoVegetableController) CancelOnSaleRefundOrder() { //callbackResponse := taoVegetable.OnCallbackMsg(tao_vegetable.OrderStatusOnSaleCancel, utils.Int64ToStr(afsOrder.PartCancelRequest.BizOrderId), afsOrder) //c.Data["json"] = callbackResponse order, err := partner.CurOrderManager.LoadOrder(utils.Int64ToStr(afsOrder.PartCancelRequest.BizOrderId), model.VendorIDTaoVegetable) - if err != nil || order.Status > model.WaybillStatusCourierArrived { + if err != nil || order.Status >= model.OrderStatusDelivering { c.Data["json"] = tao_vegetable.CallBackResultOnSaleCancel(fmt.Errorf("不支持售中取消")) c.ServeJSON() } else { From 3c7928b152dd68686aa72a5ebaaed20aa310acb0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Fri, 19 Jan 2024 09:28:05 +0800 Subject: [PATCH 3/8] 1 --- business/partner/printer/trendit/trendit.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/business/partner/printer/trendit/trendit.go b/business/partner/printer/trendit/trendit.go index 2d08b6fe8..a9c2dd193 100644 --- a/business/partner/printer/trendit/trendit.go +++ b/business/partner/printer/trendit/trendit.go @@ -150,6 +150,8 @@ func (p PrinterHandler) PrintCancelOrRefundOrder(ctx *jxcontext.Context, printTy return nil, nil } + globals.SugarLogger.Debugf("=======PrintCancelOrRefundOrder== : %s , %s", utils.Format4Output(content, false), store.PrinterSN) + return p.PrintMsg(ctx, store.PrinterSN, "", voiceType, content) } From d4fccba75ee3e0c2a59c43d04bf33c178137517b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Fri, 19 Jan 2024 09:39:50 +0800 Subject: [PATCH 4/8] 1 --- business/jxcallback/orderman/order.go | 3 +++ business/model/legacymodel/jxbadcomments.go | 2 +- business/partner/printer/trendit/trendit.go | 1 + 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/business/jxcallback/orderman/order.go b/business/jxcallback/orderman/order.go index 51cebb981..0845c9f58 100644 --- a/business/jxcallback/orderman/order.go +++ b/business/jxcallback/orderman/order.go @@ -259,6 +259,7 @@ func (c *OrderManager) OnOrderStatusChanged(vendorOrgCode string, orderStatus *m order.OrderFinishedAt = time.Now() dao.UpdateEntity(db, order, "OrderFinishedAt") } else if orderStatus.Status == model.OrderStatusCanceled { + globals.SugarLogger.Debugf("==============orderStatus := %s", utils.Format4Output(orderStatus, false)) order2, err2 := c.LoadOrder(orderStatus.VendorOrderID, orderStatus.VendorID) // 订单被取消,则取消三方运单 if orderStatus.OrderType == model.OrderTypeOrder { waybill, _ := dao.GetWaybills(db, order2.VendorOrderID, []int64{model.VendorIDMTPS, model.VendorIDDada, model.VendorIDFengNiao, model.VendorIDUUPT, model.VendorIDSFPS}) @@ -278,7 +279,9 @@ func (c *OrderManager) OnOrderStatusChanged(vendorOrgCode string, orderStatus *m if err2 == nil { // 判断是否需要打印取消订单 storeDetail, err := c.LoadStoreDetail(order2.StoreID, order2.VendorID) + globals.SugarLogger.Debugf("==============storeDetail := %s", utils.Format4Output(storeDetail, false)) if err == nil && storeDetail.IsPrintCancelOrder == model.YES { // 取消申请 + globals.SugarLogger.Debugf("==============storeDetail := %s", utils.Format4Output("222222222222222", false)) _, err = netprinter.PrintRefundOrCancelOrder(jxcontext.AdminCtx, model.YES, order2, order2.StoreID) } if err != nil { diff --git a/business/model/legacymodel/jxbadcomments.go b/business/model/legacymodel/jxbadcomments.go index 909bda05d..a139afa2d 100644 --- a/business/model/legacymodel/jxbadcomments.go +++ b/business/model/legacymodel/jxbadcomments.go @@ -14,7 +14,7 @@ type JxBadComments struct { Createtime string `json:"createTime" orm:"column(createtime);size(255);null;index" description:"评论的创建时间"` Score int `json:"score4" orm:"column(score)" description:"评论的星级"` - Scorecontent string `json:"score4Content" orm:"column(scorecontent);size(512);null" description:"评论的内容"` + Scorecontent string `json:"score4Content" orm:"column(scorecontent);size(1024);null" description:"评论的内容"` Vendertags string `json:"venderTags" orm:"column(vendertags);size(255);null" description:"评论的标签"` Msg string `json:"-" orm:"column(msg);type(text)" description:"未解决差评的原始信息"` diff --git a/business/partner/printer/trendit/trendit.go b/business/partner/printer/trendit/trendit.go index a9c2dd193..28007e4db 100644 --- a/business/partner/printer/trendit/trendit.go +++ b/business/partner/printer/trendit/trendit.go @@ -131,6 +131,7 @@ func (p PrinterHandler) PrintStore(ctx *jxcontext.Context, store *model.Store, s } func (p PrinterHandler) PrintCancelOrRefundOrder(ctx *jxcontext.Context, printType int, store *model.Store, storeDetail *dao.StoreDetail, order *model.GoodsOrder) (printerStatus *partner.PrinterStatus, err error) { + globals.SugarLogger.Debugf("==============storeDetail := %s", utils.Format4Output("=====================kkk", false)) if len(order.Skus) == 0 { return } From c66844b101d319c6aee7dac4a863b50a1f2b610c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Fri, 19 Jan 2024 10:06:20 +0800 Subject: [PATCH 5/8] 1 --- business/jxcallback/orderman/order.go | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/business/jxcallback/orderman/order.go b/business/jxcallback/orderman/order.go index 0845c9f58..8621a8213 100644 --- a/business/jxcallback/orderman/order.go +++ b/business/jxcallback/orderman/order.go @@ -260,7 +260,7 @@ func (c *OrderManager) OnOrderStatusChanged(vendorOrgCode string, orderStatus *m dao.UpdateEntity(db, order, "OrderFinishedAt") } else if orderStatus.Status == model.OrderStatusCanceled { globals.SugarLogger.Debugf("==============orderStatus := %s", utils.Format4Output(orderStatus, false)) - order2, err2 := c.LoadOrder(orderStatus.VendorOrderID, orderStatus.VendorID) // 订单被取消,则取消三方运单 + order2, _ := c.LoadOrder(orderStatus.VendorOrderID, orderStatus.VendorID) // 订单被取消,则取消三方运单 if orderStatus.OrderType == model.OrderTypeOrder { waybill, _ := dao.GetWaybills(db, order2.VendorOrderID, []int64{model.VendorIDMTPS, model.VendorIDDada, model.VendorIDFengNiao, model.VendorIDUUPT, model.VendorIDSFPS}) for _, v := range waybill { @@ -275,18 +275,15 @@ func (c *OrderManager) OnOrderStatusChanged(vendorOrgCode string, orderStatus *m dao.UpdateEntity(db, order2, "OrderFinishedAt") } - //如果取消订单则要把库存加回去 - if err2 == nil { - // 判断是否需要打印取消订单 - storeDetail, err := c.LoadStoreDetail(order2.StoreID, order2.VendorID) - globals.SugarLogger.Debugf("==============storeDetail := %s", utils.Format4Output(storeDetail, false)) - if err == nil && storeDetail.IsPrintCancelOrder == model.YES { // 取消申请 - globals.SugarLogger.Debugf("==============storeDetail := %s", utils.Format4Output("222222222222222", false)) - _, err = netprinter.PrintRefundOrCancelOrder(jxcontext.AdminCtx, model.YES, order2, order2.StoreID) - } - if err != nil { - globals.SugarLogger.Debug("Get store Detail Err: ", err) - } + // 判断是否需要打印取消订单 + storeDetail, errDetail := c.LoadStoreDetail(order2.StoreID, order2.VendorID) + globals.SugarLogger.Debugf("==============storeDetail := %s", utils.Format4Output(storeDetail, false)) + if errDetail == nil && storeDetail.IsPrintCancelOrder == model.YES { // 取消申请 + globals.SugarLogger.Debugf("==============storeDetail := %s , %d", utils.Format4Output(order2.VendorOrderID, false), order2.StoreID) + _, err = netprinter.PrintRefundOrCancelOrder(jxcontext.AdminCtx, model.YES, order2, order2.StoreID) + } + if err != nil { + globals.SugarLogger.Debug("Get store Detail Err: ", err) } } From 467d294f1276eaf7127b4b0890f1beb2c7a892a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Fri, 19 Jan 2024 10:18:24 +0800 Subject: [PATCH 6/8] 1 --- business/jxcallback/orderman/order.go | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/business/jxcallback/orderman/order.go b/business/jxcallback/orderman/order.go index 8621a8213..d7e7c2d78 100644 --- a/business/jxcallback/orderman/order.go +++ b/business/jxcallback/orderman/order.go @@ -259,7 +259,6 @@ func (c *OrderManager) OnOrderStatusChanged(vendorOrgCode string, orderStatus *m order.OrderFinishedAt = time.Now() dao.UpdateEntity(db, order, "OrderFinishedAt") } else if orderStatus.Status == model.OrderStatusCanceled { - globals.SugarLogger.Debugf("==============orderStatus := %s", utils.Format4Output(orderStatus, false)) order2, _ := c.LoadOrder(orderStatus.VendorOrderID, orderStatus.VendorID) // 订单被取消,则取消三方运单 if orderStatus.OrderType == model.OrderTypeOrder { waybill, _ := dao.GetWaybills(db, order2.VendorOrderID, []int64{model.VendorIDMTPS, model.VendorIDDada, model.VendorIDFengNiao, model.VendorIDUUPT, model.VendorIDSFPS}) @@ -276,10 +275,8 @@ func (c *OrderManager) OnOrderStatusChanged(vendorOrgCode string, orderStatus *m } // 判断是否需要打印取消订单 - storeDetail, errDetail := c.LoadStoreDetail(order2.StoreID, order2.VendorID) - globals.SugarLogger.Debugf("==============storeDetail := %s", utils.Format4Output(storeDetail, false)) + storeDetail, errDetail := c.LoadStoreDetail(order2.JxStoreID, order2.VendorID) if errDetail == nil && storeDetail.IsPrintCancelOrder == model.YES { // 取消申请 - globals.SugarLogger.Debugf("==============storeDetail := %s , %d", utils.Format4Output(order2.VendorOrderID, false), order2.StoreID) _, err = netprinter.PrintRefundOrCancelOrder(jxcontext.AdminCtx, model.YES, order2, order2.StoreID) } if err != nil { From 75918e4a8c889c97cdfae45f10d452b84b05f6fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Fri, 19 Jan 2024 10:23:55 +0800 Subject: [PATCH 7/8] 1 --- business/jxcallback/orderman/order.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/business/jxcallback/orderman/order.go b/business/jxcallback/orderman/order.go index d7e7c2d78..e34e01ef1 100644 --- a/business/jxcallback/orderman/order.go +++ b/business/jxcallback/orderman/order.go @@ -276,7 +276,9 @@ func (c *OrderManager) OnOrderStatusChanged(vendorOrgCode string, orderStatus *m // 判断是否需要打印取消订单 storeDetail, errDetail := c.LoadStoreDetail(order2.JxStoreID, order2.VendorID) + globals.SugarLogger.Debugf("==============storeDetail := %s", utils.Format4Output(storeDetail, false)) if errDetail == nil && storeDetail.IsPrintCancelOrder == model.YES { // 取消申请 + globals.SugarLogger.Debugf("==============storeDetail := %s , %d", utils.Format4Output(order2.VendorOrderID, false), order2.StoreID) _, err = netprinter.PrintRefundOrCancelOrder(jxcontext.AdminCtx, model.YES, order2, order2.StoreID) } if err != nil { From b7100abe64a872991a451ce6bb9c2c0bab6ac1a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Fri, 19 Jan 2024 10:28:22 +0800 Subject: [PATCH 8/8] 1 --- business/jxcallback/orderman/order.go | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/business/jxcallback/orderman/order.go b/business/jxcallback/orderman/order.go index e34e01ef1..07e3cc1df 100644 --- a/business/jxcallback/orderman/order.go +++ b/business/jxcallback/orderman/order.go @@ -276,10 +276,8 @@ func (c *OrderManager) OnOrderStatusChanged(vendorOrgCode string, orderStatus *m // 判断是否需要打印取消订单 storeDetail, errDetail := c.LoadStoreDetail(order2.JxStoreID, order2.VendorID) - globals.SugarLogger.Debugf("==============storeDetail := %s", utils.Format4Output(storeDetail, false)) if errDetail == nil && storeDetail.IsPrintCancelOrder == model.YES { // 取消申请 - globals.SugarLogger.Debugf("==============storeDetail := %s , %d", utils.Format4Output(order2.VendorOrderID, false), order2.StoreID) - _, err = netprinter.PrintRefundOrCancelOrder(jxcontext.AdminCtx, model.YES, order2, order2.StoreID) + _, err = netprinter.PrintRefundOrCancelOrder(jxcontext.AdminCtx, model.YES, order2, order2.JxStoreID) } if err != nil { globals.SugarLogger.Debug("Get store Detail Err: ", err)