From ad22da1e40e0f74e8de27e30752859caacc20bd5 Mon Sep 17 00:00:00 2001
From: tommy <3405129587@qq.com>
Date: Mon, 1 Jun 2020 16:34:35 +0800
Subject: [PATCH] xxx

---
 controllers/author.go      |   3 +
 controllers/client/live.go |   9 +-
 controllers/client/sign.go | 108 +++++++++++++++---------
 controllers/pc/sign.go     |   2 +-
 log/hdzj.log               | 205 +++++++++++++++++++++++++++++++++++++++++++++
 models/live_config.go      |   2 +-
 models/real_sign_list.go   |   5 --
 models/sign_history.go     |   4 +-
 models/sign_up.go          |   2 +-
 services/pay/order.go      |   4 -
 test/order_test.go         |   4 +
 utils/code/code.go         |   2 +-
 12 files changed, 290 insertions(+), 60 deletions(-)

diff --git a/controllers/author.go b/controllers/author.go
index ec40a64..cab281f 100644
--- a/controllers/author.go
+++ b/controllers/author.go
@@ -68,6 +68,9 @@ func (t *AuthorCtl) MustGetAreaId() int64 {
 	if !exist {
 		areaId = t.claims.AreaId
 	}
+	if areaId == 0 {
+		t.ERROR("area_id 不能为空", code.MSG_ERR_Param)
+	}
 	return areaId
 }
 
diff --git a/controllers/client/live.go b/controllers/client/live.go
index 68103d8..8acfab4 100644
--- a/controllers/client/live.go
+++ b/controllers/client/live.go
@@ -43,6 +43,7 @@ func (t *LiveCtl) Detail() {
 	fs["is_shake"] = 0
 	fs["is_reward"] = 0
 	fs["is_order"] = 0
+	fs["is_lottery"] = 0
 	if live.AdaptationFunc != nil && len(live.AdaptationFunc) != 0 {
 		modules := make([]*models.ModuleService, 0)
 		err = core.GetXormAuto().Where("is_delete=0").In("id", live.AdaptationFunc).Find(&modules)
@@ -54,6 +55,8 @@ func (t *LiveCtl) Detail() {
 				fs["is_shake"] = 1
 			} else if module.Name == define.MODULE_REWARD {
 				fs["is_reward"] = 1
+			} else if module.Name == define.MODULE_LOTTERY {
+				fs["is_lottery"] = 1
 			}
 		}
 	}
@@ -119,11 +122,6 @@ func (t *LiveCtl) SendLiveRedPack() {
 	t.CheckErr(err)
 	t.Assert(exist, code.MSG_ACTIVITY_NOT_EXIST, "互动不存在")
 
-	//area := new(models.AreaStore)
-	//exist, err = models.Get(area, areaId)
-	//t.CheckErr(err)
-	//t.Assert(exist, code.MSG_AREASTORE_NOT_EXIST, "地区不存在")
-
 	user := models.User{}
 	exist, err = models.Get(&user, userId)
 	t.CheckErr(err)
@@ -137,6 +135,7 @@ func (t *LiveCtl) SendLiveRedPack() {
 		UserId:      0,
 		ActivityId:  activityId,
 		AreaId:      areaId,
+		OutTradeNo:  res["out_trade_no"].(string),
 		RehearsalId: activity.RehearsalId,
 		Prompt:      filter.Replace(prompt),
 		Amount:      amount,
diff --git a/controllers/client/sign.go b/controllers/client/sign.go
index 171d378..fbe7a9e 100644
--- a/controllers/client/sign.go
+++ b/controllers/client/sign.go
@@ -8,7 +8,6 @@ import (
 	ws_send_service "hudongzhuanjia/services/ws_send"
 	"hudongzhuanjia/utils/code"
 	"hudongzhuanjia/utils/define"
-	"strings"
 	"time"
 )
 
@@ -164,10 +163,10 @@ func (t *SignCtl) Sign() {
 	t.SUCCESS("签到成功")
 }
 
+// 实名签到
 func (t *SignCtl) RealSign() {
 	activityId := t.MustGetInt64("activity_id")
-	userId := t.MustGetInt64("user_id")
-	rehearsalId := t.MustGetInt64("rehearsal_id")
+	userId := t.MustGetUID()
 	areaId := t.MustGetAreaId()
 
 	user := new(models.User)
@@ -175,58 +174,62 @@ func (t *SignCtl) RealSign() {
 	t.CheckErr(err)
 	t.Assert(exist, code.MSG_USER_NOT_EXIST, "用户不存在")
 
+	activity := new(models.Activity)
+	exist, err = models.Get(activity, activityId)
+	t.CheckErr(err)
+	t.Assert(exist, code.MSG_ACTIVITY_NOT_EXIST, "互动不存在")
+
 	sign := new(models.SignUp)
 	exist, err = sign.GetByActivityId(activityId)
 	t.CheckErr(err)
 	t.Assert(exist, code.MSG_SIGN_UP_NOT_EXIST, "签到活动不存在")
-	t.Assert(sign.SignMethod != 1, code.MSG_ERR_Param, "非实名签到")
+	t.Assert(sign.SignMethod == 2, code.MSG_ERR_Param, "非实名签到")
 
 	history := new(models.SignHistory)
-	isSign, err := history.GetByUserId(activityId, userId, rehearsalId, areaId)
+	isSign, err := history.GetByUserId(activityId, userId, activity.RehearsalId, areaId)
 	t.CheckErr(err)
-	if isSign && history.Status == 1 {
+	if isSign && history.Status == 2 {
 		t.SUCCESS("已通过实名签到")
 		return
-	} else if sign.RealSignJsonForm != "" && sign.RealSignJsonForm != "[]" {
-		form := sign.RealSignJsonForm[1 : len(sign.RealSignJsonForm)-1]
-		var extSql = ""
+	} else if sign.RealSignJsonForm != nil && len(sign.RealSignJsonForm) != 0 {
 		var params = make(map[string]string, 0)
-		for _, v := range strings.Split(form, ",") {
-			name := strings.Trim(v, "\"")
+		var extSql string
+		for _, name := range sign.RealSignJsonForm {
 			if value, ok := t.Get(name); ok {
+				params[value] = name
 				extSql += "and json_list like \"%" + value + "%\" "
-				params[name] = value
 			}
 		}
-		if len(extSql) > 0 {
-			exist, err = new(models.RealSignList).CheckSignIn(activityId, extSql)
-			var body []byte
-			body, err = json.Marshal(params)
-			t.CheckErr(err)
-
-			history.ActivityId = activityId
-			history.UserId = userId
-			history.Nickname = user.Nickname
-			history.RehearsalId = rehearsalId
-			history.AreaId = areaId
-			history.Content = string(body)
-			if exist { // 存在 直接通过
-				history.Status = 1
-			} else {
-				history.Status = 0
-			}
-			if isSign {
-				err = history.UpdateById([]interface{}{history.Id})
-			} else {
-				err = history.Insert()
-			}
-			t.CheckErr(err)
-			if !exist { // 找不到导入的签名信息
-				t.ERROR("您的信息不在名单之内", code.MSG_ERR)
-				return
-			}
+		if len(extSql) == 0 || len(params) == 0 {
+			t.ERROR("提交内容不能为空", code.MSG_ERR_Param)
+			return
+		}
+
+		exist, err = new(models.RealSignList).CheckSignIn(activityId, extSql)
+		t.CheckErr(err)
+		var body []byte
+		body, err = json.Marshal(params)
+		t.CheckErr(err)
+
+		history.ActivityId = activityId
+		history.UserId = userId
+		history.Nickname = user.Nickname
+		history.RehearsalId = activity.RehearsalId
+		history.AreaId = areaId
+		history.Content = string(body)
+		if exist { // 存在 直接通过
+			history.Status = 2
 		} else {
-			t.ERROR("填写内容不能为空", code.MSG_ERR)
+			history.Status = 0
+		}
+		if isSign {
+			err = history.UpdateById([]interface{}{history.Id})
+		} else {
+			err = history.Insert()
+		}
+		t.CheckErr(err)
+		if !exist { // 找不到导入的签名信息
+			t.ERROR("您的信息不在名单之内", code.MSG_ERR)
 			return
 		}
 		t.SUCCESS("实名签到成功")
@@ -236,3 +239,28 @@ func (t *SignCtl) RealSign() {
 		return
 	}
 }
+
+func (t *SignCtl) ApplySign() {
+	userId := t.MustGetUID()
+	areaId := t.MustGetAreaId()
+	activityId := t.MustGetInt64("activity_id")
+
+	activity := new(models.Activity)
+	exist, err := models.Get(activity, activityId)
+	t.CheckErr(err)
+	t.Assert(exist, code.MSG_ACTIVITY_NOT_EXIST, "互动不存在")
+
+	history := new(models.SignHistory)
+	exist, err = history.GetByUserId(activityId, userId, activity.RehearsalId, areaId)
+	t.CheckErr(err)
+	t.Assert(exist, code.MSG_SIGN_HISTORY_NOT_EXIST, "签到不存在")
+	if history.Status == 2 {
+		t.SUCCESS("你已经通过实名签到")
+		return
+	}
+
+	history.Status = 1
+	_, err = models.Update(history.Id, history, "status")
+	t.CheckErr(err)
+	t.SUCCESS("申请成功")
+}
diff --git a/controllers/pc/sign.go b/controllers/pc/sign.go
index bd94377..e392086 100644
--- a/controllers/pc/sign.go
+++ b/controllers/pc/sign.go
@@ -114,7 +114,7 @@ func (t *SignCtl) RealSignVerify() {
 		idList = append(idList, id)
 	}
 	history := new(models.SignHistory)
-	history.Status = 1
+	history.Status = 2
 	err := history.UpdateById(idList, "status")
 	t.CheckErr(err)
 	t.SUCCESS("审核成功")
diff --git a/log/hdzj.log b/log/hdzj.log
index 2e02296..781917d 100644
--- a/log/hdzj.log
+++ b/log/hdzj.log
@@ -148,3 +148,208 @@
 2020-05-28 10:51:38.887	ERROR	logger/logger.go:87	直播红包信息异常: err-> <nil>, exist->false, status->1, out_trade_no->RtEZev6Lw21fp2BzGNpvrSxMRgIn7204
 2020-05-28 10:51:38.938	ERROR	logger/logger.go:87	客户订单异常
 2020-05-28 10:51:38.969	ERROR	logger/logger.go:87	客户订单异常
+2020-05-29 18:55:12.643	ERROR	logger/logger.go:87	客户订单异常
+2020-05-29 18:55:12.647	ERROR	logger/logger.go:87	客户订单异常
+2020-05-29 18:55:12.683	ERROR	logger/logger.go:87	客户订单异常
+2020-05-29 18:55:12.683	ERROR	logger/logger.go:87	客户订单异常
+2020-05-29 18:55:12.687	ERROR	logger/logger.go:87	客户订单异常
+2020-05-29 18:55:12.687	ERROR	logger/logger.go:87	客户订单异常
+2020-05-29 18:55:12.691	ERROR	logger/logger.go:87	客户订单异常
+2020-05-29 18:55:12.695	ERROR	logger/logger.go:87	客户订单异常
+2020-05-29 18:55:12.695	ERROR	logger/logger.go:87	客户订单异常
+2020-05-29 18:55:12.891	ERROR	logger/logger.go:87	打赏历史异常: err-><nil>, out_trade_no tWckBJ9B7h7SJ0ao36dLVUEPh3rZdkHL
+2020-05-29 18:55:13.189	ERROR	logger/logger.go:87	直播红包信息异常: err-> <nil>, exist->false, status->1, out_trade_no->sIdtbm7xpY3kYhm2P8zHPvbbzcQRkcDr
+2020-05-29 18:56:40.552	ERROR	logger/logger.go:87	客户订单异常
+2020-05-29 18:56:40.553	ERROR	logger/logger.go:87	客户订单异常
+2020-05-29 18:56:40.589	ERROR	logger/logger.go:87	客户订单异常
+2020-05-29 18:56:40.589	ERROR	logger/logger.go:87	客户订单异常
+2020-05-29 18:56:40.592	ERROR	logger/logger.go:87	客户订单异常
+2020-05-29 18:56:40.596	ERROR	logger/logger.go:87	客户订单异常
+2020-05-29 18:56:40.601	ERROR	logger/logger.go:87	客户订单异常
+2020-05-29 18:56:40.601	ERROR	logger/logger.go:87	客户订单异常
+2020-05-29 18:56:40.601	ERROR	logger/logger.go:87	客户订单异常
+2020-05-29 18:56:40.853	ERROR	logger/logger.go:87	打赏历史异常: err-><nil>, out_trade_no tWckBJ9B7h7SJ0ao36dLVUEPh3rZdkHL
+2020-05-29 18:59:32.747	ERROR	logger/logger.go:87	直播红包信息异常: err-> <nil>, exist->false, status->1, out_trade_no->sIdtbm7xpY3kYhm2P8zHPvbbzcQRkcDr
+2020-05-29 18:59:41.985	ERROR	logger/logger.go:87	客户订单异常
+2020-05-29 18:59:41.985	ERROR	logger/logger.go:87	客户订单异常
+2020-05-29 18:59:42.026	ERROR	logger/logger.go:87	客户订单异常
+2020-05-29 18:59:42.026	ERROR	logger/logger.go:87	客户订单异常
+2020-05-29 18:59:42.037	ERROR	logger/logger.go:87	客户订单异常
+2020-05-29 18:59:42.037	ERROR	logger/logger.go:87	客户订单异常
+2020-05-29 18:59:42.037	ERROR	logger/logger.go:87	客户订单异常
+2020-05-29 18:59:42.037	ERROR	logger/logger.go:87	客户订单异常
+2020-05-29 18:59:42.037	ERROR	logger/logger.go:87	客户订单异常
+2020-05-29 19:00:05.339	ERROR	logger/logger.go:87	打赏历史异常: err-><nil>, out_trade_no tWckBJ9B7h7SJ0ao36dLVUEPh3rZdkHL
+2020-05-29 19:00:14.514	ERROR	logger/logger.go:87	直播红包信息异常: err-> <nil>, exist->false, status->1, out_trade_no->sIdtbm7xpY3kYhm2P8zHPvbbzcQRkcDr
+2020-05-29 19:00:25.586	ERROR	logger/logger.go:87	客户订单异常
+2020-05-29 19:00:25.586	ERROR	logger/logger.go:87	客户订单异常
+2020-05-29 19:00:25.626	ERROR	logger/logger.go:87	客户订单异常
+2020-05-29 19:00:25.626	ERROR	logger/logger.go:87	客户订单异常
+2020-05-29 19:00:25.638	ERROR	logger/logger.go:87	客户订单异常
+2020-05-29 19:00:25.638	ERROR	logger/logger.go:87	客户订单异常
+2020-05-29 19:00:25.639	ERROR	logger/logger.go:87	客户订单异常
+2020-05-29 19:00:25.639	ERROR	logger/logger.go:87	客户订单异常
+2020-05-29 19:00:25.639	ERROR	logger/logger.go:87	客户订单异常
+2020-05-29 19:00:25.863	ERROR	logger/logger.go:87	打赏历史异常: err-><nil>, out_trade_no tWckBJ9B7h7SJ0ao36dLVUEPh3rZdkHL
+2020-05-29 19:01:56.710	ERROR	logger/logger.go:87	直播红包信息异常: err-> <nil>, exist->false, status->1, out_trade_no->sIdtbm7xpY3kYhm2P8zHPvbbzcQRkcDr
+2020-05-29 19:02:08.296	ERROR	logger/logger.go:87	客户订单异常
+2020-05-29 19:02:08.296	ERROR	logger/logger.go:87	客户订单异常
+2020-05-29 19:02:08.333	ERROR	logger/logger.go:87	客户订单异常
+2020-05-29 19:02:08.333	ERROR	logger/logger.go:87	客户订单异常
+2020-05-29 19:02:08.333	ERROR	logger/logger.go:87	客户订单异常
+2020-05-29 19:02:08.337	ERROR	logger/logger.go:87	客户订单异常
+2020-05-29 19:02:08.341	ERROR	logger/logger.go:87	客户订单异常
+2020-05-29 19:02:08.341	ERROR	logger/logger.go:87	客户订单异常
+2020-05-29 19:02:08.345	ERROR	logger/logger.go:87	客户订单异常
+2020-05-29 19:04:00.556	ERROR	logger/logger.go:87	打赏历史异常: err-><nil>, out_trade_no tWckBJ9B7h7SJ0ao36dLVUEPh3rZdkHL
+2020-06-01 09:48:52.254	ERROR	logger/logger.go:87	客户订单异常
+2020-06-01 09:48:52.254	ERROR	logger/logger.go:87	客户订单异常
+2020-06-01 09:48:52.290	ERROR	logger/logger.go:87	客户订单异常
+2020-06-01 09:48:52.294	ERROR	logger/logger.go:87	客户订单异常
+2020-06-01 09:48:52.294	ERROR	logger/logger.go:87	客户订单异常
+2020-06-01 09:48:52.302	ERROR	logger/logger.go:87	客户订单异常
+2020-06-01 09:48:52.302	ERROR	logger/logger.go:87	客户订单异常
+2020-06-01 09:48:52.302	ERROR	logger/logger.go:87	客户订单异常
+2020-06-01 09:48:52.302	ERROR	logger/logger.go:87	客户订单异常
+2020-06-01 09:54:47.680	ERROR	logger/logger.go:87	客户订单异常
+2020-06-01 09:54:47.690	ERROR	logger/logger.go:87	客户订单异常
+2020-06-01 09:54:47.727	ERROR	logger/logger.go:87	客户订单异常
+2020-06-01 09:54:47.731	ERROR	logger/logger.go:87	客户订单异常
+2020-06-01 09:54:47.738	ERROR	logger/logger.go:87	客户订单异常
+2020-06-01 09:54:47.739	ERROR	logger/logger.go:87	客户订单异常
+2020-06-01 09:54:47.739	ERROR	logger/logger.go:87	客户订单异常
+2020-06-01 09:54:47.739	ERROR	logger/logger.go:87	客户订单异常
+2020-06-01 09:54:47.739	ERROR	logger/logger.go:87	客户订单异常
+2020-06-01 10:54:47.607	ERROR	logger/logger.go:87	获取过期打赏错误原因Error 1064: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near ')' at line 1
+2020-06-01 10:54:47.607	ERROR	logger/logger.go:87	定时任务错误原因Error 1064: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near ')' at line 1
+2020-06-01 11:54:50.220	ERROR	logger/logger.go:87	获取过期打赏错误原因Error 1064: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near ')' at line 1
+2020-06-01 11:54:50.220	ERROR	logger/logger.go:87	定时任务错误原因Error 1064: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near ')' at line 1
+2020-06-01 12:54:50.282	ERROR	logger/logger.go:87	获取过期打赏错误原因Error 1064: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near ')' at line 1
+2020-06-01 12:54:50.282	ERROR	logger/logger.go:87	定时任务错误原因Error 1064: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near ')' at line 1
+2020-06-01 13:54:50.221	ERROR	logger/logger.go:87	获取过期打赏错误原因Error 1064: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near ')' at line 1
+2020-06-01 13:54:50.221	ERROR	logger/logger.go:87	定时任务错误原因Error 1064: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near ')' at line 1
+2020-06-01 14:54:50.220	ERROR	logger/logger.go:87	获取过期打赏错误原因Error 1064: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near ')' at line 1
+2020-06-01 14:54:50.220	ERROR	logger/logger.go:87	定时任务错误原因Error 1064: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near ')' at line 1
+2020-06-01 15:54:50.220	ERROR	logger/logger.go:87	获取过期打赏错误原因Error 1064: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near ')' at line 1
+2020-06-01 15:54:50.220	ERROR	logger/logger.go:87	定时任务错误原因Error 1064: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near ')' at line 1
+2020-06-01 15:56:52.633	ERROR	logger/logger.go:87	客户订单异常
+2020-06-01 15:56:52.633	ERROR	logger/logger.go:87	客户订单异常
+2020-06-01 15:56:52.670	ERROR	logger/logger.go:87	客户订单异常
+2020-06-01 15:56:52.671	ERROR	logger/logger.go:87	客户订单异常
+2020-06-01 15:56:52.673	ERROR	logger/logger.go:87	客户订单异常
+2020-06-01 15:56:52.677	ERROR	logger/logger.go:87	客户订单异常
+2020-06-01 15:56:52.682	ERROR	logger/logger.go:87	客户订单异常
+2020-06-01 15:56:52.682	ERROR	logger/logger.go:87	客户订单异常
+2020-06-01 15:56:52.682	ERROR	logger/logger.go:87	客户订单异常
+2020-06-01 15:56:52.682	ERROR	logger/logger.go:87	客户订单异常
+2020-06-01 15:56:52.682	ERROR	logger/logger.go:87	客户订单异常
+2020-06-01 15:56:52.682	ERROR	logger/logger.go:87	客户订单异常
+2020-06-01 15:56:52.682	ERROR	logger/logger.go:87	客户订单异常
+2020-06-01 15:56:52.682	ERROR	logger/logger.go:87	客户订单异常
+2020-06-01 15:56:52.682	ERROR	logger/logger.go:87	客户订单异常
+2020-06-01 16:00:11.633	ERROR	logger/logger.go:87	客户订单异常
+2020-06-01 16:00:11.634	ERROR	logger/logger.go:87	客户订单异常
+2020-06-01 16:00:11.677	ERROR	logger/logger.go:87	客户订单异常
+2020-06-01 16:00:11.677	ERROR	logger/logger.go:87	客户订单异常
+2020-06-01 16:00:11.686	ERROR	logger/logger.go:87	客户订单异常
+2020-06-01 16:00:11.686	ERROR	logger/logger.go:87	客户订单异常
+2020-06-01 16:00:11.686	ERROR	logger/logger.go:87	客户订单异常
+2020-06-01 16:00:11.686	ERROR	logger/logger.go:87	客户订单异常
+2020-06-01 16:00:11.687	ERROR	logger/logger.go:87	客户订单异常
+2020-06-01 16:00:11.687	ERROR	logger/logger.go:87	客户订单异常
+2020-06-01 16:00:11.687	ERROR	logger/logger.go:87	客户订单异常
+2020-06-01 16:00:11.687	ERROR	logger/logger.go:87	客户订单异常
+2020-06-01 16:00:11.687	ERROR	logger/logger.go:87	客户订单异常
+2020-06-01 16:00:11.687	ERROR	logger/logger.go:87	客户订单异常
+2020-06-01 16:00:11.687	ERROR	logger/logger.go:87	客户订单异常
+2020-06-01 16:01:01.555	ERROR	logger/logger.go:87	客户订单异常
+2020-06-01 16:01:01.556	ERROR	logger/logger.go:87	客户订单异常
+2020-06-01 16:01:01.592	ERROR	logger/logger.go:87	客户订单异常
+2020-06-01 16:01:01.595	ERROR	logger/logger.go:87	客户订单异常
+2020-06-01 16:01:01.599	ERROR	logger/logger.go:87	客户订单异常
+2020-06-01 16:01:01.600	ERROR	logger/logger.go:87	客户订单异常
+2020-06-01 16:01:01.603	ERROR	logger/logger.go:87	客户订单异常
+2020-06-01 16:01:01.603	ERROR	logger/logger.go:87	客户订单异常
+2020-06-01 16:01:01.603	ERROR	logger/logger.go:87	客户订单异常
+2020-06-01 16:01:01.603	ERROR	logger/logger.go:87	客户订单异常
+2020-06-01 16:01:01.603	ERROR	logger/logger.go:87	客户订单异常
+2020-06-01 16:01:01.603	ERROR	logger/logger.go:87	客户订单异常
+2020-06-01 16:01:01.604	ERROR	logger/logger.go:87	客户订单异常
+2020-06-01 16:01:01.604	ERROR	logger/logger.go:87	客户订单异常
+2020-06-01 16:01:01.604	ERROR	logger/logger.go:87	客户订单异常
+2020-06-01 16:05:10.764	ERROR	logger/logger.go:87	客户订单异常
+2020-06-01 16:05:10.765	ERROR	logger/logger.go:87	客户订单异常
+2020-06-01 16:05:10.802	ERROR	logger/logger.go:87	客户订单异常
+2020-06-01 16:05:10.803	ERROR	logger/logger.go:87	客户订单异常
+2020-06-01 16:05:10.809	ERROR	logger/logger.go:87	客户订单异常
+2020-06-01 16:05:10.809	ERROR	logger/logger.go:87	客户订单异常
+2020-06-01 16:05:10.813	ERROR	logger/logger.go:87	客户订单异常
+2020-06-01 16:05:10.813	ERROR	logger/logger.go:87	客户订单异常
+2020-06-01 16:05:10.813	ERROR	logger/logger.go:87	客户订单异常
+2020-06-01 16:05:10.813	ERROR	logger/logger.go:87	客户订单异常
+2020-06-01 16:05:10.813	ERROR	logger/logger.go:87	客户订单异常
+2020-06-01 16:05:10.813	ERROR	logger/logger.go:87	客户订单异常
+2020-06-01 16:05:10.813	ERROR	logger/logger.go:87	客户订单异常
+2020-06-01 16:05:10.813	ERROR	logger/logger.go:87	客户订单异常
+2020-06-01 16:05:10.816	ERROR	logger/logger.go:87	客户订单异常
+2020-06-01 16:07:13.532	ERROR	logger/logger.go:87	查询订单出现错误: 错误原因-->Post https://api2.mch.weixin.qq.com/pay/orderquery: dial tcp 121.51.50.140:443: i/o timeout交易订单号-->nzw8Ez12VvO1nBjcWl9gz6q1F2QWVWl6
+2020-06-01 16:13:51.577	ERROR	logger/logger.go:87	客户订单异常
+2020-06-01 16:13:51.578	ERROR	logger/logger.go:87	客户订单异常
+2020-06-01 16:13:51.614	ERROR	logger/logger.go:87	客户订单异常
+2020-06-01 16:13:51.615	ERROR	logger/logger.go:87	客户订单异常
+2020-06-01 16:13:51.617	ERROR	logger/logger.go:87	客户订单异常
+2020-06-01 16:13:51.621	ERROR	logger/logger.go:87	客户订单异常
+2020-06-01 16:13:51.625	ERROR	logger/logger.go:87	客户订单异常
+2020-06-01 16:13:51.625	ERROR	logger/logger.go:87	客户订单异常
+2020-06-01 16:13:51.625	ERROR	logger/logger.go:87	客户订单异常
+2020-06-01 16:13:51.625	ERROR	logger/logger.go:87	客户订单异常
+2020-06-01 16:13:51.625	ERROR	logger/logger.go:87	客户订单异常
+2020-06-01 16:13:51.625	ERROR	logger/logger.go:87	客户订单异常
+2020-06-01 16:13:51.625	ERROR	logger/logger.go:87	客户订单异常
+2020-06-01 16:13:51.629	ERROR	logger/logger.go:87	客户订单异常
+2020-06-01 16:13:51.629	ERROR	logger/logger.go:87	客户订单异常
+2020-06-01 16:15:14.379	ERROR	logger/logger.go:87	客户订单异常
+2020-06-01 16:15:14.383	ERROR	logger/logger.go:87	客户订单异常
+2020-06-01 16:15:14.423	ERROR	logger/logger.go:87	客户订单异常
+2020-06-01 16:15:14.427	ERROR	logger/logger.go:87	客户订单异常
+2020-06-01 16:15:14.427	ERROR	logger/logger.go:87	客户订单异常
+2020-06-01 16:15:14.431	ERROR	logger/logger.go:87	客户订单异常
+2020-06-01 16:15:14.431	ERROR	logger/logger.go:87	客户订单异常
+2020-06-01 16:15:14.431	ERROR	logger/logger.go:87	客户订单异常
+2020-06-01 16:15:14.435	ERROR	logger/logger.go:87	客户订单异常
+2020-06-01 16:15:14.435	ERROR	logger/logger.go:87	客户订单异常
+2020-06-01 16:15:14.435	ERROR	logger/logger.go:87	客户订单异常
+2020-06-01 16:15:14.436	ERROR	logger/logger.go:87	客户订单异常
+2020-06-01 16:15:14.436	ERROR	logger/logger.go:87	客户订单异常
+2020-06-01 16:15:14.436	ERROR	logger/logger.go:87	客户订单异常
+2020-06-01 16:15:14.436	ERROR	logger/logger.go:87	客户订单异常
+2020-06-01 16:17:39.334	ERROR	logger/logger.go:87	客户订单异常
+2020-06-01 16:17:39.338	ERROR	logger/logger.go:87	客户订单异常
+2020-06-01 16:17:39.376	ERROR	logger/logger.go:87	客户订单异常
+2020-06-01 16:17:39.378	ERROR	logger/logger.go:87	客户订单异常
+2020-06-01 16:17:39.382	ERROR	logger/logger.go:87	客户订单异常
+2020-06-01 16:17:39.386	ERROR	logger/logger.go:87	客户订单异常
+2020-06-01 16:17:39.386	ERROR	logger/logger.go:87	客户订单异常
+2020-06-01 16:17:39.386	ERROR	logger/logger.go:87	客户订单异常
+2020-06-01 16:17:39.386	ERROR	logger/logger.go:87	客户订单异常
+2020-06-01 16:17:39.387	ERROR	logger/logger.go:87	客户订单异常
+2020-06-01 16:17:39.387	ERROR	logger/logger.go:87	客户订单异常
+2020-06-01 16:17:39.387	ERROR	logger/logger.go:87	客户订单异常
+2020-06-01 16:17:39.387	ERROR	logger/logger.go:87	客户订单异常
+2020-06-01 16:17:39.387	ERROR	logger/logger.go:87	客户订单异常
+2020-06-01 16:17:39.387	ERROR	logger/logger.go:87	客户订单异常
+2020-06-01 16:26:43.247	ERROR	logger/logger.go:87	客户订单异常
+2020-06-01 16:26:43.247	ERROR	logger/logger.go:87	客户订单异常
+2020-06-01 16:26:43.284	ERROR	logger/logger.go:87	客户订单异常
+2020-06-01 16:26:43.291	ERROR	logger/logger.go:87	客户订单异常
+2020-06-01 16:26:43.295	ERROR	logger/logger.go:87	客户订单异常
+2020-06-01 16:26:43.295	ERROR	logger/logger.go:87	客户订单异常
+2020-06-01 16:26:43.295	ERROR	logger/logger.go:87	客户订单异常
+2020-06-01 16:26:43.295	ERROR	logger/logger.go:87	客户订单异常
+2020-06-01 16:26:43.296	ERROR	logger/logger.go:87	客户订单异常
+2020-06-01 16:26:43.296	ERROR	logger/logger.go:87	客户订单异常
+2020-06-01 16:26:43.296	ERROR	logger/logger.go:87	客户订单异常
+2020-06-01 16:26:43.296	ERROR	logger/logger.go:87	客户订单异常
+2020-06-01 16:26:43.296	ERROR	logger/logger.go:87	客户订单异常
+2020-06-01 16:26:43.296	ERROR	logger/logger.go:87	客户订单异常
+2020-06-01 16:26:43.296	ERROR	logger/logger.go:87	客户订单异常
diff --git a/models/live_config.go b/models/live_config.go
index 7ac18f9..42b3344 100644
--- a/models/live_config.go
+++ b/models/live_config.go
@@ -57,6 +57,6 @@ func (t *LiveConfig) Like(aid interface{}) (int64, error) {
 }
 
 func (t *LiveConfig) HaveModule(module string) bool {
-	exist, _ := core.GetXormAuto().Where("is_delete=0 name=?", module).In("id", t.AdaptationFunc).Exist(&ModuleService{})
+	exist, _ := core.GetXormAuto().Where("is_delete=0 and name=?", module).In("id", t.AdaptationFunc).Exist(&ModuleService{})
 	return exist
 }
diff --git a/models/real_sign_list.go b/models/real_sign_list.go
index 998f481..5934c7b 100644
--- a/models/real_sign_list.go
+++ b/models/real_sign_list.go
@@ -22,11 +22,6 @@ func (t *RealSignList) TableName() string {
 	return RealSignListTN
 }
 
-//func (t *RealSignList) CheckSignIn(uid int64, aid int64) (bool, error) {
-//	exist, err := core.GetXormAuto().Where("is_delete=0 and user_id=? and activity_id=?", uid, aid).Exist(t)
-//	return exist, errors.WithStack(err)
-//}
-
 // 可能使用模糊匹配
 func (t *RealSignList) CheckSignIn(aid int64, ext string) (bool, error) {
 	var sql = fmt.Sprintf("is_delete=0 and activity_id=%d %s", aid, ext)
diff --git a/models/sign_history.go b/models/sign_history.go
index 114ec26..5b34e55 100644
--- a/models/sign_history.go
+++ b/models/sign_history.go
@@ -19,7 +19,7 @@ type SignHistory struct {
 	SignMethod  int       `json:"sign_method" xorm:"not null default 0 comment('1扫码签到2实名签到3人脸签到') TINYINT(1)"`
 	Content     string    `json:"content" xorm:"not null comment('提交审核的内容') TEXT"`
 	Nickname    string    `json:"nickname" xorm:"not null default('') comment('微信昵称') VARCHAR(128)"`
-	Status      int64     `json:"status" xorm:"not null default 0 comment('是否通过审核') TINYINT(1)"`
+	Status      int64     `json:"status" xorm:"not null default 0 comment('是否通过审核[0未通过审核1申请审核2通过审核]') TINYINT(1)"`
 	IsDelete    bool      `json:"is_delete" xorm:"not null default(0) comment('删除') TINYINT(1)"`
 	CreatedAt   time.Time `json:"created_at" xorm:"not null created comment('创建时间') DATETIME"`
 	UpdatedAt   time.Time `json:"updated_at" xorm:"not null updated comment('更新时间') DATETIME"`
@@ -55,7 +55,7 @@ func (t *SignHistory) Insert() error {
 
 func GetSignHistories(aid interface{}, rid interface{}) ([]*SignHistory, error) {
 	results := make([]*SignHistory, 0)
-	err := core.GetXormAuto().Where("is_delete=0 and activity_id=? and rehearsal_id=? and status=0",
+	err := core.GetXormAuto().Where("is_delete=0 and activity_id=? and rehearsal_id=? and status=1",
 		aid, rid).Asc("updated_at").Find(&results)
 	return results, err
 }
diff --git a/models/sign_up.go b/models/sign_up.go
index af6fb0f..a091346 100644
--- a/models/sign_up.go
+++ b/models/sign_up.go
@@ -14,7 +14,7 @@ type SignUp struct {
 	MaxModel          string    `json:"max_model"`
 	OnlyInvitation    int       `json:"only_invitation"`
 	LogoUrl           string    `json:"logo_url"`
-	RealSignJsonForm  string    `json:"real_sign_json_form"`
+	RealSignJsonForm  []string  `json:"real_sign_json_form"`
 	RealSignJsonTitle string    `json:"real_sign_json_title"`
 	SignMethod        int       `json:"sign_method"`
 	RealSignListPath  string    `json:"real_sign_list_path"`
diff --git a/services/pay/order.go b/services/pay/order.go
index b61f843..3b8c83e 100644
--- a/services/pay/order.go
+++ b/services/pay/order.go
@@ -21,10 +21,6 @@ func UnifiedOrder(content, openId string, fee, goodType, userId, activityId, exp
 		return nil, err
 	}
 
-	fmt.Println(client.AppId)
-	fmt.Println(client.MchId)
-	fmt.Println(client.SubMchId)
-
 	outTradeNo := utils.RandomStr(32)
 	nonceStr := utils.RandomStr(32)
 	body := make(map[string]string, 0)
diff --git a/test/order_test.go b/test/order_test.go
index dadfba3..f55e5e7 100644
--- a/test/order_test.go
+++ b/test/order_test.go
@@ -23,3 +23,7 @@ func TestRefund(t *testing.T) {
 	}
 	fmt.Printf("%+v", res)
 }
+
+func TestApi(t *testing.T) {
+
+}
diff --git a/utils/code/code.go b/utils/code/code.go
index 5000227..1b84e3a 100644
--- a/utils/code/code.go
+++ b/utils/code/code.go
@@ -43,7 +43,7 @@ const (
 	MSG_SIGN_HISTORY_EXIST            = 5001  // 签到存在
 	MSG_SIGN_UP_REHEARSAL_LIMIT       = 5002  // 签到彩排人数限制
 	MSG_SIGN_REAL_NOT_EXIST           = 5004  // 实名签到json_list 不存在
-	MSG_SIGN_MODULE_NOT_EXIST         = 5005  // 签到模块
+	MSG_SIGN_HISTORY_NOT_EXIST        = 5005  // 签到不存在
 	MSG_BULLY_SCREEN_SERVER_NOT_EXIST = 6000  // 霸屏 不存在
 	MSG_BARRAGE_SERVER_NOT_EXIST      = 6001  // 弹幕 不存在
 	MSG_REWARD_NOT_EXIST              = 6002  // 打赏不存