diff --git a/app/svc/svc_order_track_save_create.go b/app/svc/svc_order_track_save_create.go index a517db2..f0460a2 100644 --- a/app/svc/svc_order_track_save_create.go +++ b/app/svc/svc_order_track_save_create.go @@ -9,6 +9,7 @@ import ( "code.fnuoos.com/go_rely_warehouse/zyos_go_mq.git/rabbit" "code.fnuoos.com/go_rely_warehouse/zyos_go_o2o_business.git/o2o" "code.fnuoos.com/go_rely_warehouse/zyos_go_order_relate_rule.git/lib/comm_plan" + "code.fnuoos.com/go_rely_warehouse/zyos_model.git/src/implement" "fmt" "github.com/tidwall/gjson" "strings" @@ -326,8 +327,12 @@ func OrderSaveCreate(eg *xorm.Engine, pvd string, ordData *[]md.OrderInfo, opts } commissionReqList = append(commissionReqList, req) if secondOpts[req.Provider] != nil && opts[req.Provider].PlanCommissionId > 0 { - //TODO 待确认 req.ServiceUid = "" + NewServiceAwardDividendRelationDb := implement.NewServiceAwardDividendRelationDb(eg) + relation, _ := NewServiceAwardDividendRelationDb.GetServiceAwardDividendRelationByUid(uid) + if relation != nil { + req.ServiceUid = utils.IntToStr(relation.BindUid) + } if utils.StrToInt(req.ServiceUid) > 0 { secondCommissionReqList = append(secondCommissionReqList, req) } diff --git a/app/svc/svc_order_track_save_create_update.go b/app/svc/svc_order_track_save_create_update.go index 29b1cb5..6536a38 100644 --- a/app/svc/svc_order_track_save_create_update.go +++ b/app/svc/svc_order_track_save_create_update.go @@ -8,6 +8,7 @@ import ( "code.fnuoos.com/go_rely_warehouse/zyos_go_mq.git/rabbit" "code.fnuoos.com/go_rely_warehouse/zyos_go_o2o_business.git/o2o" "code.fnuoos.com/go_rely_warehouse/zyos_go_order_relate_rule.git/lib/comm_plan" + "code.fnuoos.com/go_rely_warehouse/zyos_model.git/src/implement" "fmt" "github.com/tidwall/gjson" "strings" @@ -649,8 +650,12 @@ func OrderSaveCreateUpdate(eg *xorm.Engine, pvd string, ordData *[]md.OrderInfo, } commissionReqList = append(commissionReqList, req) if secondOpts[req.Provider] != nil && opts[req.Provider].PlanCommissionId > 0 { - //TODO 待确认 req.ServiceUid = "" + NewServiceAwardDividendRelationDb := implement.NewServiceAwardDividendRelationDb(eg) + relation, _ := NewServiceAwardDividendRelationDb.GetServiceAwardDividendRelationByUid(uid) + if relation != nil { + req.ServiceUid = utils.IntToStr(relation.BindUid) + } if utils.StrToInt(req.ServiceUid) > 0 { secondCommissionReqList = append(secondCommissionReqList, req) } diff --git a/go.mod b/go.mod index 679a5a8..d9cc8f5 100644 --- a/go.mod +++ b/go.mod @@ -46,6 +46,7 @@ require ( ) require ( + code.fnuoos.com/go_rely_warehouse/zyos_model.git v0.0.4-0.20240807015025-ff74422d58a8 // indirect filippo.io/edwards25519 v1.1.0 // indirect github.com/KyleBanks/depth v1.2.1 // indirect github.com/PuerkitoBio/goquery v1.9.2 // indirect