diff --git a/app/store/svc/svc_task_order.go b/app/store/svc/svc_task_order.go index 1d0afc7..459fdc5 100644 --- a/app/store/svc/svc_task_order.go +++ b/app/store/svc/svc_task_order.go @@ -57,10 +57,11 @@ func TaskWaitAuditOrder(c *gin.Context) { for _, v := range data { var detail = make([]string, 0) json.Unmarshal([]byte(v.CampTaskUserPromotionOrder.Img), &detail) + amount, _ := svc.MasterDb(c).Where("extend_lv=0 and oid=?", v.CampTaskUserPromotionOrder.Oid).Sum(&models.CampTaskUserPromotionOrderRelate{}, "amount") tmp := map[string]interface{}{ "oid": utils.Int64ToStr(v.CampTaskUserPromotionOrder.Oid), "id": utils.IntToStr(v.CampTaskUserPromotionOrder.Id), - "user_commission": "", + "user_commission": utils.Float64ToStr(amount), "user_level": v.UserLevel.LevelName, "create_time": v.CampTaskUserPromotionOrder.CreateTime.Format("2006-01-02 15:04:05"), "price": v.CampTaskUserPromotionOrder.Payment, @@ -164,10 +165,11 @@ func TaskWaitSettleOrder(c *gin.Context) { for _, v := range data { var detail = make([]string, 0) json.Unmarshal([]byte(v.CampTaskUserPromotionOrder.Img), &detail) + amount, _ := svc.MasterDb(c).Where("extend_lv=0 and oid=?", v.CampTaskUserPromotionOrder.Oid).Sum(&models.CampTaskUserPromotionOrderRelate{}, "amount") tmp := map[string]interface{}{ "oid": utils.Int64ToStr(v.CampTaskUserPromotionOrder.Oid), "id": utils.IntToStr(v.CampTaskUserPromotionOrder.Id), - "user_commission": "", + "user_commission": utils.Float64ToStr(amount), "user_level": v.UserLevel.LevelName, "create_time": v.CampTaskUserPromotionOrder.CreateTime.Format("2006-01-02 15:04:05"), "price": v.CampTaskUserPromotionOrder.Payment,