This commit is contained in:
li 2022-04-27 10:25:55 +08:00
parent 510a62fb85
commit c556a306f1
5 changed files with 45 additions and 9 deletions

View File

@ -765,7 +765,7 @@ func UserAttendance(c *gin.Context) {
} }
if recordExist { if recordExist {
logger.Error("user consecutive") logger.Error("user consecutive")
RespJson(c, status.InternalServerError, nil) RespJson(c, status.TodayAttendance, nil)
return return
} }
@ -821,7 +821,8 @@ func UserAttendance(c *gin.Context) {
RespJson(c, status.InternalServerError, nil) RespJson(c, status.InternalServerError, nil)
return return
} }
if attendanceRecord.AttendanceDate == "" || attendanceRecord.AttendanceDate != utils.TodayZeroAddDaysDateFormat(-1) { if attendanceRecord.AttendanceDate == "" ||
attendanceRecord.AttendanceDate != utils.TodayZeroAddDaysDateFormat(-1) {
err = record.Add(model.VmEventAttendance, "连续签到获取积分") err = record.Add(model.VmEventAttendance, "连续签到获取积分")
if err != nil { if err != nil {
logger.Error("add user attendance record err:", err) logger.Error("add user attendance record err:", err)
@ -855,7 +856,8 @@ func UserAttendance(c *gin.Context) {
return return
} }
_, err = model.NewUserAttendanceQuerySet(model.DB).UidEq(uc.Uid).GetUpdater().SetConsecutiveDays(userAttendance.ConsecutiveDays). _, err = model.NewUserAttendanceQuerySet(model.DB).UidEq(uc.Uid).GetUpdater().
SetConsecutiveDays(userAttendance.ConsecutiveDays).
SetIndexDay(userAttendance.IndexDay).SetLatestTime(time.Now()).UpdateNum() SetIndexDay(userAttendance.IndexDay).SetLatestTime(time.Now()).UpdateNum()
if err != nil { if err != nil {
logger.Error("update user attendance err:", err) logger.Error("update user attendance err:", err)
@ -872,7 +874,6 @@ func UserAttendanceDetail(c *gin.Context) {
if uc == nil { if uc == nil {
RespJson(c, status.Unauthorized, nil) RespJson(c, status.Unauthorized, nil)
return return
//uc = &auth.UserClaims{Uid: 51141053}
} }
list := make([]model.AttendanceInfo, 0, 7) list := make([]model.AttendanceInfo, 0, 7)
@ -891,7 +892,8 @@ func UserAttendanceDetail(c *gin.Context) {
// return // return
//} //}
recordExist, err := model.QueryRecordExist( recordExist, err := model.QueryRecordExist(
fmt.Sprintf("SELECT * FROM user_attendance_record WHERE attendance_date in ('%s','%s') AND uid=%d", utils.TodayZeroAddDaysDateFormat(-1), todayZero, uc.Uid)) fmt.Sprintf("SELECT * FROM user_attendance_record WHERE attendance_date in ('%s','%s') AND uid=%d",
utils.TodayZeroAddDaysDateFormat(-1), todayZero, uc.Uid))
if err != nil { if err != nil {
logger.Error("record exist err:", err) logger.Error("record exist err:", err)
RespJson(c, status.InternalServerError, nil) RespJson(c, status.InternalServerError, nil)
@ -943,11 +945,16 @@ func UserAttendanceDetail(c *gin.Context) {
if attendanceDays > 0 { if attendanceDays > 0 {
state = 2 state = 2
} }
date := utils.TodayZeroAddDaysDateFormat(i - days)
if attendanceRecord.AttendanceDate == todayZero {
date = utils.TodayZeroAddDaysDateFormat(i + 1 - days)
}
info := model.AttendanceInfo{ info := model.AttendanceInfo{
IndexDay: uint32(i) + 1, IndexDay: uint32(i) + 1,
//Date: utils.TodayZeroAddDaysDateFormat((-1) * (7 - i)), //Date: utils.TodayZeroAddDaysDateFormat((-1) * (7 - i)),
//Date: utils.TodayZeroAddDaysDateFormat(i + 1 - days), //Date: utils.TodayZeroAddDaysDateFormat(i + 1 - days),
Date: utils.TodayZeroAddDaysDateFormat(i - days), //Date: utils.TodayZeroAddDaysDateFormat(i - days),
Date: date,
State: state, State: state,
Vm: configInfo.Vm(uint32(i) + 1), Vm: configInfo.Vm(uint32(i) + 1),
} }

View File

@ -98,7 +98,7 @@ const (
IssueFeedbackReceiptTimeOver48Hour = 500514 // 问题反馈 超过 48小时 IssueFeedbackReceiptTimeOver48Hour = 500514 // 问题反馈 超过 48小时
CardRetrieveBefore6Month = 500515 // 用户收回卡需要半年后 CardRetrieveBefore6Month = 500515 // 用户收回卡需要半年后
IssueFeedbackRepetition = 500516 // 问题反馈已存在,不能重复反馈 IssueFeedbackRepetition = 500516 // 问题反馈已存在,不能重复反馈
TodayAttendance = 500517 // 已签到
GoodsNotSale = 500508 // 商品已下架 GoodsNotSale = 500508 // 商品已下架
ToastErr = 600 // 报错 ToastErr = 600 // 报错
@ -228,6 +228,7 @@ var statusMsg = map[int]string{
IssueFeedbackReceiptTimeOver48Hour: "签收后已超过48小时", IssueFeedbackReceiptTimeOver48Hour: "签收后已超过48小时",
CardRetrieveBefore6Month: "收回的卡需共享满半年", CardRetrieveBefore6Month: "收回的卡需共享满半年",
IssueFeedbackRepetition: "改卡反馈已存在,不能重复反馈", IssueFeedbackRepetition: "改卡反馈已存在,不能重复反馈",
TodayAttendance: "今天已签到",
PayStateIng: "支付中", PayStateIng: "支付中",
PayStateFail: "支付失败", PayStateFail: "支付失败",
MoneySufficient: "余额不足", MoneySufficient: "余额不足",

View File

@ -0,0 +1,22 @@
package model
import "time"
//go:generate goqueryset -in cooperative_business.go
// gen:qs
type CooperativeBusiness struct {
Model
Name string `json:"name"` //
AddTime time.Time `json:"add_time"` // 加入时间
//Identification string `json:"identification"` // 标识
}
/*
门店
游戏
库存
*/

View File

@ -180,9 +180,15 @@ func InitDBProd() {
//&GameCardLabel{}, //&GameCardLabel{},
//&CardIssueFeedback{}, //&CardIssueFeedback{},
//&GameCard{},
//&FundRecord{},
//&User{},
&GameCard{}, &GameCard{},
&FundRecord{}, &FundRecord{},
&User{}, &User{},
&UserAttendance{},
&UserAttendanceRecord{},
) )
if err := DBProd.DB().Ping(); err != nil { if err := DBProd.DB().Ping(); err != nil {

View File

@ -85,9 +85,9 @@ func ConfigAppRouter(r gin.IRouter) {
user.POST("refund_deposit_record", controller.UserDepositRefundRecordList) // 押金记录 user.POST("refund_deposit_record", controller.UserDepositRefundRecordList) // 押金记录
user.POST("expire_delay", controller.UserMemberExpireDelayingInfo) // 滞纳金详情 user.POST("expire_delay", controller.UserMemberExpireDelayingInfo) // 滞纳金详情
user.POST("expire_delay_pay", controller.UserMemberExpireDelayingPay) // 滞纳金支付 user.POST("expire_delay_pay", controller.UserMemberExpireDelayingPay) // 滞纳金支付
user.POST("member_config", controller.MemberConfigList) // 开通会员配置
user.POST("attendance", controller.UserAttendance) // 签到 user.POST("attendance", controller.UserAttendance) // 签到
user.POST("attendance/detail", controller.UserAttendanceDetail) // 签到详情 user.POST("attendance/detail", controller.UserAttendanceDetail) // 签到详情
user.POST("member_config", controller.MemberConfigList) // 开通会员配置
user.POST("common_problem/list", controller.CommonProblemList) // 常见问题列表 user.POST("common_problem/list", controller.CommonProblemList) // 常见问题列表
//user.POST("service/wechat_id", controller.GetCustomerServiceWechatId) // 获取客服微信号 //user.POST("service/wechat_id", controller.GetCustomerServiceWechatId) // 获取客服微信号