DengBiao
10 months ago
2 changed files with 5 additions and 5 deletions
Unified View
Diff Options
-
+3 -3app/customer/md/md_order.go
-
+2 -2app/customer/svc/order/svc_central_kitchen_for_school_order.go
+ 3
- 3
app/customer/md/md_order.go
View File
| @@ -71,9 +71,9 @@ type CentralKitchenForSchoolMyReserveListResp struct { | |||||
| } | } | ||||
| type CentralKitchenForSchoolMyReserveListRespList struct { | type CentralKitchenForSchoolMyReserveListRespList struct { | ||||
| Month int `json:"month" label:"月份"` | |||||
| TotalAmount float64 `json:"total_amount" label:"总金额"` | |||||
| RefundTotalAmount float64 `json:"refund_total_amount" label:"退款总金额"` | |||||
| Month int `json:"month" label:"月份"` | |||||
| TotalAmount string `json:"total_amount" label:"总金额"` | |||||
| RefundTotalAmount string `json:"refund_total_amount" label:"退款总金额"` | |||||
| } | } | ||||
| type SelfSupportForSchoolOrderListReq struct { | type SelfSupportForSchoolOrderListReq struct { | ||||
+ 2
- 2
app/customer/svc/order/svc_central_kitchen_for_school_order.go
View File
| @@ -286,10 +286,10 @@ func CentralKitchenForSchoolMyReserveList(userIdentityId int, date, startDate, e | |||||
| dateMap[tmpDateMonth] = &md.CentralKitchenForSchoolMyReserveListRespList{} | dateMap[tmpDateMonth] = &md.CentralKitchenForSchoolMyReserveListRespList{} | ||||
| } | } | ||||
| dateMap[tmpDateMonth].Month = tmpDateMonth | dateMap[tmpDateMonth].Month = tmpDateMonth | ||||
| dateMap[tmpDateMonth].TotalAmount += utils.StrToFloat64(v.Amount) | |||||
| dateMap[tmpDateMonth].TotalAmount = utils.Float64ToStr(utils.StrToFloat64(dateMap[tmpDateMonth].TotalAmount) + utils.StrToFloat64(v.Amount)) | |||||
| totalAmount += utils.StrToFloat64(v.Amount) | totalAmount += utils.StrToFloat64(v.Amount) | ||||
| if v.State == enum.CentralKitchenForSchoolUserWithDayStateForCancel { | if v.State == enum.CentralKitchenForSchoolUserWithDayStateForCancel { | ||||
| dateMap[tmpDateMonth].RefundTotalAmount += utils.StrToFloat64(v.Amount) | |||||
| dateMap[tmpDateMonth].RefundTotalAmount = utils.Float64ToStr(utils.StrToFloat64(dateMap[tmpDateMonth].RefundTotalAmount) + utils.StrToFloat64(v.Amount)) | |||||
| } | } | ||||
| } | } | ||||