diff --git a/business/jxstore/cms/user2.go b/business/jxstore/cms/user2.go index 7778b79fd..7601e08dd 100644 --- a/business/jxstore/cms/user2.go +++ b/business/jxstore/cms/user2.go @@ -1090,3 +1090,22 @@ func GetMyJxStoreList(ctx *jxcontext.Context, mobile string) (storesInfo interfa } return storesInfo, err } + +func CreateUserAgreement(ctx *jxcontext.Context, userAgrs []*model.UserAgreement) (err error) { + var ( + db = dao.GetDB() + ) + for _, v := range userAgrs { + dao.WrapAddIDCULDEntity(v, ctx.GetUserName()) + } + err = dao.CreateMultiEntities(db, userAgrs) + return err +} + +func GetUserAgreement(ctx *jxcontext.Context, name, idNumber, bankNumber, mobile string) (userAgrs []*model.UserAgreement, err error) { + var ( + db = dao.GetDB() + ) + userAgrs, err = dao.GetUserAgreement(db, name, idNumber, bankNumber, mobile) + return userAgrs, err +} diff --git a/business/model/dao/dao_user.go b/business/model/dao/dao_user.go index dd4102622..4e73d14ca 100644 --- a/business/model/dao/dao_user.go +++ b/business/model/dao/dao_user.go @@ -212,3 +212,30 @@ func ClearUserDeliveryAddressDefault(db *DaoDB, userID string, defAddressID int) _, err = ExecuteSQL(db, sql, sqlParams...) return err } + +func GetUserAgreement(db *DaoDB, name, idNumber, bankNumber, mobile string) (userAgrs []*model.UserAgreement, err error) { + sql := ` + SELECT * + FROM user_agreement + WHERE deleted_at = ? + ` + sqlParams := []interface{}{utils.DefaultTimeValue} + if name != "" { + sql += " AND name like ?" + sqlParams = append(sqlParams, "%"+name+"%") + } + if idNumber != "" { + sql += " AND idNumber like ?" + sqlParams = append(sqlParams, "%"+idNumber+"%") + } + if bankNumber != "" { + sql += " AND bankNumber like ?" + sqlParams = append(sqlParams, "%"+bankNumber+"%") + } + if mobile != "" { + sql += " AND mobile like ?" + sqlParams = append(sqlParams, "%"+mobile+"%") + } + err = GetRows(db, &userAgrs, sql, sqlParams) + return userAgrs, err +} diff --git a/business/model/user.go b/business/model/user.go index f1ad3627b..f7b4958e1 100644 --- a/business/model/user.go +++ b/business/model/user.go @@ -167,3 +167,11 @@ func (*UserCartItem) TableUnique() [][]string { []string{"UserID", "StoreID", "SkuID", "ActID"}, } } + +type UserAgreement struct { + ModelIDCULD + Name string `orm:"size(32);index" json:"name"` // 外部显示标识(当前可以重复) + Mobile string `orm:"size(32);null" json:"mobile"` + IDNumber string `orm:"column(id_number);size(20);null" json:"idNumber"` + BankNumber string `orm:"size(32);null" json:"bankNumber"` +} diff --git a/controllers/cms_user2.go b/controllers/cms_user2.go index a7a55f81c..a52dbf392 100644 --- a/controllers/cms_user2.go +++ b/controllers/cms_user2.go @@ -499,3 +499,37 @@ func (c *User2Controller) GetMyJxStoreList() { return retVal, "", err }) } + +// @Title 插入用户协议表 +// @Description 插入用户协议表 +// @Param token header string false "认证token" +// @Param payload formData string true "格式数据,UserAgreement" +// @Success 200 {object} controllers.CallResult +// @Failure 200 {object} controllers.CallResult +// @router /CreateUserAgreement [post] +func (c *User2Controller) CreateUserAgreement() { + c.callCreateUserAgreement(func(params *tUser2CreateUserAgreementParams) (retVal interface{}, errCode string, err error) { + var userAgrs []*model.UserAgreement + if err = jxutils.Strings2Objs(params.Payload, &userAgrs); err == nil { + cms.CreateUserAgreement(params.Ctx, userAgrs) + } + return retVal, "", err + }) +} + +// @Title 查询用户协议表 +// @Description 查询用户协议表 +// @Param token header string false "认证token" +// @Param name query string false "名字" +// @Param idNumber query string false "身份证号" +// @Param bankNumber query string false "银行卡号" +// @Param mobile query string false "电话" +// @Success 200 {object} controllers.CallResult +// @Failure 200 {object} controllers.CallResult +// @router /GetUserAgreement [get] +func (c *User2Controller) GetUserAgreement() { + c.callGetUserAgreement(func(params *tUser2GetUserAgreementParams) (retVal interface{}, errCode string, err error) { + cms.GetUserAgreement(params.Ctx, params.Name, params.IdNumber, params.BankNumber, params.Mobile) + return retVal, "", err + }) +} diff --git a/routers/commentsRouter_controllers.go b/routers/commentsRouter_controllers.go index f03a8aefa..0e14fee14 100644 --- a/routers/commentsRouter_controllers.go +++ b/routers/commentsRouter_controllers.go @@ -2466,6 +2466,15 @@ func init() { Filters: nil, Params: nil}) + beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:User2Controller"] = append(beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:User2Controller"], + beego.ControllerComments{ + Method: "CreateUserAgreement", + Router: `/CreateUserAgreement`, + AllowHTTPMethods: []string{"post"}, + MethodParams: param.Make(), + Filters: nil, + Params: nil}) + beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:User2Controller"] = append(beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:User2Controller"], beego.ControllerComments{ Method: "DeleteMyDeliveryAddress", @@ -2574,6 +2583,15 @@ func init() { Filters: nil, Params: nil}) + beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:User2Controller"] = append(beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:User2Controller"], + beego.ControllerComments{ + Method: "GetUserAgreement", + Router: `/GetUserAgreement`, + AllowHTTPMethods: []string{"get"}, + MethodParams: param.Make(), + Filters: nil, + Params: nil}) + beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:User2Controller"] = append(beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:User2Controller"], beego.ControllerComments{ Method: "GetUserRoleList",