From 8db8cfa6bc2d0ba28ce71141b273c2bf7e72e8d0 Mon Sep 17 00:00:00 2001 From: gazebo Date: Mon, 18 Nov 2019 11:19:05 +0800 Subject: [PATCH 1/3] comment --- business/model/order.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/business/model/order.go b/business/model/order.go index b11836029..3f1e4427f 100644 --- a/business/model/order.go +++ b/business/model/order.go @@ -36,8 +36,8 @@ type GoodsOrder struct { VendorUserID string `orm:"column(vendor_user_id);size(48)" json:"vendorUserID"` UserID string `orm:"column(user_id);size(48)" json:"userID"` ConsigneeName string `orm:"size(32)" json:"consigneeName"` - ConsigneeMobile string `orm:"size(32)" json:"consigneeMobile"` - ConsigneeMobile2 string `orm:"size(32)" json:"consigneeMobile2"` + ConsigneeMobile string `orm:"size(32)" json:"consigneeMobile"` // 订单中的收货手机号 + ConsigneeMobile2 string `orm:"size(32)" json:"consigneeMobile2"` // 收货人真实手机号 ConsigneeAddress string `orm:"size(255)" json:"consigneeAddress"` CoordinateType int `json:"coordinateType"` ConsigneeLng int `json:"consigneeLng"` // 坐标 * （10的六次方） From 07f33ccfe6de4406c7e786b6da154c1675273257 Mon Sep 17 00:00:00 2001 From: gazebo Date: Mon, 18 Nov 2019 11:33:01 +0800 Subject: [PATCH 2/3] =?UTF-8?q?ChangeStoreSkuSaleStatus=E8=B0=83=E7=94=A8?= =?UTF-8?q?=E6=97=B6=E8=A6=81=E5=88=A4=E6=96=AD=E4=B9=8B=E5=89=8D=E6=98=AF?= =?UTF-8?q?=E5=90=A6=E6=88=90=E5=8A=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/jxstore/cms/store.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/business/jxstore/cms/store.go b/business/jxstore/cms/store.go index 1bdc89d63..e4162a022 100644 --- a/business/jxstore/cms/store.go +++ b/business/jxstore/cms/store.go @@ -777,8 +777,10 @@ func UpdateStore(ctx *jxcontext.Context, storeID int, payload map[string]interfa dao.Commit(db) } notifyStoreOperatorChanged(store, valid["operatorPhone"]) - if valid["openTime1"] != 0 || valid["closeTime1"] != 0 || valid["openTime2"] != 0 || valid["closeTime2"] != 0 { - err = CurVendorSync.ChangeStoreSkuSaleStatus(ctx, storeID, true, false) + if err == nil { + if valid["openTime1"] != 0 || valid["closeTime1"] != 0 || valid["openTime2"] != 0 || valid["closeTime2"] != 0 { + err = CurVendorSync.ChangeStoreSkuSaleStatus(ctx, storeID, true, false) + } } } } else { From 9b12510cca52c5ebe21216dc8c2ec8f780665213 Mon Sep 17 00:00:00 2001 From: gazebo Date: Mon, 18 Nov 2019 11:52:19 +0800 Subject: [PATCH 3/3] =?UTF-8?q?jd.UpdateStore=E4=B8=AD=EF=BC=8C=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E9=97=A8=E5=BA=97=E4=BF=A1=E6=81=AF=E5=87=BA=E9=94=99?= =?UTF-8?q?=E5=90=8E=EF=BC=8C=E4=B9=9F=E8=A6=81=E5=B0=9D=E8=AF=95=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E5=85=8D=E8=BF=90=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/partner/purchase/jd/store.go | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/business/partner/purchase/jd/store.go b/business/partner/purchase/jd/store.go index 0c7f6461b..039fd747e 100644 --- a/business/partner/purchase/jd/store.go +++ b/business/partner/purchase/jd/store.go @@ -15,6 +15,7 @@ import ( "git.rosy.net.cn/baseapi/platformapi/jdapi" "git.rosy.net.cn/baseapi/utils" + "git.rosy.net.cn/baseapi/utils/errlist" "git.rosy.net.cn/jx-callback/business/model" "git.rosy.net.cn/jx-callback/globals/api" ) @@ -160,10 +161,9 @@ func (p *PurchaseHandler) UpdateStore(db *dao.DaoDB, storeID int, userName strin } fillOpTimeParams(storeParams, store.GetOpTimeList()) globals.SugarLogger.Debug(utils.Format4Output(storeParams, false)) + errList := errlist.New() if globals.EnableJdStoreWrite { - if err = getAPI("").UpdateStoreInfo4Open2(storeParams, modifyCloseStatus); err != nil { - return err - } + errList.AddErr(getAPI("").UpdateStoreInfo4Open2(storeParams, modifyCloseStatus)) } if store.FreightDeductionPack != "" { storeDetail, err2 := dao.GetStoreDetail(db, store.ID, model.VendorIDJD) @@ -196,11 +196,12 @@ func (p *PurchaseHandler) UpdateStore(db *dao.DaoDB, storeID int, userName strin freightParams.IsFullFree = len(freightParams.FreeFreightInfoList) > 0 globals.SugarLogger.Debug(utils.Format4Output(freightParams, false)) if globals.EnableJdStoreWrite { - err = getAPI("").UpdateStoreFreightConfigNew(freightParams) + errList.AddErr(getAPI("").UpdateStoreFreightConfigNew(freightParams)) } } } } + err = errList.GetErrListAsOne() } } return err