Merge branch 'develop' of k.zhang/duoduo into master

apis/shanghu/merchant_pay_info.go

@@ -30,6 +30,7 @@ func CreateMerchantPayInfo(c *gin.Context) {
 	sqlData.IDCardFront = inData.IDCardFront
 	sqlData.IDCardHand = inData.IDCardHand
 	sqlData.AccountName = inData.AccountName
+	sqlData.EntryInfo = inData.EntryInfo
 
 	_, err = sqlData.Create()
 	if err != nil {
@@ -85,6 +86,7 @@ func UpdateMerchantPayInfo(c *gin.Context) {
 	sqlData.IDCardFront = inData.IDCardFront
 	sqlData.IDCardHand = inData.IDCardHand
 	sqlData.AccountName = inData.AccountName
+	sqlData.EntryInfo = inData.EntryInfo
 
 	err = sqlData.UpdateMerchantPayInfo()
 	if err != nil {

apis/shanghu/models/merchant.pay.info.go

@@ -11,6 +11,8 @@ type CreateMerchantPayInfoRequest struct {
 	BankAddress     string `json:"bank_address"`     // 网点
 	AccountName     string `json:"account_name"`     // 姓名
 	MerchantType    int    `json:"merchant_type"`
+	EntryInfo       string `json:"entry_info"` //入账信息
+
 }
 
 type GetMerchantPayInfoRequest struct {
@@ -29,4 +31,5 @@ type UpdateMerchantPayInfoRequest struct {
 	BankAddress     string `json:"bank_address"`     // 网点
 	AccountName     string `json:"account_name"`     // 姓名
 	MerchantType    int    `json:"merchant_type"`
+	EntryInfo       string `json:"entry_info"` //入账信息
 }

models/shanghu/merchant.pay.info.go

@@ -22,6 +22,8 @@ type MerchantPayInfo struct {
 	BankAddress     string    `gorm:"column:bank_address;type:varchar(50)" json:"bank_address"`          // 网点
 	AccountName     string    `gorm:"column:account_name;type:varchar(50)" json:"account_name"`          // 姓名
 	MerchantType    int       `gorm:"column:merchant_type;type:int(11)" json:"merchant_type"`
+	EntryInfo       string    `gorm:"column:entry_info;type:varchar(255)" json:"entry_info"` // 入账信息
+
 }
 
 func (m *MerchantPayInfo) TableName() string {
@@ -67,6 +69,7 @@ func (m *MerchantPayInfo) UpdateMerchantPayInfo() error {
 			"bank_address":     m.BankAddress,
 			"account_name":     m.AccountName,
 			"merchant_type":    m.MerchantType,
+			"entry_info":       m.EntryInfo,
 			"updated_at":       time.Now()}).Error; err != nil {
 		return err
 	}