diff --git a/business/jxstore/cms/store.go b/business/jxstore/cms/store.go index 0e80ac1d2..f7cac1325 100644 --- a/business/jxstore/cms/store.go +++ b/business/jxstore/cms/store.go @@ -794,8 +794,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 { 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的六次方) 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