|
|
@@ -555,7 +555,7 @@ func buildWRTradeDealedContract(wrtradetradequote model.Wrtradetradequote, buyOr
|
|
|
|
|
|
docx1 := r.Editable()
|
|
|
// global.M2A_LOG.Info(docx1.GetContent())
|
|
|
- docx1.Replace("${WRTRADEDETAILID}", strconv.Itoa(int(wrtradetradequote.WRTRADEDETAILID)), -1)
|
|
|
+ docx1.Replace("WRTRADEDETAILID", strconv.Itoa(int(wrtradetradequote.WRTRADEDETAILID)), -1)
|
|
|
if transfertradedate, e := time.Parse("20060102", wrtradetradequote.TRADEDATE); e == nil {
|
|
|
docx1.Replace("TRADEDATE", transfertradedate.Format("2006年01月02日"), -1)
|
|
|
}
|
|
|
@@ -572,8 +572,8 @@ func buildWRTradeDealedContract(wrtradetradequote model.Wrtradetradequote, buyOr
|
|
|
docx1.Replace("DESADDRESS", totalAddress, -1)
|
|
|
docx1.Replace("CARDNUM", userinfo.CARDNUM, -1)
|
|
|
docx1.Replace("MOBILE", userinfo.MOBILE, -1)
|
|
|
- docx1.Replace("BANK", bankinfo.BANKNAME, -1)
|
|
|
docx1.Replace("BANKACCOUNTNO", bankaccountsign.BANKACCOUNTNO, -1)
|
|
|
+ docx1.Replace("BANK", bankinfo.BANKNAME, -1)
|
|
|
docx1.Replace("WRSTANDARDNAME", wrstandard.WRSTANDARDNAME, -1)
|
|
|
docx1.Replace("TRADEQTY", strconv.Itoa(int(wrtradetradequote.TRADEQTY)), -1)
|
|
|
docx1.Replace("TRADEPRICE", strconv.FormatFloat(wrtradetradequote.TRADEPRICE, 'f', -1, 64), -1)
|
