From c556a306f19f5de94023e5c57e60ceed051ad246 Mon Sep 17 00:00:00 2001
From: li <brett>
Date: Wed, 27 Apr 2022 10:25:55 +0800
Subject: [PATCH] fix:

---
 controller/user.go            | 19 +++++++++++++------
 lib/status/status.go          |  5 +++--
 model/cooperative_business.go | 22 ++++++++++++++++++++++
 model/model_test.go           |  6 ++++++
 router/router_app.go          |  2 +-
 5 files changed, 45 insertions(+), 9 deletions(-)
 create mode 100644 model/cooperative_business.go

diff --git a/controller/user.go b/controller/user.go
index 2510baf..df77e08 100644
--- a/controller/user.go
+++ b/controller/user.go
@@ -765,7 +765,7 @@ func UserAttendance(c *gin.Context) {
 	}
 	if recordExist {
 		logger.Error("user  consecutive")
-		RespJson(c, status.InternalServerError, nil)
+		RespJson(c, status.TodayAttendance, nil)
 		return
 	}
 
@@ -821,7 +821,8 @@ func UserAttendance(c *gin.Context) {
 		RespJson(c, status.InternalServerError, nil)
 		return
 	}
-	if attendanceRecord.AttendanceDate == "" || attendanceRecord.AttendanceDate != utils.TodayZeroAddDaysDateFormat(-1) {
+	if attendanceRecord.AttendanceDate == "" ||
+		attendanceRecord.AttendanceDate != utils.TodayZeroAddDaysDateFormat(-1) {
 		err = record.Add(model.VmEventAttendance, "连续签到获取积分")
 		if err != nil {
 			logger.Error("add user attendance record err:", err)
@@ -855,7 +856,8 @@ func UserAttendance(c *gin.Context) {
 		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()
 	if err != nil {
 		logger.Error("update user attendance  err:", err)
@@ -872,7 +874,6 @@ func UserAttendanceDetail(c *gin.Context) {
 	if uc == nil {
 		RespJson(c, status.Unauthorized, nil)
 		return
-		//uc = &auth.UserClaims{Uid: 51141053}
 	}
 	list := make([]model.AttendanceInfo, 0, 7)
 
@@ -891,7 +892,8 @@ func UserAttendanceDetail(c *gin.Context) {
 	//	return
 	//}
 	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 {
 		logger.Error("record exist err:", err)
 		RespJson(c, status.InternalServerError, nil)
@@ -943,11 +945,16 @@ func UserAttendanceDetail(c *gin.Context) {
 		if attendanceDays > 0 {
 			state = 2
 		}
+		date := utils.TodayZeroAddDaysDateFormat(i - days)
+		if attendanceRecord.AttendanceDate == todayZero {
+			date = utils.TodayZeroAddDaysDateFormat(i + 1 - days)
+		}
 		info := model.AttendanceInfo{
 			IndexDay: uint32(i) + 1,
 			//Date:     utils.TodayZeroAddDaysDateFormat((-1) * (7 - i)),
 			//Date:  utils.TodayZeroAddDaysDateFormat(i + 1 - days),
-			Date:  utils.TodayZeroAddDaysDateFormat(i - days),
+			//Date:  utils.TodayZeroAddDaysDateFormat(i - days),
+			Date:  date,
 			State: state,
 			Vm:    configInfo.Vm(uint32(i) + 1),
 		}
diff --git a/lib/status/status.go b/lib/status/status.go
index 6cb6851..8a96bbd 100644
--- a/lib/status/status.go
+++ b/lib/status/status.go
@@ -98,8 +98,8 @@ const (
 	IssueFeedbackReceiptTimeOver48Hour = 500514 // 问题反馈 超过 48小时
 	CardRetrieveBefore6Month           = 500515 // 用户收回卡需要半年后
 	IssueFeedbackRepetition            = 500516 // 问题反馈已存在,不能重复反馈
-
-	GoodsNotSale = 500508 // 商品已下架
+	TodayAttendance                    = 500517 // 已签到
+	GoodsNotSale                       = 500508 // 商品已下架
 
 	ToastErr = 600 // 报错
 )
@@ -228,6 +228,7 @@ var statusMsg = map[int]string{
 	IssueFeedbackReceiptTimeOver48Hour: "签收后已超过48小时",
 	CardRetrieveBefore6Month:           "收回的卡需共享满半年",
 	IssueFeedbackRepetition:            "改卡反馈已存在,不能重复反馈",
+	TodayAttendance:                    "今天已签到",
 	PayStateIng:                        "支付中",
 	PayStateFail:                       "支付失败",
 	MoneySufficient:                    "余额不足",
diff --git a/model/cooperative_business.go b/model/cooperative_business.go
new file mode 100644
index 0000000..ba8aa13
--- /dev/null
+++ b/model/cooperative_business.go
@@ -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"` // 标识
+
+}
+
+/*
+门店
+游戏
+卡
+库存
+
+
+*/
diff --git a/model/model_test.go b/model/model_test.go
index f0beda5..355c2fd 100644
--- a/model/model_test.go
+++ b/model/model_test.go
@@ -180,9 +180,15 @@ func InitDBProd() {
 		//&GameCardLabel{},
 		//&CardIssueFeedback{},
 
+		//&GameCard{},
+		//&FundRecord{},
+		//&User{},
+
 		&GameCard{},
 		&FundRecord{},
 		&User{},
+		&UserAttendance{},
+		&UserAttendanceRecord{},
 	)
 
 	if err := DBProd.DB().Ping(); err != nil {
diff --git a/router/router_app.go b/router/router_app.go
index 62298c5..f9b31f6 100644
--- a/router/router_app.go
+++ b/router/router_app.go
@@ -85,9 +85,9 @@ func ConfigAppRouter(r gin.IRouter) {
 		user.POST("refund_deposit_record", controller.UserDepositRefundRecordList) // 押金记录
 		user.POST("expire_delay", controller.UserMemberExpireDelayingInfo)         // 滞纳金详情
 		user.POST("expire_delay_pay", controller.UserMemberExpireDelayingPay)      // 滞纳金支付
+		user.POST("member_config", controller.MemberConfigList)                    // 开通会员配置
 		user.POST("attendance", controller.UserAttendance)                         // 签到
 		user.POST("attendance/detail", controller.UserAttendanceDetail)            // 签到详情
-		user.POST("member_config", controller.MemberConfigList)                    // 开通会员配置
 
 		user.POST("common_problem/list", controller.CommonProblemList) // 常见问题列表
 		//user.POST("service/wechat_id", controller.GetCustomerServiceWechatId) // 获取客服微信号