From 8a4c89c1a559dcc45bcf91fa89c5a265cb87e87e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Wed, 3 Sep 2025 17:43:35 +0800 Subject: [PATCH] 1 --- business/jxcallback/orderman/orderman_ext.go | 3 --- business/partner/purchase/ebai/order.go | 3 +++ 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/business/jxcallback/orderman/orderman_ext.go b/business/jxcallback/orderman/orderman_ext.go index 82383edfc..79e322a7f 100644 --- a/business/jxcallback/orderman/orderman_ext.go +++ b/business/jxcallback/orderman/orderman_ext.go @@ -1205,9 +1205,6 @@ func (c *OrderManager) GetStoresOrderSaleInfoNew(ctx *jxcontext.Context, storeID feeList, _ := dao.GetStoreServerFee(db, storeIDList, fromTime, toTime, statusList, true) // 门店账号支出 fineList, _ := dao.StatisticsFineFee(db, fromTime, toTime, storeIDList) - globals.SugarLogger.Debugf("-----feelist := %s", utils.Format4Output(feeList, false)) - globals.SugarLogger.Debugf("-----fineList := %s", utils.Format4Output(fineList, false)) - globals.SugarLogger.Debugf("-----saleInfoList := %s", utils.Format4Output(saleInfoList, false)) for _, v := range saleInfoList { for _, f := range feeList { if v.StoreID == f.JxStoreID && v.VendorID == f.VendorID { diff --git a/business/partner/purchase/ebai/order.go b/business/partner/purchase/ebai/order.go index 313a6468c..dff5a5d09 100644 --- a/business/partner/purchase/ebai/order.go +++ b/business/partner/purchase/ebai/order.go @@ -431,6 +431,9 @@ func (p *PurchaseHandler) AcceptOrRefuseOrder(order *model.GoodsOrder, isAcceptI func (p *PurchaseHandler) PickupGoods(order *model.GoodsOrder, isSelfDelivery bool, userName string) (err error) { if globals.EnableEbaiStoreWrite { + if userName == "autoPickup" && !isSelfDelivery { + return nil + } err = api.EbaiAPI.OrderPickComplete(order.VendorOrderID) } if err == nil {