@@ -9,6 +9,7 @@ import ( | |||||
"code.fnuoos.com/go_rely_warehouse/zyos_go_mq.git/rabbit" | "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_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_go_order_relate_rule.git/lib/comm_plan" | ||||
"code.fnuoos.com/go_rely_warehouse/zyos_model.git/src/implement" | |||||
"fmt" | "fmt" | ||||
"github.com/tidwall/gjson" | "github.com/tidwall/gjson" | ||||
"strings" | "strings" | ||||
@@ -326,8 +327,12 @@ func OrderSaveCreate(eg *xorm.Engine, pvd string, ordData *[]md.OrderInfo, opts | |||||
} | } | ||||
commissionReqList = append(commissionReqList, req) | commissionReqList = append(commissionReqList, req) | ||||
if secondOpts[req.Provider] != nil && opts[req.Provider].PlanCommissionId > 0 { | if secondOpts[req.Provider] != nil && opts[req.Provider].PlanCommissionId > 0 { | ||||
//TODO 待确认 | |||||
req.ServiceUid = "" | 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 { | if utils.StrToInt(req.ServiceUid) > 0 { | ||||
secondCommissionReqList = append(secondCommissionReqList, req) | secondCommissionReqList = append(secondCommissionReqList, req) | ||||
} | } | ||||
@@ -8,6 +8,7 @@ import ( | |||||
"code.fnuoos.com/go_rely_warehouse/zyos_go_mq.git/rabbit" | "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_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_go_order_relate_rule.git/lib/comm_plan" | ||||
"code.fnuoos.com/go_rely_warehouse/zyos_model.git/src/implement" | |||||
"fmt" | "fmt" | ||||
"github.com/tidwall/gjson" | "github.com/tidwall/gjson" | ||||
"strings" | "strings" | ||||
@@ -649,8 +650,12 @@ func OrderSaveCreateUpdate(eg *xorm.Engine, pvd string, ordData *[]md.OrderInfo, | |||||
} | } | ||||
commissionReqList = append(commissionReqList, req) | commissionReqList = append(commissionReqList, req) | ||||
if secondOpts[req.Provider] != nil && opts[req.Provider].PlanCommissionId > 0 { | if secondOpts[req.Provider] != nil && opts[req.Provider].PlanCommissionId > 0 { | ||||
//TODO 待确认 | |||||
req.ServiceUid = "" | 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 { | if utils.StrToInt(req.ServiceUid) > 0 { | ||||
secondCommissionReqList = append(secondCommissionReqList, req) | secondCommissionReqList = append(secondCommissionReqList, req) | ||||
} | } | ||||
@@ -46,6 +46,7 @@ require ( | |||||
) | ) | ||||
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 | filippo.io/edwards25519 v1.1.0 // indirect | ||||
github.com/KyleBanks/depth v1.2.1 // indirect | github.com/KyleBanks/depth v1.2.1 // indirect | ||||
github.com/PuerkitoBio/goquery v1.9.2 // indirect | github.com/PuerkitoBio/goquery v1.9.2 // indirect | ||||