|
@@ -1160,8 +1160,8 @@ func (this *SellerController) GroupInvoiceListV2(c *gin.Context) {
|
|
|
|
|
|
list := make([]*fms.CensusSellerGroupInvoiceItem, 0)
|
|
|
|
|
|
- for _, groupId := range groupList {
|
|
|
- if v, ok := groupInvoiceMap[groupId]; ok {
|
|
|
+ for _, group := range groupList {
|
|
|
+ if v, ok := groupInvoiceMap[group.GroupId]; ok {
|
|
|
rate := v / accumulate
|
|
|
mulNum := decimal.NewFromFloat(100)
|
|
|
newRate := decimal.NewFromFloat(rate)
|
|
@@ -1171,11 +1171,11 @@ func (this *SellerController) GroupInvoiceListV2(c *gin.Context) {
|
|
|
amuont, _ := strconv.ParseFloat(fmt.Sprintf("%.2f", v), 64)
|
|
|
|
|
|
groupName := ""
|
|
|
- if groupItem, ok := groupMap[groupId]; ok {
|
|
|
+ if groupItem, ok := groupMap[group.GroupId]; ok {
|
|
|
groupName = groupItem.GroupName
|
|
|
}
|
|
|
list = append(list, &fms.CensusSellerGroupInvoiceItem{
|
|
|
- GroupId: groupId,
|
|
|
+ GroupId: group.GroupId,
|
|
|
GroupName: groupName,
|
|
|
InvoiceAmount: amuont,
|
|
|
GroupRate: finalRate,
|