From 415fbcb1c7866b68259beed9b06c390d77cb1f4b Mon Sep 17 00:00:00 2001
From: huangjiajun <582604932@qq.com>
Date: Wed, 3 Jul 2024 11:52:31 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/svc/svc_comm_deal_commission.go     | 3 +++
 consume/md/md.go                        | 1 +
 consume/zhios_relate_reward_exchange.go | 1 +
 3 files changed, 5 insertions(+)

diff --git a/app/svc/svc_comm_deal_commission.go b/app/svc/svc_comm_deal_commission.go
index f2255d1..c2e03ab 100644
--- a/app/svc/svc_comm_deal_commission.go
+++ b/app/svc/svc_comm_deal_commission.go
@@ -140,6 +140,9 @@ func CommSettleDone(eg *xorm.Engine, pvd string, oid int64, masterId string, map
 	if set != nil {
 		appName = set.Val
 	}
+	if mapData["pvd_oid"] != "" {
+		oid = utils.StrToInt64(mapData["pvd_oid"])
+	}
 	for _, item := range ol {
 		if mapData["reward_type"] == "2" && item.Level == 0 {
 			continue
diff --git a/consume/md/md.go b/consume/md/md.go
index 12cbbf1..c05d568 100644
--- a/consume/md/md.go
+++ b/consume/md/md.go
@@ -21,6 +21,7 @@ type ZhiosTaskReward struct {
 	RewardType  string `json:"reward_type"`
 	PlanType    string `json:"plan_type"`
 	Provider    string `json:"provider"`
+	PvdOid      string `json:"pvd_oid"`
 }
 type AcquisitionCfg struct {
 	Id                string `json:"id"`
diff --git a/consume/zhios_relate_reward_exchange.go b/consume/zhios_relate_reward_exchange.go
index f424a41..79b3e76 100644
--- a/consume/zhios_relate_reward_exchange.go
+++ b/consume/zhios_relate_reward_exchange.go
@@ -93,6 +93,7 @@ func handleZhiosRelateRewardExchange(msg []byte) error {
 		"title":        title,
 		"device_model": canalMsg.DeviceModel,
 		"reward_type":  canalMsg.RewardType,
+		"pvd_oid":      canalMsg.PvdOid,
 	}
 	svc.CommGetLvUser(eg, CommissionParam, utils.StrToInt64(canalMsg.Oid), mid, mapData)
 	return nil