From 1047c3c72469ed47e3a07bdbfc734c63142edf9f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Mon, 20 Jun 2022 16:55:40 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=AC=E4=B8=9C=E8=87=AA?= =?UTF-8?q?=E9=85=8D=E9=80=81=E9=97=A8=E5=BA=97=E8=B0=83=E7=94=A8=E8=BE=BE?= =?UTF-8?q?=E8=BE=BE=E8=BD=AC=E8=87=AA=E9=80=81=E6=8E=A5=E5=8F=A3=E9=94=99?= =?UTF-8?q?=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/partner/purchase/jd/order.go | 3 +++ controllers/event.go | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/business/partner/purchase/jd/order.go b/business/partner/purchase/jd/order.go index 1c0ae27ce..0c825d951 100644 --- a/business/partner/purchase/jd/order.go +++ b/business/partner/purchase/jd/order.go @@ -485,6 +485,9 @@ func (p *PurchaseHandler) ConfirmReceiveGoods(ctx *jxcontext.Context, order *mod func (c *PurchaseHandler) Swtich2SelfDeliver(order *model.GoodsOrder, userName string) (err error) { globals.SugarLogger.Debugf("jd Swtich2SelfDeliver orderID:%s", order.VendorOrderID) if globals.EnableJdStoreWrite { + if order.VendorOrgCode == jdapi.ModifySellerDeliveryNo { // 自配送门店不需要达达配送转自送 + return err + } _, err = getAPI(order.VendorOrgCode).ModifySellerDelivery(order.VendorOrderID, userName) if err != nil { if errWithCode, ok := err.(*utils.ErrorWithCode); ok && errWithCode.Level() == 1 { diff --git a/controllers/event.go b/controllers/event.go index 75fba7de2..cd1f63051 100644 --- a/controllers/event.go +++ b/controllers/event.go @@ -113,12 +113,12 @@ func (c *EventController) GetWeixinUnlimited() { // 抖音小程序二维码 tiktok, err := api.TiktokApi.GetTiktokQrCode(params.Scene) if err != nil || result == nil { - return retVal, "", err + return result, "", err } tiktokName := "tiktok" + utils.Int64ToStr(time.Now().Unix()) + ".jpg" tiktokQrCode, err := jxutils.UploadExportContent([]byte(tiktok["fakeData"].(string)), tiktokName) if err != nil || result == nil { - return retVal, "", err + return result, "", err } result["tiktok"] = tiktokQrCode