spring пре 3 година
родитељ
комит
f8e25f6cab
2 измењених фајлова са 14 додато и 10 уклоњено
  1. 8 6
      handler/enterprice_create.go
  2. 6 4
      service/enterprise_create.go

+ 8 - 6
handler/enterprice_create.go

@@ -1,9 +1,11 @@
 package handler
 package handler
 
 
 import (
 import (
-	"fmt"
+	"github.com/sirupsen/logrus"
+	"youngee_b_api/consts"
 	"youngee_b_api/model/http_model"
 	"youngee_b_api/model/http_model"
 	"youngee_b_api/service"
 	"youngee_b_api/service"
+	"youngee_b_api/util"
 
 
 	"github.com/gin-gonic/gin"
 	"github.com/gin-gonic/gin"
 )
 )
@@ -42,11 +44,11 @@ func (h *CreateEnterpriseHandler) run() {
 	//若正确,创建企业用户
 	//若正确,创建企业用户
 	data := http_model.CreateEnterpriseRequest{}
 	data := http_model.CreateEnterpriseRequest{}
 	data = *h.req
 	data = *h.req
-	res := service.CreateEnterprise.CreateEnterpriseUser(h.ctx, data)
-	if res != nil {
-		fmt.Printf("%+v\n", res)
-	} else {
-		fmt.Printf("error\n")
+	res, err := service.CreateEnterprise.CreateEnterpriseUser(h.ctx, data)
+	if err != nil {
+		logrus.Errorf("[CreateEnterpriseHandler] call CreateEnterpriseUser err:%+v\n", err)
+		util.HandlerPackErrorResp(h.resp, consts.ErrorInternal)
+		return
 	}
 	}
 	h.resp.Data = res
 	h.resp.Data = res
 }
 }

+ 6 - 4
service/enterprise_create.go

@@ -13,18 +13,20 @@ var CreateEnterprise *createEnterprise
 type createEnterprise struct {
 type createEnterprise struct {
 }
 }
 
 
-func (*createEnterprise) CreateEnterpriseUser(ctx context.Context, newEnterprise http_model.CreateEnterpriseRequest) *http_model.CreateEnterpriseData {
+func (*createEnterprise) CreateEnterpriseUser(ctx context.Context, newEnterprise http_model.CreateEnterpriseRequest) (*http_model.CreateEnterpriseData, error) {
 	userId, err := db.CreateEnterpriseUser(ctx, newEnterprise)
 	userId, err := db.CreateEnterpriseUser(ctx, newEnterprise)
 	if err != nil {
 	if err != nil {
 		log.Infof("[CreateEnterpriseUser] fail,err:%+v", err)
 		log.Infof("[CreateEnterpriseUser] fail,err:%+v", err)
-		return nil
+		return nil, err
 	} else {
 	} else {
 		newEnterprise.UserId = int(userId.UserID)
 		newEnterprise.UserId = int(userId.UserID)
 		res, err := db.CreateEnterprise(ctx, newEnterprise)
 		res, err := db.CreateEnterprise(ctx, newEnterprise)
 		if err != nil {
 		if err != nil {
 			log.Infof("[CreateEnterpriseUser] fail,err:%+v", err)
 			log.Infof("[CreateEnterpriseUser] fail,err:%+v", err)
-			return nil
+			return nil, err
 		}
 		}
-		return res
+		return res, nil
 	}
 	}
 }
 }
+
+// build packgorm httpreqest -> gorm model