From c336c7f630583a6b2ef14aa6777aa05cab895629 Mon Sep 17 00:00:00 2001 From: gazebo Date: Tue, 15 Oct 2019 22:03:28 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=AC=E8=A5=BF=E9=97=A8?= =?UTF-8?q?=E5=BA=97=E7=9A=84=E8=90=A5=E4=B8=9A=E6=97=B6=E9=97=B4=E7=BB=8F?= =?UTF-8?q?=E8=BF=87=E7=BA=A6=E6=9D=9F=E5=90=8E=E4=B8=BA=E7=A9=BA=E6=97=B6?= =?UTF-8?q?=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/partner/purchase/mtwm/store.go | 6 +++++- business/partner/purchase/mtwm/store_test.go | 7 +++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/business/partner/purchase/mtwm/store.go b/business/partner/purchase/mtwm/store.go index a3b2983c9..90df1bada 100644 --- a/business/partner/purchase/mtwm/store.go +++ b/business/partner/purchase/mtwm/store.go @@ -257,8 +257,12 @@ func (c *PurchaseHandler) UpdateStoreOpTime(ctx *jxcontext.Context, storeID int, if globals.EnableMtwmStoreWrite { err = api.MtwmAPI.PoiShipTimeUpdate(vendorStoreID, shippingTime) if err != nil { + shippingTime = "" if validOpTimeList := getOpTimeListFromErr(err); len(validOpTimeList) > 0 { - err = api.MtwmAPI.PoiShipTimeUpdate(vendorStoreID, openTimeJX2Mtwm(constrainOpTimeList(opTimeList, validOpTimeList))) + shippingTime = openTimeJX2Mtwm(constrainOpTimeList(opTimeList, validOpTimeList)) + } + if shippingTime != "" { + err = api.MtwmAPI.PoiShipTimeUpdate(vendorStoreID, shippingTime) } } } diff --git a/business/partner/purchase/mtwm/store_test.go b/business/partner/purchase/mtwm/store_test.go index 48de8686e..274ed47d6 100644 --- a/business/partner/purchase/mtwm/store_test.go +++ b/business/partner/purchase/mtwm/store_test.go @@ -5,6 +5,7 @@ import ( "git.rosy.net.cn/jx-callback/business/jxutils/jxcontext" + "git.rosy.net.cn/baseapi/platformapi/mtwmapi" "git.rosy.net.cn/baseapi/utils" // _ "git.rosy.net.cn/jx-callback/business/jxcallback/orderman" ) @@ -36,3 +37,9 @@ func TestConstrainOpTimeList(t *testing.T) { t.Fatal("constrainOpTimeList failed") } } + +func TestGetOpTimeListFromErr(t *testing.T) { + err := utils.NewErrorIntCode("当前配送营业时间为:07:00~24:00", mtwmapi.ErrCodeOpFailed) + list := getOpTimeListFromErr(err) + t.Log(list) +}