From e54c3d04a89fa016e38fe94e75a5b9121cc0f637 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Wed, 21 Jan 2026 14:15:54 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=9C=82=E9=B8=9F,=E8=BE=BE?= =?UTF-8?q?=E8=BE=BE=E9=85=8D=E9=80=81=E4=BD=99=E9=A2=9D=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jxcallback/scheduler/defsch/defsch_ext.go | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/business/jxcallback/scheduler/defsch/defsch_ext.go b/business/jxcallback/scheduler/defsch/defsch_ext.go index ee3b58970..37201d7eb 100644 --- a/business/jxcallback/scheduler/defsch/defsch_ext.go +++ b/business/jxcallback/scheduler/defsch/defsch_ext.go @@ -491,11 +491,31 @@ func (s *DefScheduler) QueryOrderWaybillFeeInfoEx(ctx *jxcontext.Context, vendor if order.DeliveryType == model.OrderDeliveryTypeSelfTake { return nil, fmt.Errorf("订单:%s是自提单", vendorOrderID) } + // 获取用户送货地址 storeCourierList, err := dao.GetStoreCourierList(db, []int{jxutils.GetSaleStoreIDFromOrder(order)}, nil, model.StoreStatusAll, model.StoreAuditStatusOnline) if err != nil { return nil, err } + + // 隐私地址获取(美团) + //if vendorID == model.VendorIDMTWM && strings.Contains(order.ConsigneeAddress, "地址已隐藏") { + // var apiObj *mtwmapi.API + // switch order.VendorOrgCode { + // case beego.AppConfig.DefaultString("mtwmAppID2", ""): // 5873 + // store, _ := dao.GetStoreDetail(dao.GetDB(), order.JxStoreID, order.VendorID, order.VendorOrgCode) + // apiObj = api.Mtwm2API + // apiObj.SetToken(store.MtwmToken) + // default: // 589 4123 + // apiObj = api.MtwmAPI + // } + // address, err := apiObj.GetOrderAddress(utils.Str2Int64(order.VendorOrderID), 3) + // if err != nil { + // return nil, err + // } + // + //} + // 美团配送订单兑现 waybillList, err := partner.CurOrderManager.GetOrderWaybillInfo(ctx, vendorOrderID, vendorID, true, false) if err != nil {