From a269cc720855f70ebc7977f5b85279ed5a6db260 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Fri, 11 Apr 2025 17:06:10 +0800 Subject: [PATCH] 1 --- business/jxstore/cms/store.go | 1 + business/partner/delivery/fn/store.go | 3 +++ business/partner/purchase/mtwm/order_afs.go | 5 +++++ 3 files changed, 9 insertions(+) diff --git a/business/jxstore/cms/store.go b/business/jxstore/cms/store.go index e71367a01..f3dd3849b 100644 --- a/business/jxstore/cms/store.go +++ b/business/jxstore/cms/store.go @@ -869,6 +869,7 @@ func GetVendorStore(ctx *jxcontext.Context, vendorID int, vendorOrgCode, vendorS //} else { // retVal.BussinessStatus = 1 //} + globals.SugarLogger.Debugf("---------retVal := %s", utils.Format4Output(retVal, false)) return retVal, err } } diff --git a/business/partner/delivery/fn/store.go b/business/partner/delivery/fn/store.go index 35a624d75..f6dfeba6f 100644 --- a/business/partner/delivery/fn/store.go +++ b/business/partner/delivery/fn/store.go @@ -84,6 +84,8 @@ func shopStatus2JX(status int) (jxStatus int) { func (c *DeliveryHandler) GetStore(ctx *jxcontext.Context, storeID int, vendorStoreID string) (storeDetail *dao.StoreDetail2, err error) { shopInfo, err := api.FnAPI.GetStore(vendorStoreID) + globals.SugarLogger.Debugf("---------err := %v", err) + globals.SugarLogger.Debugf("---------shopInfo := %s", utils.Format4Output(shopInfo, false)) if err == nil { storeDetail = &dao.StoreDetail2{ Store: model.Store{ @@ -98,6 +100,7 @@ func (c *DeliveryHandler) GetStore(ctx *jxcontext.Context, storeID int, vendorSt CourierStatus: shopStatus2JX(shopInfo.Status), } } + globals.SugarLogger.Debugf("---------storeDetail := %s", utils.Format4Output(storeDetail, false)) return storeDetail, err } diff --git a/business/partner/purchase/mtwm/order_afs.go b/business/partner/purchase/mtwm/order_afs.go index 0b371376d..dd4be5e25 100644 --- a/business/partner/purchase/mtwm/order_afs.go +++ b/business/partner/purchase/mtwm/order_afs.go @@ -163,6 +163,11 @@ func (c *PurchaseHandler) onAfsOrderMsg(msg *mtwmapi.CallbackMsg) (retVal *mtwma afsOrder.AfsFinishedAt = time.Now() afsOrder.Status = model.AfsOrderStatusFinished } + if refundData.NotifyType == mtwmapi.MsgTypeOrderAgree && msg.Cmd == mtwmapi.MsgTypeOrderRefund { + order, _ := partner.CurOrderManager.LoadOrder(orderStatus.RefVendorOrderID, model.VendorIDMTWM) + order.Status = model.OrderStatusCanceled + dao.UpdateEntity(db, order, "Status") + } } err = partner.CurOrderManager.OnAfsOrderNew(afsOrder, orderStatus) } else {