diff --git a/business/lakala/lakala_incoming.go b/business/lakala/lakala_incoming.go index c9e97bc07..9b069f9bf 100644 --- a/business/lakala/lakala_incoming.go +++ b/business/lakala/lakala_incoming.go @@ -103,6 +103,8 @@ func GetMerchantInfo(merchantNo string) (*lakala.MerchantObj, error) { dao.UpdateEntity(db, merchantInfo, "TermNo") } } + merchantInfo.MerchantStatus = result.Customer.CustomerStatus + dao.UpdateEntity(db, merchantInfo, "TermNo", "MerchantStatus") return result, err } diff --git a/business/model/lakala.go b/business/model/lakala.go index e86e0d2f1..fd8505834 100644 --- a/business/model/lakala.go +++ b/business/model/lakala.go @@ -39,7 +39,7 @@ const ( type LakalaContract struct { ModelIDCUL - ContractId string `orm:"column(contract_id);size(20)" json:"contractId"` // 订单编号 + ContractId string `orm:"column(contract_id);size(32)" json:"contractId"` // 订单编号 ContractApplyId string `orm:"column(contract_apply_id);size(20)" json:"contractApplyId"` // 电子合同编号 ContractStatus string `orm:"column(contract_status);size(20)" json:"ContractStatus"` // 合同状态 StoreId int `orm:"column(store_id);size(16)" json:"storeId"` // 京西门店ID @@ -48,7 +48,6 @@ type LakalaContract struct { func (o *LakalaContract) TableUnique() [][]string { return [][]string{ - []string{"StoreID"}, []string{"contract_id"}, } } @@ -88,13 +87,13 @@ type BindAccountObj struct { func (o *LakalaIncoming) TableUnique() [][]string { return [][]string{ - []string{"StoreID"}, []string{"MerchantNo"}, } } func (o *LakalaIncoming) TableIndex() [][]string { return [][]string{ []string{"ApplyID"}, + []string{"StoreId"}, } }