增加paybybalance路由
This commit is contained in:
@@ -7,7 +7,6 @@ import (
|
|||||||
"git.rosy.net.cn/jx-callback/business/jxutils/jxcontext"
|
"git.rosy.net.cn/jx-callback/business/jxutils/jxcontext"
|
||||||
"git.rosy.net.cn/jx-callback/business/model"
|
"git.rosy.net.cn/jx-callback/business/model"
|
||||||
"git.rosy.net.cn/jx-callback/business/model/dao"
|
"git.rosy.net.cn/jx-callback/business/model/dao"
|
||||||
"git.rosy.net.cn/jx-callback/globals"
|
|
||||||
"github.com/astaxie/beego/client/orm"
|
"github.com/astaxie/beego/client/orm"
|
||||||
"time"
|
"time"
|
||||||
)
|
)
|
||||||
@@ -170,7 +169,6 @@ func SettleUnionOrders(ctx *jxcontext.Context, vendorIDs []int) (err error) {
|
|||||||
|
|
||||||
//微信 老会员续费
|
//微信 老会员续费
|
||||||
func WXInvestMember(ctx *jxcontext.Context, memberID int, userID string) (errCode string, err error) {
|
func WXInvestMember(ctx *jxcontext.Context, memberID int, userID string) (errCode string, err error) {
|
||||||
globals.SugarLogger.Debugf("=====================微信充值会员开始")
|
|
||||||
var db = dao.GetDB()
|
var db = dao.GetDB()
|
||||||
//获取用户 当前会员信息
|
//获取用户 当前会员信息
|
||||||
userMembers, err := dao.GetUserMember(db, userID, model.MemberTypeNormal)
|
userMembers, err := dao.GetUserMember(db, userID, model.MemberTypeNormal)
|
||||||
@@ -179,7 +177,6 @@ func WXInvestMember(ctx *jxcontext.Context, memberID int, userID string) (errCod
|
|||||||
}
|
}
|
||||||
//当前状态是否是会员 续费/开通
|
//当前状态是否是会员 续费/开通
|
||||||
if len(userMembers) > 0 {
|
if len(userMembers) > 0 {
|
||||||
globals.SugarLogger.Debugf("=====================进入微信充值会员")
|
|
||||||
userMember := userMembers[0]
|
userMember := userMembers[0]
|
||||||
if memberID == model.OrderTypeMember {
|
if memberID == model.OrderTypeMember {
|
||||||
userMember.EndAt = userMember.EndAt.AddDate(0, 1, 0)
|
userMember.EndAt = userMember.EndAt.AddDate(0, 1, 0)
|
||||||
@@ -195,7 +192,6 @@ func WXInvestMember(ctx *jxcontext.Context, memberID int, userID string) (errCod
|
|||||||
MemberType: model.MemberTypeNormal,
|
MemberType: model.MemberTypeNormal,
|
||||||
MemberTypeID: memberID,
|
MemberTypeID: memberID,
|
||||||
}
|
}
|
||||||
globals.SugarLogger.Debugf("=====================进入微信新会员")
|
|
||||||
if memberID == model.OrderTypeMember {
|
if memberID == model.OrderTypeMember {
|
||||||
userMember2.EndAt = time.Now().AddDate(0, 1, 0)
|
userMember2.EndAt = time.Now().AddDate(0, 1, 0)
|
||||||
} else {
|
} else {
|
||||||
@@ -206,25 +202,19 @@ func WXInvestMember(ctx *jxcontext.Context, memberID int, userID string) (errCod
|
|||||||
return "开通会员失败", err
|
return "开通会员失败", err
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
globals.SugarLogger.Debugf("=====================微信老会员结束")
|
|
||||||
return errCode, err
|
return errCode, err
|
||||||
}
|
}
|
||||||
|
|
||||||
//微信 新充值会员
|
//微信 新充值会员
|
||||||
func WXInvestMemberNew(ctx *jxcontext.Context, memberID int, userID string) (errCode string, err error) {
|
func WXInvestMemberNew(ctx *jxcontext.Context, memberID int, userID string) (errCode string, err error) {
|
||||||
globals.SugarLogger.Debugf("=====================创建新会员开始")
|
|
||||||
var db = dao.GetDB()
|
var db = dao.GetDB()
|
||||||
userMember2 := &model.UserMember{
|
userMember2 := &model.UserMember{
|
||||||
UserID: userID,
|
UserID: userID,
|
||||||
MemberType: 1, //model.MemberTypeNormal,
|
MemberType: 1, //model.MemberTypeNormal,
|
||||||
MemberTypeID: 1,
|
MemberTypeID: 1,
|
||||||
}
|
}
|
||||||
globals.SugarLogger.Debugf("======================== %s", userMember2.UserID)
|
|
||||||
globals.SugarLogger.Debugf("======================== %s", userMember2.EndAt)
|
|
||||||
if memberID == model.OrderTypeMember {
|
if memberID == model.OrderTypeMember {
|
||||||
globals.SugarLogger.Debugf("=====================进入修改用户时间")
|
|
||||||
userMember2.EndAt = time.Now().AddDate(0, 1, 0)
|
userMember2.EndAt = time.Now().AddDate(0, 1, 0)
|
||||||
globals.SugarLogger.Debugf("======================= ===== %s", userMember2.EndAt)
|
|
||||||
} else {
|
} else {
|
||||||
userMember2.EndAt = time.Now().AddDate(1, 0, 0)
|
userMember2.EndAt = time.Now().AddDate(1, 0, 0)
|
||||||
}
|
}
|
||||||
@@ -235,12 +225,8 @@ func WXInvestMemberNew(ctx *jxcontext.Context, memberID int, userID string) (err
|
|||||||
}
|
}
|
||||||
userMember2.LastOperator = userinfo.UserID2
|
userMember2.LastOperator = userinfo.UserID2
|
||||||
userMember2.DeletedAt = utils.DefaultTimeValue
|
userMember2.DeletedAt = utils.DefaultTimeValue
|
||||||
//dao.WrapAddIDCULDEntity(userMember2, ctx.GetUserName())
|
|
||||||
globals.SugarLogger.Debugf("=====================数据库增加新用户信息")
|
|
||||||
if err = dao.CreateEntity(db, userMember2); err != nil {
|
if err = dao.CreateEntity(db, userMember2); err != nil {
|
||||||
globals.SugarLogger.Debugf("=====================创建新用户失败")
|
|
||||||
return "开通会员失败", err
|
return "开通会员失败", err
|
||||||
}
|
}
|
||||||
globals.SugarLogger.Debugf("=====================创建新会员结束")
|
|
||||||
return errCode, err
|
return errCode, err
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -92,15 +92,12 @@ func (ctx *Context) GetUserName() string {
|
|||||||
userName := ctx.token
|
userName := ctx.token
|
||||||
if ctx.userInfo != nil {
|
if ctx.userInfo != nil {
|
||||||
userName = ctx.userInfo.GetUserTag()
|
userName = ctx.userInfo.GetUserTag()
|
||||||
globals.SugarLogger.Debugf("jfjfjfhueiujsdjnhsihf")
|
|
||||||
} else if userName == "" {
|
} else if userName == "" {
|
||||||
userName = ctx.GetRealRemoteIP()
|
userName = ctx.GetRealRemoteIP()
|
||||||
globals.SugarLogger.Debugf("tridhxbjsehsymx")
|
|
||||||
}
|
}
|
||||||
if len(userName) > MaxUserNameLen {
|
if len(userName) > MaxUserNameLen {
|
||||||
userName = userName[:MaxUserNameLen]
|
userName = userName[:MaxUserNameLen]
|
||||||
}
|
}
|
||||||
globals.SugarLogger.Debugf("urthnxdbsjs")
|
|
||||||
return userName
|
return userName
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -2,7 +2,6 @@ package dao
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"fmt"
|
"fmt"
|
||||||
"git.rosy.net.cn/jx-callback/globals"
|
|
||||||
"reflect"
|
"reflect"
|
||||||
"strings"
|
"strings"
|
||||||
"time"
|
"time"
|
||||||
@@ -61,14 +60,11 @@ func WrapAddIDCULEntity(item interface{}, lastOperator string) interface{} {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func WrapAddIDCULDEntity(item interface{}, lastOperator string) interface{} {
|
func WrapAddIDCULDEntity(item interface{}, lastOperator string) interface{} {
|
||||||
globals.SugarLogger.Debugf("sajhbgduqhguqho ho")
|
|
||||||
if mapData, ok := item.(map[string]interface{}); ok {
|
if mapData, ok := item.(map[string]interface{}); ok {
|
||||||
mapData[model.FieldDeletedAt] = utils.DefaultTimeValue
|
mapData[model.FieldDeletedAt] = utils.DefaultTimeValue
|
||||||
globals.SugarLogger.Debugf("bdtrshgesghrdg")
|
|
||||||
} else {
|
} else {
|
||||||
value := refutil.CheckAndGetStructValue(item)
|
value := refutil.CheckAndGetStructValue(item)
|
||||||
value.FieldByName(model.FieldDeletedAt).Set(reflect.ValueOf(utils.DefaultTimeValue))
|
value.FieldByName(model.FieldDeletedAt).Set(reflect.ValueOf(utils.DefaultTimeValue))
|
||||||
globals.SugarLogger.Debugf("nhglmknhtkl;jmglk;ghm;lkghm")
|
|
||||||
}
|
}
|
||||||
return WrapAddIDCULEntity(item, lastOperator)
|
return WrapAddIDCULEntity(item, lastOperator)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -808,6 +808,15 @@ func init() {
|
|||||||
Filters: nil,
|
Filters: nil,
|
||||||
Params: nil})
|
Params: nil})
|
||||||
|
|
||||||
|
beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:OrderController"] = append(beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:OrderController"],
|
||||||
|
beego.ControllerComments{
|
||||||
|
Method: "PayByBalance",
|
||||||
|
Router: "/PayByBalance",
|
||||||
|
AllowHTTPMethods: []string{"post"},
|
||||||
|
MethodParams: param.Make(),
|
||||||
|
Filters: nil,
|
||||||
|
Params: nil})
|
||||||
|
|
||||||
beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:TaskController"] = append(beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:TaskController"],
|
beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:TaskController"] = append(beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:TaskController"],
|
||||||
beego.ControllerComments{
|
beego.ControllerComments{
|
||||||
Method: "CancelTask",
|
Method: "CancelTask",
|
||||||
|
|||||||
Reference in New Issue
Block a user