|
@@ -771,9 +771,13 @@ func (this *SellerController) GroupInvoiceListV2(c *gin.Context) {
|
|
|
for k, v := range groupInvoiceMap {
|
|
|
rate := v / accumulate
|
|
|
mulNum := decimal.NewFromFloat(100)
|
|
|
- d := decimal.NewFromFloat(rate)
|
|
|
- d = d.Mul(mulNum).Round(2)
|
|
|
- a, _ := d.Float64()
|
|
|
+ newRate := decimal.NewFromFloat(rate)
|
|
|
+ newRate = newRate.Mul(mulNum).Round(2)
|
|
|
+ finalRate, _ := newRate.Float64()
|
|
|
+
|
|
|
+ newAmount := decimal.NewFromFloat(v)
|
|
|
+ newAmount = newAmount.Mul(mulNum).Round(2)
|
|
|
+ finalAmount, _ := newAmount.Float64()
|
|
|
|
|
|
groupName := ""
|
|
|
if groupItem ,ok := groupMap[k]; ok {
|
|
@@ -782,8 +786,8 @@ func (this *SellerController) GroupInvoiceListV2(c *gin.Context) {
|
|
|
list = append(list, &fms.CensusSellerGroupInvoiceItem{
|
|
|
GroupId: k,
|
|
|
GroupName: groupName,
|
|
|
- InvoiceAmount: v,
|
|
|
- GroupRate: a,
|
|
|
+ InvoiceAmount: finalAmount,
|
|
|
+ GroupRate: finalRate,
|
|
|
})
|
|
|
}
|
|
|
|