|
@@ -186,8 +186,8 @@ func GenerateWord(contractDetail *contract.ContractDetail) (err error) {
|
|
|
//originalPrice := strconv.FormatFloat(contractDetail.OriginalPrice, 'E', -1, 64)
|
|
|
|
|
|
//优惠前金额(小写)
|
|
|
- newDecimal := decimal.NewFromFloat(contractDetail.OriginalPrice)
|
|
|
- originalPrice := newDecimal.String()
|
|
|
+ //newDecimal := decimal.NewFromFloat(contractDetail.OriginalPrice)
|
|
|
+ originalPrice := utils.FormatPrice(contractDetail.OriginalPrice)
|
|
|
priceStr += "小写:" + originalPrice + ","
|
|
|
|
|
|
//优惠前金额(大写)
|
|
@@ -201,8 +201,8 @@ func GenerateWord(contractDetail *contract.ContractDetail) (err error) {
|
|
|
//如果实际支付金额与订单原金额不符
|
|
|
if contractDetail.OriginalPrice != contractDetail.Price {
|
|
|
//优惠后的金额(小写)
|
|
|
- newDecimal := decimal.NewFromFloat(contractDetail.Price)
|
|
|
- price := newDecimal.String()
|
|
|
+ //newDecimal := decimal.NewFromFloat(contractDetail.Price)
|
|
|
+ price := utils.FormatPrice(contractDetail.Price)
|
|
|
priceStr += ",经甲乙双方友好协商,优惠至:" + price + "元,"
|
|
|
|
|
|
//优惠后的金额(大写)
|
|
@@ -603,8 +603,8 @@ func GetHtmlByContractDetail(contractDetail *contract.ContractDetail, htmlType s
|
|
|
//originalPrice := strconv.FormatFloat(contractDetail.OriginalPrice, 'E', -1, 64)
|
|
|
|
|
|
//优惠前金额(小写)
|
|
|
- newDecimal := decimal.NewFromFloat(contractDetail.OriginalPrice)
|
|
|
- originalPrice := newDecimal.String()
|
|
|
+ //newDecimal := decimal.NewFromFloat(contractDetail.OriginalPrice)
|
|
|
+ originalPrice := utils.FormatPrice(contractDetail.OriginalPrice)
|
|
|
priceStr += "小写:" + originalPrice + "元,"
|
|
|
|
|
|
//优惠前金额(大写)
|
|
@@ -618,8 +618,8 @@ func GetHtmlByContractDetail(contractDetail *contract.ContractDetail, htmlType s
|
|
|
//如果实际支付金额与订单原金额不符
|
|
|
if contractDetail.OriginalPrice != contractDetail.Price {
|
|
|
//优惠后的金额(小写)
|
|
|
- newDecimal := decimal.NewFromFloat(contractDetail.Price)
|
|
|
- price := newDecimal.String()
|
|
|
+ //newDecimal := decimal.NewFromFloat(contractDetail.Price)
|
|
|
+ price := utils.FormatPrice(contractDetail.Price)
|
|
|
priceStr += ",经甲乙双方友好协商,优惠至:" + price + "元,"
|
|
|
|
|
|
//优惠后的金额(大写)
|
|
@@ -1594,8 +1594,8 @@ func getPrintData(data WordElement, contractDetail *contract.ContractDetail) (is
|
|
|
printContent = tmpPrintContent
|
|
|
case "original_price":
|
|
|
//优惠前金额(小写)
|
|
|
- newDecimal := decimal.NewFromFloat(contractDetail.OriginalPrice)
|
|
|
- printContent = newDecimal.String()
|
|
|
+ //newDecimal := decimal.NewFromFloat(contractDetail.OriginalPrice)
|
|
|
+ printContent = utils.FormatPrice(contractDetail.OriginalPrice)
|
|
|
case "original_price_cn":
|
|
|
//优惠前金额(大写)
|
|
|
originalCnyPrice, cnyErr := utils.ConvertNumToCny(contractDetail.OriginalPrice)
|
|
@@ -1609,8 +1609,8 @@ func getPrintData(data WordElement, contractDetail *contract.ContractDetail) (is
|
|
|
if contractDetail.OriginalPrice == contractDetail.Price {
|
|
|
return
|
|
|
}
|
|
|
- newDecimal := decimal.NewFromFloat(contractDetail.Price)
|
|
|
- printContent = newDecimal.String()
|
|
|
+ //newDecimal := decimal.NewFromFloat(contractDetail.Price)
|
|
|
+ printContent = utils.FormatPrice(contractDetail.Price)
|
|
|
case "price_cn":
|
|
|
//实际金额(大写)
|
|
|
if contractDetail.OriginalPrice == contractDetail.Price {
|