瀏覽代碼

提交model

icole 4 年之前
父節點
當前提交
9da68660d1

+ 10 - 6
i2bill.api

@@ -96,6 +96,12 @@ type infoResponse {
 	IsJzMk   bool   `json:"isJzMk"`
 }
 
+type Response {
+	Code int         `json:"code"`
+	Msg  string      `json:"msg"`
+	Data interface{} `json:"data"`
+}
+
 service i2bill-api {
 	@handler Hello
 	get /api/hello
@@ -109,15 +115,13 @@ service i2bill-api {
 service i2bill-api {
 	@handler JzQrCode
 	get /api/user/share/jzQrcode returns(jzQrcodeResponse)
-
+	
 	@handler BindMobile
 	post /api/user/bindMobile(bindMobileRequest) returns(bindMobileResponse)
-
+	
 	@handler GetUser
 	get /api/user/info returns(infoResponse)
-	@handler GetUser // TODO: set handler name and delete this comment
-	get /api/users/id/:userId(request) returns(response)
-
+	
 	@handler  PartTimeUserAd
-	post /api/v1/part_time_user/add (partTimeUserAddRequest) returns(response)
+	post /api/v1/part_time_user/add (partTimeUserAddRequest) returns(Response)
 }

+ 29 - 0
internal/handler/parttimeuseradhandler.go

@@ -0,0 +1,29 @@
+package handler
+
+import (
+	"net/http"
+
+	"git.i2edu.net/i2/i2-bill-api/internal/logic"
+	"git.i2edu.net/i2/i2-bill-api/internal/svc"
+	"git.i2edu.net/i2/i2-bill-api/internal/types"
+
+	"github.com/tal-tech/go-zero/rest/httpx"
+)
+
+func PartTimeUserAdHandler(ctx *svc.ServiceContext) http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
+		var req types.PartTimeUserAddRequest
+		if err := httpx.Parse(r, &req); err != nil {
+			httpx.Error(w, err)
+			return
+		}
+
+		l := logic.NewPartTimeUserAdLogic(r.Context(), ctx)
+		resp, err := l.PartTimeUserAd(req)
+		if err != nil {
+			httpx.Error(w, err)
+		} else {
+			httpx.OkJson(w, resp)
+		}
+	}
+}

+ 1 - 1
internal/handler/routes.go

@@ -6,7 +6,7 @@ import (
 
 	"git.i2edu.net/i2/i2-bill-api/internal/svc"
 
-	"github.com/tal-tech/go-zero/rest"
+	"git.i2edu.net/i2/go-zero/rest"
 )
 
 func RegisterHandlers(engine *rest.Server, serverCtx *svc.ServiceContext) {

+ 11 - 0
internal/logic/logic_test.go

@@ -0,0 +1,11 @@
+package logic
+
+import (
+	"fmt"
+	"testing"
+)
+
+func TestCreateJWT(t *testing.T) {
+	l := new(LoginByWeixinLogic)
+	fmt.Println(l.CreateJWT(1624415746, l.svcCtx.Config.JwtAuth.AccessSecret, nil, 1000))
+}

+ 55 - 0
internal/logic/parttimeuseradlogic.go

@@ -0,0 +1,55 @@
+package logic
+
+import (
+	"context"
+	"git.i2edu.net/i2/go-zero/core/stores/cache"
+	"git.i2edu.net/i2/i2-bill-api/model"
+	"time"
+
+	"git.i2edu.net/i2/i2-bill-api/internal/svc"
+	"git.i2edu.net/i2/i2-bill-api/internal/types"
+
+	"git.i2edu.net/i2/go-zero/core/logx"
+)
+
+type PartTimeUserAdLogic struct {
+	logx.Logger
+	ctx    context.Context
+	svcCtx *svc.ServiceContext
+}
+
+func NewPartTimeUserAdLogic(ctx context.Context, svcCtx *svc.ServiceContext) PartTimeUserAdLogic {
+	return PartTimeUserAdLogic{
+		Logger: logx.WithContext(ctx),
+		ctx:    ctx,
+		svcCtx: svcCtx,
+	}
+}
+
+func (l *PartTimeUserAdLogic) PartTimeUserAd(req types.PartTimeUserAddRequest) (types.Response, error) {
+	// todo: add your logic here and delete this line
+	userInfo := new(model.User)
+	var bean = model.I2billMktPartTimeUser{
+		CreateTime:     time.Now(),
+		LastUpdateTime: time.Now(),
+		DelFlag:        0,
+		MkId:           req.MkId,
+		CreateBy:       1,
+		CheckState:     54,
+		CheckDesc:      "",
+		CityId:         req.CityId,
+		IponeNumber:    "",
+		Sex:            req.Sex,
+		Target:         0,
+		UserId:         userInfo.Id,
+		LastUpdateBy:   0,
+		Name:           req.Name,
+	}
+	res, err := model.NewI2billMktPartTimeUserModel(l.svcCtx.SqlConn, cache.CacheConf{}).Insert(bean)
+	var msg string
+	if err != nil {
+		msg = err.Error()
+	}
+
+	return types.Response{Code: 200, Msg: msg, Data: res}, nil
+}

+ 12 - 6
internal/types/types.go

@@ -69,6 +69,14 @@ type BindMobileResponse struct {
 	Id int64 `json:"id"`
 }
 
+type PartTimeUserAddRequest struct {
+	Name        string `json:"name"`
+	IponeNumber string `json:"ipone_number"`
+	Sex         int64  `json:"sex"`
+	MkId        string `json:"mk_id"`
+	CityId      int64  `json:"city_id"` // 城市
+}
+
 type InfoResponse struct {
 	ID       int64  `json:"id"`
 	Mobile   string `json:"mobile"`
@@ -81,10 +89,8 @@ type InfoResponse struct {
 	IsJzMk   bool   `json:"isJzMk"`
 }
 
-type PartTimeUserAddRequest struct {
-	Name        string `json:"name"`
-	IponeNumber string `json:"ipone_number"`
-	Sex         int64  `json:"sex"`
-	MkId        string `json:"mk_id"`
-	CityId      int64  `json:"city_id"` // 城市
+type Response struct {
+	Code int         `json:"code"`
+	Msg  string      `json:"msg"`
+	Data interface{} `json:"data"`
 }

+ 24 - 0
model/i2bill_mkt_part_time_user.sql

@@ -0,0 +1,24 @@
+--兼职人员表--
+DROP TABLE IF EXISTS `i2bill_mkt_part_time_user`;
+CREATE TABLE `i2bill_mkt_part_time_user`  (
+  `id` int(0) NOT NULL AUTO_INCREMENT,
+  `name` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '',
+  `ipone_number` varchar(11) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '',
+  `sex` int(0) NOT NULL  DEFAULT 0,
+  `target` int(0) NOT NULL DEFAULT 0 COMMENT '目标人数',
+  `user_id` int(0) NOT NULL DEFAULT 0 COMMENT 'user_id',
+  `mk_id` varchar(36)  NOT NULL DEFAULT '' COMMENT '所属erp mk id',
+  `city_id` int(0) NOT NULL DEFAULT 0  COMMENT '城市',
+  `check_state` int(0) NOT NULL DEFAULT 54 COMMENT '审核状态',
+  `check_desc` varchar(300) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '' COMMENT '审核失败描述',
+  `create_by`  int(0)  NOT NULL DEFAULT 0,
+  `create_time` datetime(0) NOT NULL DEFAULT '',
+  `last_update_by`  int(0)  NOT NULL DEFAULT 0,
+  `last_update_time` datetime(0) NOT NULL DEFAULT '',
+  `del_flag` int(0) NOT NULL DEFAULT 0,
+  PRIMARY KEY (`id`) USING BTREE,
+  INDEX `IDX_mkt_part_time_user_ipone_number`(`ipone_number`) USING BTREE,
+  INDEX `IDX_mkt_part_time_user_name`(`name`) USING BTREE,
+  INDEX `IDX_mkt_part_time_user_sex`(`sex`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic;
+

+ 18 - 17
model/i2billmktparttimeusermodel.go

@@ -4,6 +4,7 @@ import (
 	"database/sql"
 	"fmt"
 	"strings"
+	"time"
 
 	"git.i2edu.net/i2/go-zero/core/stores/cache"
 	"git.i2edu.net/i2/go-zero/core/stores/sqlc"
@@ -35,21 +36,21 @@ type (
 	}
 
 	I2billMktPartTimeUser struct {
-		Name           sql.NullString `db:"name"`
-		IponeNumber    sql.NullString `db:"ipone_number"`
-		Target         sql.NullInt64  `db:"target"` // 目标人数
-		DelFlag        sql.NullInt64  `db:"del_flag"`
-		Sex            sql.NullInt64  `db:"sex"`
-		UserId         sql.NullInt64  `db:"user_id"`     // user_id
-		CheckState     sql.NullInt64  `db:"check_state"` // 审核状态
-		CreateBy       sql.NullString `db:"create_by"`
-		LastUpdateTime sql.NullTime   `db:"last_update_time"`
-		Id             int64          `db:"id"`
-		MkId           sql.NullString `db:"mk_id"`      // 所属erp mk id
-		CityId         sql.NullInt64  `db:"city_id"`    // 城市
-		CheckDesc      sql.NullString `db:"check_desc"` // 审核失败描述
-		CreateTime     sql.NullTime   `db:"create_time"`
-		LastUpdateBy   sql.NullString `db:"last_update_by"`
+		CreateTime     time.Time `db:"create_time"`
+		LastUpdateTime time.Time `db:"last_update_time"`
+		DelFlag        int64     `db:"del_flag"`
+		MkId           string    `db:"mk_id"` // 所属erp mk id
+		CreateBy       int64     `db:"create_by"`
+		CheckState     int64     `db:"check_state"` // 审核状态
+		CheckDesc      string    `db:"check_desc"`  // 审核失败描述
+		CityId         int64     `db:"city_id"`     // 城市
+		IponeNumber    string    `db:"ipone_number"`
+		Sex            int64     `db:"sex"`
+		Target         int64     `db:"target"`  // 目标人数
+		UserId         int64     `db:"user_id"` // user_id
+		LastUpdateBy   int64     `db:"last_update_by"`
+		Id             int64     `db:"id"`
+		Name           string    `db:"name"`
 	}
 )
 
@@ -62,7 +63,7 @@ func NewI2billMktPartTimeUserModel(conn sqlx.SqlConn, c cache.CacheConf) I2billM
 
 func (m *defaultI2billMktPartTimeUserModel) Insert(data I2billMktPartTimeUser) (sql.Result, error) {
 	query := fmt.Sprintf("insert into %s (%s) values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)", m.table, i2billMktPartTimeUserRowsExpectAutoSet)
-	ret, err := m.ExecNoCache(query, data.Name, data.IponeNumber, data.Target, data.DelFlag, data.Sex, data.UserId, data.CheckState, data.CreateBy, data.LastUpdateTime, data.MkId, data.CityId, data.CheckDesc, data.LastUpdateBy)
+	ret, err := m.ExecNoCache(query, data.LastUpdateTime, data.DelFlag, data.MkId, data.CreateBy, data.CheckState, data.CheckDesc, data.CityId, data.IponeNumber, data.Sex, data.Target, data.UserId, data.LastUpdateBy, data.Name)
 
 	return ret, err
 }
@@ -88,7 +89,7 @@ func (m *defaultI2billMktPartTimeUserModel) Update(data I2billMktPartTimeUser) e
 	i2billMktPartTimeUserIdKey := fmt.Sprintf("%s%v", cacheI2billMktPartTimeUserIdPrefix, data.Id)
 	_, err := m.Exec(func(conn sqlx.SqlConn) (result sql.Result, err error) {
 		query := fmt.Sprintf("update %s set %s where `id` = ?", m.table, i2billMktPartTimeUserRowsWithPlaceHolder)
-		return conn.Exec(query, data.Name, data.IponeNumber, data.Target, data.DelFlag, data.Sex, data.UserId, data.CheckState, data.CreateBy, data.LastUpdateTime, data.MkId, data.CityId, data.CheckDesc, data.LastUpdateBy, data.Id)
+		return conn.Exec(query, data.LastUpdateTime, data.DelFlag, data.MkId, data.CreateBy, data.CheckState, data.CheckDesc, data.CityId, data.IponeNumber, data.Sex, data.Target, data.UserId, data.LastUpdateBy, data.Name, data.Id)
 	}, i2billMktPartTimeUserIdKey)
 	return err
 }