1
This commit is contained in:
@@ -10,7 +10,6 @@ import (
|
||||
"git.rosy.net.cn/jx-callback/business/model/dao"
|
||||
"git.rosy.net.cn/jx-callback/business/partner"
|
||||
"git.rosy.net.cn/jx-callback/globals/api"
|
||||
"strings"
|
||||
"time"
|
||||
)
|
||||
|
||||
@@ -113,16 +112,20 @@ func GetMerchantInfo(merchantNo string) (*lakala.MerchantObj, error) {
|
||||
}
|
||||
|
||||
if merchantInfo.TermNo == "" {
|
||||
termNo := make([]string, 0, 0)
|
||||
for _, v := range result.TerminalInfo {
|
||||
termNo = append(termNo, v.TermNoList...)
|
||||
}
|
||||
if len(termNo) != model.NO {
|
||||
merchantInfo.TermNo = strings.Join(termNo, ",")
|
||||
dao.UpdateEntity(db, merchantInfo, "TermNo")
|
||||
}
|
||||
//termNo := make([]string, 0, 0)
|
||||
//for _, v := range result.TerminalInfo {
|
||||
// termNo = append(termNo, v.TermNoList...)
|
||||
//}
|
||||
//if len(termNo) != model.NO {
|
||||
// merchantInfo.TermNo = strings.Join(termNo, ",")
|
||||
// dao.UpdateEntity(db, merchantInfo, "TermNo")
|
||||
//}
|
||||
merchantInfo.TermNo = result.Customer.TermNo
|
||||
}
|
||||
merchantInfo.MerchantStatus = result.Customer.CustomerStatus
|
||||
if merchantInfo.MerchantNo2 == "" {
|
||||
merchantInfo.MerchantNo2 = result.Customer.ExternalCustomerNo
|
||||
}
|
||||
dao.UpdateEntity(db, merchantInfo, "TermNo", "MerchantStatus")
|
||||
|
||||
return result, err
|
||||
|
||||
Reference in New Issue
Block a user