Updata：解决冲突

internal/dao/invoiceDao.go

@@ -5,12 +5,34 @@ import (
 	"micro-bundle/internal/model"
 	"micro-bundle/pb/bundle"
 	"micro-bundle/pkg/app"
+	"strconv"
+	"time"
 )
 
 func CreateInvoice(req *bundle.CreateInvoiceReq) (res *bundle.CreateInvoiceResp, err error) {
 	fmt.Println("创建发票信息：url=%s,type=%d,no=%s,status=%d,remark=%s", req.InvoiceUrl, req.InvoiceType, req.InvoiceNo, req.PaperInvocieStatus, req.Remark)
 	res = new(bundle.CreateInvoiceResp)
-	err = app.ModuleClients.BundleDB.Model(&model.Invoice{}).Create(&req).Error
+	userId, err := strconv.Atoi(req.UserId)
+	if err != nil {
+		return nil, err
+	}
+	applyTime, err := time.Parse(req.ApplyTime, time.DateTime)
+	if err != nil {
+		return nil, err
+	}
+	inv := &model.Invoice{
+		UserId:             userId,
+		UserNum:            req.UserNum,
+		UserName:           req.UserName,
+		OrderNo:            req.OrderNo,
+		ApplyTime:          applyTime,
+		InvoiceType:        int(req.InvoiceType),
+		InvoiceNo:          req.InvoiceNo,
+		InvoiceUrl:         req.InvoiceUrl,
+		PaperInvocieStatus: int(req.PaperInvocieStatus),
+		Remark:             req.Remark,
+	}
+	err = app.ModuleClients.BundleDB.Model(&model.Invoice{}).Create(inv).Error
 	if err != nil {
 		return nil, err
 	}
@@ -19,7 +41,28 @@ func CreateInvoice(req *bundle.CreateInvoiceReq) (res *bundle.CreateInvoiceResp,
 
 func CreatePaperInvoiceAddress(req *bundle.CreatePaperInvoiceAddressReq) (res *bundle.CreatePaperInvoiceAddressResp, err error) {
 	res = new(bundle.CreatePaperInvoiceAddressResp)
-	err = app.ModuleClients.BundleDB.Model(&model.PaperInvoiceAddress{}).Create(&req).Error
+	userId, err := strconv.Atoi(req.UserId)
+	if err != nil {
+		return nil, err
+	}
+	applyTime, err := time.Parse(req.ApplyTime, time.DateTime)
+	if err != nil {
+		return nil, err
+	}
+	pia := &model.PaperInvoiceAddress{
+		UserId:      userId,
+		ApplyTime:   applyTime,
+		OrderNo:     req.OrderNo,
+		InvoiceNo:   req.InvoiceNo,
+		Name:        req.Name,
+		TelAreaCode: req.TelAreaCode,
+		Phone:       req.Phone,
+		PostalCode:  req.PostalCode,
+		Country:     req.Country,
+		Address:     req.Address,
+		Remark:      req.Remark,
+	}
+	err = app.ModuleClients.BundleDB.Model(&model.PaperInvoiceAddress{}).Create(pia).Error
 	if err != nil {
 		return nil, err
 	}

pb/bundle.proto

@@ -2157,13 +2157,14 @@ message CreatePaperInvoiceAddressReq{
   string userId = 1;
   string orderNo = 2;
   string invoiceNo = 3;
-  string name = 4;
-  string telAreaCode = 5;
-  string phone = 6;
-  string postalCode = 7;
-  string country = 8;
-  string address = 9;
-  string remark = 10;
+  string applyTime = 4;
+  string name = 5;
+  string telAreaCode = 6;
+  string phone = 7;
+  string postalCode = 8;
+  string country = 9;
+  string address = 10;
+  string remark = 11;
 }
 
 message CreatePaperInvoiceAddressResp{