From 3a6c57ddb78c8ecb3f79784efb0d20f2e985ef48 Mon Sep 17 00:00:00 2001
From: huangjiajun <582604932@qq.com>
Date: Wed, 17 Sep 2025 15:45:19 +0800
Subject: [PATCH] 1

---
 app/custom/svc/svc_my_task.go | 7 ++++++-
 app/custom/svc/svc_order.go   | 6 ++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/app/custom/svc/svc_my_task.go b/app/custom/svc/svc_my_task.go
index f9e2226..97a453b 100644
--- a/app/custom/svc/svc_my_task.go
+++ b/app/custom/svc/svc_my_task.go
@@ -8,6 +8,7 @@ import (
 	"code.fnuoos.com/go_rely_warehouse/zyos_go_order_relate_rule.git/lib/comm_plan"
 	md2 "code.fnuoos.com/go_rely_warehouse/zyos_go_order_relate_rule.git/md"
 	svc2 "code.fnuoos.com/go_rely_warehouse/zyos_go_order_relate_rule.git/svc"
+	"code.fnuoos.com/go_rely_warehouse/zyos_model.git/src/models"
 	"fmt"
 	"github.com/gin-gonic/gin"
 	"time"
@@ -103,7 +104,11 @@ func TaskMyTotal(c *gin.Context) {
 		return
 	}
 	user := svc.GetUser(c)
-
+	if args["task_id"] != "" {
+		var taskQrcode models.CampTaskUserPromotionQrcode
+		svc.MasterDb(c).Where("id=?", args["task_id"]).Get(&taskQrcode)
+		args["task_id"] = utils.IntToStr(taskQrcode.TaskId)
+	}
 	sql := `SELECT COUNT(*) as count,SUM(ctupor.amount) as amount FROM camp_task_user_promotion_order_relate ctupor 
 LEFT JOIN camp_task_user_promotion_order ctupo on ctupo.oid=ctupor.oid
 WHERE ctupor.uid=%d and ctupo.task_id=%s and ctupo.settle_time like '%s'`
diff --git a/app/custom/svc/svc_order.go b/app/custom/svc/svc_order.go
index 5bc89dc..d0b0c1f 100644
--- a/app/custom/svc/svc_order.go
+++ b/app/custom/svc/svc_order.go
@@ -83,6 +83,9 @@ func TaskQrcodeOrder(c *gin.Context) {
 		where += " and qrcode_id=" + args["qrcode_id"]
 	}
 	if args["task_id"] != "" {
+		var taskQrcode models.CampTaskUserPromotionQrcode
+		svc.MasterDb(c).Where("id=?", args["task_id"]).Get(&taskQrcode)
+		args["task_id"] = utils.IntToStr(taskQrcode.TaskId)
 		where += " and task_id=" + args["task_id"]
 	}
 	if args["state"] != "" {
@@ -279,6 +282,9 @@ func TaskQrcodeList(c *gin.Context) {
 	p := utils.StrToInt(args["p"])
 	sess := svc.MasterDb(c).Where("uid=?", user.Info.Uid)
 	if args["task_id"] != "" {
+		var taskQrcode models.CampTaskUserPromotionQrcode
+		svc.MasterDb(c).Where("id=?", args["task_id"]).Get(&taskQrcode)
+		args["task_id"] = utils.IntToStr(taskQrcode.TaskId)
 		sess.And("task_id=?", args["task_id"])
 	}
 	sess.Limit(size, (p-1)*size).OrderBy("id desc").Find(&data)