From a59908988c4fac293ac4de0b44d15faabe6288c5 Mon Sep 17 00:00:00 2001 From: gazebo Date: Thu, 25 Jul 2019 14:21:01 +0800 Subject: [PATCH] =?UTF-8?q?-=20=E7=A6=81=E7=94=A8=E9=97=A8=E5=BA=97?= =?UTF-8?q?=E5=88=9B=E5=BB=BA=E4=B8=8E=E4=BF=AE=E6=94=B9=E9=93=B6=E8=A1=8C?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E4=BF=A1=E6=81=AF=EF=BC=8C=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?Store.PayeeBankCode=EF=BC=8C=E5=88=A0=E9=99=A4Store.PayeeBankNa?= =?UTF-8?q?me?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/jxstore/cms/store.go | 3 +++ business/model/act.go | 2 +- business/model/store.go | 4 ++-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/business/jxstore/cms/store.go b/business/jxstore/cms/store.go index 8bcee1359..4455f28b7 100644 --- a/business/jxstore/cms/store.go +++ b/business/jxstore/cms/store.go @@ -592,6 +592,8 @@ func UpdateStore(ctx *jxcontext.Context, storeID int, payload map[string]interfa // valid["districtCode"] = api.AutonaviAPI.GetCoordinateDistrictCode(lng, lat) // } globals.SugarLogger.Debugf("UpdateStore track:%s, valid:%s", ctx.GetTrackInfo(), utils.Format4Output(valid, true)) + delete(valid, "payeeBankBranchName") + delete(valid, "payeeBankCode") if len(valid) > 0 { dao.Begin(db) defer func() { @@ -667,6 +669,7 @@ func EnableHaveRestStores(ctx *jxcontext.Context, isAsync, isContinueWhenError b } func CreateStore(ctx *jxcontext.Context, storeExt *StoreExt, userName string) (id int, err error) { + return 0, fmt.Errorf("暂时禁用门店创建，请稍后") globals.SugarLogger.Debugf("CreateStore storeExt:%s", utils.Format4Output(storeExt, false)) store := &storeExt.Store if store.ID != 0 && !jxutils.IsLegalStoreID(store.ID) { diff --git a/business/model/act.go b/business/model/act.go index 71867daae..a7acd1713 100644 --- a/business/model/act.go +++ b/business/model/act.go @@ -31,7 +31,7 @@ const ( var ( ActTypeName = map[int]string{ - ActSkuFake: "补贴", + ActSkuFake: "结算", ActSkuDirectDown: "直降", ActSkuSecKill: "秒杀", } diff --git a/business/model/store.go b/business/model/store.go index 1b6500ef4..3f73d8d22 100644 --- a/business/model/store.go +++ b/business/model/store.go @@ -291,8 +291,8 @@ type Store struct { PayeeName string `orm:"size(8)" json:"payeeName"` // 收款人姓名 PayeeAccountNo string `orm:"size(255)" json:"payeeAccountNo"` // 收款账号 - PayeeBankBranchName string `orm:"size(255)" json:"payeeBankBranchName"` // 开户银行 - PayeeBankName string `orm:"size(255)" json:"payeeBankName"` // 开户支行 + PayeeBankBranchName string `orm:"size(255)" json:"payeeBankBranchName"` // 开户支行 + PayeeBankCode string `orm:"size(8)" json:"payeeBankCode"` // 开户行代码 PayPercentage int `json:"payPercentage"` OperatorName string `orm:"size(8)" json:"operatorName"` // 运营人姓名