DengBiao
8 months ago
1 changed files with 2 additions and 2 deletions
Unified View
Diff Options
+ 2
- 2
app/admin/svc/svc_data_statisstics.go
View File
| @@ -1563,7 +1563,7 @@ func CentralKitchenForSchoolDataStatisticsExport(req md.CentralKitchenForSchoolD | |||||
| sess.And("central_kitchen_for_school_user_refund_day.create_at >= ?", req.StartDate) | sess.And("central_kitchen_for_school_user_refund_day.create_at >= ?", req.StartDate) | ||||
| } | } | ||||
| if req.EndDate != "" { | if req.EndDate != "" { | ||||
| sess.And("central_kitchen_for_school_user_refund_day.create_at <= ?", req.EndDate) | |||||
| sess.And("central_kitchen_for_school_user_refund_day.pay_at <= ?", req.EndDate) | |||||
| } | } | ||||
| if len(req.MealKindList) > 0 { | if len(req.MealKindList) > 0 { | ||||
| sess.In("central_kitchen_for_school_user_with_day.kind", req.MealKindList) | sess.In("central_kitchen_for_school_user_with_day.kind", req.MealKindList) | ||||
| @@ -1794,7 +1794,7 @@ func CentralKitchenForSchoolDataStatisticsExport(req md.CentralKitchenForSchoolD | |||||
| } | } | ||||
| } | } | ||||
| realityAmount := utils.StrToFloat64(income) - utils.StrToFloat64(refund) | realityAmount := utils.StrToFloat64(income) - utils.StrToFloat64(refund) | ||||
| rateFee := realityAmount * 0.0002 | |||||
| rateFee := realityAmount * 0.002 | |||||
| xlsx.SetSheetRow("Sheet1", "A"+strconv.Itoa(j), &[]interface{}{v.Name, income, refund, realityAmount, rateFee}) | xlsx.SetSheetRow("Sheet1", "A"+strconv.Itoa(j), &[]interface{}{v.Name, income, refund, realityAmount, rateFee}) | ||||
| incomeTotal += utils.StrToFloat64(income) | incomeTotal += utils.StrToFloat64(income) | ||||
| refundTotal += utils.StrToFloat64(refund) | refundTotal += utils.StrToFloat64(refund) | ||||