Merge branch 'master' of http://47.101.159.18:3000/Muchinfo/MTP20_ASSISTED

go.mod

@@ -9,6 +9,7 @@ require (
 	github.com/lestrrat-go/file-rotatelogs v2.4.0+incompatible
 	github.com/mattn/go-oci8 v0.1.1
 	github.com/nguyenthenguyen/docx v0.0.0-20220721043308-1903da0ef37d
+	github.com/shopspring/decimal v1.2.0
 	github.com/spf13/viper v1.13.0
 	github.com/streadway/amqp v0.0.0-20190827072141-edfb9018d271
 	go.uber.org/zap v1.23.0

go.sum

@@ -445,6 +445,7 @@ github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdh
 github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc=
 github.com/shopspring/decimal v0.0.0-20180709203117-cd690d0c9e24/go.mod h1:M+9NzErvs504Cn4c5DxATwIqPbtswREoFCre64PpcG4=
 github.com/shopspring/decimal v0.0.0-20200227202807-02e2044944cc/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o=
+github.com/shopspring/decimal v1.2.0 h1:abSATXmQEYyShuxI4/vyW3tV1MrKAJzCZ/0zLUXYbsQ=
 github.com/shopspring/decimal v1.2.0/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o=
 github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
 github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=

service/thjNtf.go

@@ -171,7 +171,7 @@ func onTHJPurchaseTradeNtf(bytes *[]byte) {
 	docx1.Replace("${WRSTANDARDNAME}", wrstandard.WRSTANDARDNAME, -1)
 	docx1.Replace("${SELLUSER}", selluserinfo.CUSTOMERNAME, -1)
 	docx1.Replace("${LASTAMOUNT}", strconv.FormatFloat(thjpurchasetradedetail.LASTAMOUNT, 'f', -1, 64), -1)
-	docx1.Replace("${DEPOSITRATE}", strconv.FormatFloat(thjpurchasetradedetail.DEPOSITRATE*100, 'f', -1, 64)+"%", -1)
+	docx1.Replace("${DEPOSITRATE}", strconv.FormatFloat(utils.Round(thjpurchasetradedetail.DEPOSITRATE*100, 2), 'f', -1, 64)+"%", -1)
 	docx1.Replace("TRADEQTY", strconv.Itoa(int(thjpurchasetradedetail.TRADEQTY)), -1)
 	docx1.Replace("${TRADEPRICE}", strconv.FormatFloat(thjpurchasetradedetail.TRADEPRICE, 'f', -1, 64), -1)
 	docx1.Replace("${ENDDATEMONTH}", strconv.Itoa(int(wrpresaleinfo.TAKESTARTDATE.Local().Month())), -1)

utils/math.go

@@ -0,0 +1,9 @@
+package utils
+
+import "github.com/shopspring/decimal"
+
+// Round
+func Round(value float64, places int32) float64 {
+	d, _ := decimal.NewFromFloat(value).Round(places).Float64()
+	return d
+}