diff --git a/business/jxstore/cms/store.go b/business/jxstore/cms/store.go index b15c9702b..7fa9daa32 100644 --- a/business/jxstore/cms/store.go +++ b/business/jxstore/cms/store.go @@ -1046,13 +1046,14 @@ func UpdateStoreCourierMap(ctx *jxcontext.Context, db *dao.DaoDB, storeID, vendo return 0, err } delete(payload, "auditStatus") // 不允许直接修改auditStatus的值 - if storeCourier.AuditStatus != model.StoreAuditStatusOnline { - if status, ok := payload["status"].(int); ok && status == model.StoreStatusOpened { - delete(payload, "status") // 没有通过审核的禁止改状态为正常 - } - } valid := dao.NormalMakeMapByStructObject(payload, storeCourier, userName) if len(valid) > 0 { + if storeCourier.AuditStatus != model.StoreAuditStatusOnline { + if status := utils.Interface2Int64WithDefault(valid["status"], 0); status == model.StoreStatusOpened { + // 没有通过审核的禁止改状态为正常 + return 0, fmt.Errorf("此快递门店还没有通过审核,不启用") + } + } num, err = dao.UpdateEntityLogically(db, storeCourier, valid, userName, nil) } return num, err @@ -1061,12 +1062,12 @@ func UpdateStoreCourierMap(ctx *jxcontext.Context, db *dao.DaoDB, storeID, vendo func updateCourierStore(ctx *jxcontext.Context, storeDetail *dao.StoreDetail2) (err error) { globals.SugarLogger.Debugf("updateCourierStore %s, storeID:%d, vendorStoreID:%s", model.VendorChineseNames[storeDetail.VendorID], storeDetail.ID, storeDetail.VendorStoreID) - if storeDetail.VendorStoreID != "" && storeDetail.AuditStatus == model.StoreAuditStatusOnline { - if handlerInfo := partner.GetDeliveryPlatformFromVendorID(storeDetail.VendorID); handlerInfo != nil && handlerInfo.Use4CreateWaybill { - if updateHandler, ok := handlerInfo.Handler.(partner.IDeliveryUpdateStoreHandler); ok { - err = updateHandler.UpdateStore(ctx, formalizeStore4Courier(storeDetail)) - } + if handlerInfo := partner.GetDeliveryPlatformFromVendorID(storeDetail.VendorID); handlerInfo != nil && handlerInfo.Use4CreateWaybill { + if updateHandler, ok := handlerInfo.Handler.(partner.IDeliveryUpdateStoreHandler); ok { + err = updateHandler.UpdateStore(ctx, formalizeStore4Courier(storeDetail)) } + } else { + err = fmt.Errorf("配送平台:%s不被支持", model.VendorChineseNames[storeDetail.VendorID]) } return err } @@ -1081,7 +1082,9 @@ func updateCourierStores(ctx *jxcontext.Context, storeID int) (err error) { if _, ok := v.Handler.(partner.IDeliveryUpdateStoreHandler); ok { storeDetail, err2 := dao.GetStoreDetail2(db, storeID, "", k) if err = err2; err2 == nil { - err = updateCourierStore(ctx, storeDetail) + if storeDetail.VendorStoreID != "" && storeDetail.AuditStatus == model.StoreAuditStatusOnline { + err = updateCourierStore(ctx, storeDetail) + } } errList.AddErr(err) }