From 8d9ce9866f94e1e5ae9bcd94bcb1bf7ef9771991 Mon Sep 17 00:00:00 2001 From: gazebo Date: Tue, 11 Jun 2019 09:13:40 +0800 Subject: [PATCH] =?UTF-8?q?-=20store=E8=A1=A8=E4=B8=AD=E4=BF=AE=E6=94=B9Jx?= =?UTF-8?q?BrandFeeFactor,MarketAddFeeFactor=EF=BC=8C=E6=B7=BB=E5=8A=A0Pay?= =?UTF-8?q?Percentage,OperatorName=E5=92=8COperatorPhone?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/jxstore/cms/store.go | 8 ++++++-- business/model/store.go | 12 ++++++++---- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/business/jxstore/cms/store.go b/business/jxstore/cms/store.go index 51317b1dc..da8bcf271 100644 --- a/business/jxstore/cms/store.go +++ b/business/jxstore/cms/store.go @@ -122,13 +122,17 @@ func GetStores(ctx *jxcontext.Context, keyword string, params map[string]interfa t1.licence2_expire, t1.market_man_name, t1.market_man_phone, - t1.jx_brand_fee, - t1.market_add_fee, + t1.jx_brand_fee_factor, + t1.market_add_fee_factor, t1.payee_name, t1.payee_account_no, t1.payee_bank_branch_name, t1.payee_bank_name, + t1.pay_percentage, + t1.operator_name, + t1.operator_phone, + city.name city_name, district.name district_name, CONCAT('[', GROUP_CONCAT(DISTINCT CONCAT('{"vendorStoreID":"', m1.vendor_store_id, '", "vendorID":', m1.vendor_id, diff --git a/business/model/store.go b/business/model/store.go index 964313ac6..162aa45d8 100644 --- a/business/model/store.go +++ b/business/model/store.go @@ -162,15 +162,19 @@ type Store struct { Licence2Valid string `orm:"size(32)" json:"licence2Valid"` // 有效期开始 Licence2Expire string `orm:"size(32)" json:"licence2Expire"` // 有效期结束 - MarketManName string `orm:"size(8)" json:"marketManName"` // 市场负责人姓名 - MarketManPhone string `orm:"size(16)" json:"marketManPhone"` // 市场负责人电话 - JxBrandFee int64 `json:"jxBrandFee"` // 京西品牌费 - MarketAddFee int64 `json:"marketAddFee"` // 市场附加费 + MarketManName string `orm:"size(8)" json:"marketManName"` // 市场负责人姓名 + MarketManPhone string `orm:"size(16)" json:"marketManPhone"` // 市场负责人电话 + JxBrandFeeFactor int `json:"jxBrandFeeFactor"` // 京西品牌费因子 + MarketAddFeeFactor int `json:"marketAddFeeFactor"` // 市场附加费因子 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"` // 开户支行 + PayPercentage int `json:"payPercentage"` + + OperatorName string `orm:"size(8)" json:"operatorName"` // 运营人姓名 + OperatorPhone string `orm:"size(16)" json:"operatorPhone"` // 运营人电话 } func (*Store) TableUnique() [][]string {