diff --git a/pkg/service/bundle/bundleOrder.go b/pkg/service/bundle/bundleOrder.go index 351dc82..b79c1a1 100644 --- a/pkg/service/bundle/bundleOrder.go +++ b/pkg/service/bundle/bundleOrder.go @@ -246,7 +246,7 @@ func CreateBundleOrderSignature(c *gin.Context) { } // 组装订单信息 - req = logic.BuildOrderRequest(&req, userInfo, bundleDetail, addRecords, addTotalPrice, lastContractNo, signContract) + req = logic.BuildOrderRequest(req, userInfo, bundleDetail, addRecords, addTotalPrice, lastContractNo, signContract) // 创建订单 res, err := service.BundleProvider.CreateOrderRecord(context.Background(), &req) diff --git a/pkg/service/bundle/logic/bundleOrder.go b/pkg/service/bundle/logic/bundleOrder.go index dd56917..cb0f848 100644 --- a/pkg/service/bundle/logic/bundleOrder.go +++ b/pkg/service/bundle/logic/bundleOrder.go @@ -177,7 +177,7 @@ func buildAddRecord(addService *bundle.ValueAddServiceLang, uid string, price fl } // 组装订单请求 -func BuildOrderRequest(req *bundle.OrderCreateRecord, userInfo login.Info, +func BuildOrderRequest(req bundle.OrderCreateRecord, userInfo login.Info, bundleDetail *bundle.BundleProfileLang, addRecords []*bundle.OrderCreateAddRecord, addTotalPrice float32, lastContractNo, signContract string) bundle.OrderCreateRecord { diff --git a/pkg/service/bundle/logic/signContractV2.go b/pkg/service/bundle/logic/signContractV2.go index 0107f00..67b78f7 100644 --- a/pkg/service/bundle/logic/signContractV2.go +++ b/pkg/service/bundle/logic/signContractV2.go @@ -1,22 +1,16 @@ package logic import ( - "context" "errors" "fmt" - "fonchain-fiee/api/bundle" "fonchain-fiee/pkg/model" - "fonchain-fiee/pkg/model/login" - "fonchain-fiee/pkg/service" "fonchain-fiee/pkg/service/bundle/common" - bundleModel "fonchain-fiee/pkg/service/bundle/model" "fonchain-fiee/pkg/service/upload" "log" "os" "strconv" "time" - "github.com/gin-gonic/gin" "github.com/signintech/gopdf" "go.uber.org/zap" )