Merge branch 'feature/v1.2.1' of https://app.yhyue.com/moapp/message into feature/v1.2.1

handler/activity/jyActivity.go

@@ -30,6 +30,7 @@ type JyActivity struct {
 		SubVip   int `json:"subvip"`
 		Schedule int `json:"schedule"`
 	}
+	DoubleEleven bool //22年双十一活动开关
 }
 
 const (
@@ -72,6 +73,7 @@ func init() {
 	if loadScheduleErr := gcfg.Instance().MustGet(gctx.New(), "jyactivity.scheduleReward").Scan(&MembershipDay.ScheduleReward); loadScheduleErr != nil {
 		logger.Error(fmt.Sprintf("JyBidderPlan 加载进度异常 %v", loadScheduleErr))
 	}
+	MembershipDay.DoubleEleven = gcfg.Instance().MustGet(gctx.New(), "jyactivity.power.switch", false).Bool()
 }
 
 // InActivity 是否在活动时间内

logs/message.log

@@ -1,81 +0,0 @@
-2021/10/19 13:53:14 points.go:55: info  接收到消息 &{E_code:jywx_activity_message E_userId:6103bb722abfa5f4d81bb1d1 E_time:1634622794 E_app:jyapp_node1 E_body:map[]}
-2021/10/19 15:47:02 points.go:55: info  接收到消息 &{E_code:jywx_activity_message E_userId:6103bb722abfa5f4d81bb1d1 E_time:1634629622 E_app:jyapp_node1 E_body:map[]}
-2021/10/19 15:49:31 points.go:55: info  接收到消息 &{E_code:jywx_activity_message E_userId:6103bb722abfa5f4d81bb1d1 E_time:1634629766 E_app:jyapp_node1 E_body:map[]}
-2021/10/19 15:54:46 points.go:55: info  接收到消息 &{E_code:jywx_activity_message E_userId:6103bb722abfa5f4d81bb1d1 E_time:1634630078 E_app:jyapp_node1 E_body:map[]}
-2021/10/19 16:11:02 points.go:55: info  接收到消息 &{E_code:jyweb_article_open E_userId:5d6378301c298a5aac7b5402 E_time:1634631059 E_app:jywx_node E_body:map[]}
-2021/10/19 16:11:02 points.go:132: info  &{E_code:jyweb_article_open E_userId:5d6378301c298a5aac7b5402 E_time:1634631059 E_app:jywx_node E_body:map[]} 已成功增加 5 积分
-2021/10/19 16:15:41 points.go:55: info  接收到消息 &{E_code:jywx_activity_message E_userId:6103bb722abfa5f4d81bb1d1 E_time:1634631341 E_app:jyapp_node1 E_body:map[buy_time:2021-10-19 22:22:22 end_time:2021-11-19 23:59:59 order_code:1234567890 phone:18624906090 product_type:超级订阅一个月]}
-2021/10/19 16:18:14 points.go:55: info  接收到消息 &{E_code:jyweb_article_open E_userId:5d6378301c298a5aac7b5402 E_time:1634631492 E_app:jywx_node E_body:map[]}
-2021/10/19 16:18:15 points.go:132: info  &{E_code:jyweb_article_open E_userId:5d6378301c298a5aac7b5402 E_time:1634631492 E_app:jywx_node E_body:map[]} 已成功增加 5 积分
-2021/10/19 16:26:38 points.go:55: info  接收到消息 &{E_code:jyweb_article_open E_userId:5d6378301c298a5aac7b5402 E_time:1634631995 E_app:jywx_node E_body:map[]}
-2021/10/19 16:26:38 points.go:132: info  &{E_code:jyweb_article_open E_userId:5d6378301c298a5aac7b5402 E_time:1634631995 E_app:jywx_node E_body:map[]} 已成功增加 5 积分
-2021/10/19 16:34:22 points.go:55: info  接收到消息 &{E_code:jyweb_article_open E_userId:5d6378301c298a5aac7b5402 E_time:1634632460 E_app:jywx_node E_body:map[]}
-2021/10/19 16:34:22 points.go:111: info  &{E_code:jyweb_article_open E_userId:5d6378301c298a5aac7b5402 E_time:1634632460 E_app:jywx_node E_body:map[]} 超过一天最大次数 5 限制,不再增加积分
-2021/10/19 16:35:49 points.go:55: info  接收到消息 &{E_code:jywx_activity_message E_userId:6103bb722abfa5f4d81bb1d1 E_time:1634632549 E_app:jyapp_node1 E_body:map[buy_time:2021-10-19 22:22:22 end_time:2021-11-19 23:59:59 order_code:1234567890 phone:18624906090 product_type:超级订阅一个月]}
-2021/10/19 16:36:19 points.go:55: info  接收到消息 &{E_code:jywx_activity_message E_userId:6103bb722abfa5f4d81bb1d1 E_time:1634632579 E_app:jyapp_node1 E_body:map[buy_time:2021-10-19 22:22:22 end_time:2021-11-19 23:59:59 order_code:1234567890 phone:18624906090 product_type:超级订阅一个月]}
-2021/10/19 16:37:20 points.go:55: info  接收到消息 &{E_code:jyweb_article_open E_userId:5d6378301c298a5aac7b5402 E_time:1634632638 E_app:jywx_node E_body:map[]}
-2021/10/19 16:37:20 points.go:111: info  &{E_code:jyweb_article_open E_userId:5d6378301c298a5aac7b5402 E_time:1634632638 E_app:jywx_node E_body:map[]} 超过一天最大次数 5 限制,不再增加积分
-2021/10/19 16:38:39 points.go:55: info  接收到消息 &{E_code:jyweb_article_open E_userId:5d6378301c298a5aac7b5402 E_time:1634632716 E_app:jywx_node E_body:map[]}
-2021/10/19 16:38:39 points.go:111: info  &{E_code:jyweb_article_open E_userId:5d6378301c298a5aac7b5402 E_time:1634632716 E_app:jywx_node E_body:map[]} 超过一天最大次数 5 限制,不再增加积分
-2021/10/19 16:40:06 points.go:55: info  接收到消息 &{E_code:jyweb_article_open E_userId:5d6378301c298a5aac7b5402 E_time:1634632803 E_app:jywx_node E_body:map[]}
-2021/10/19 16:40:06 points.go:111: info  &{E_code:jyweb_article_open E_userId:5d6378301c298a5aac7b5402 E_time:1634632803 E_app:jywx_node E_body:map[]} 超过一天最大次数 5 限制,不再增加积分
-2021/10/19 16:42:28 points.go:55: info  接收到消息 &{E_code:jywx_activity_message E_userId:6103bb722abfa5f4d81bb1d1 E_time:1634632948 E_app:jyapp_node1 E_body:map[buy_time:2021-10-19 22:22:22 end_time:2021-11-19 23:59:59 order_code:1234567890 phone:18624906090 product_type:超级订阅一个月]}
-2021/10/19 16:42:33 points.go:55: info  接收到消息 &{E_code:jywx_activity_message E_userId:6103bb722abfa5f4d81bb1d1 E_time:1634632953 E_app:jyapp_node1 E_body:map[buy_time:2021-10-19 22:22:22 end_time:2021-11-19 23:59:59 order_code:1234567890 phone:18624906090 product_type:超级订阅一个月]}
-2021/10/19 16:42:34 points.go:55: info  接收到消息 &{E_code:jywx_activity_message E_userId:6103bb722abfa5f4d81bb1d1 E_time:1634632954 E_app:jyapp_node1 E_body:map[buy_time:2021-10-19 22:22:22 end_time:2021-11-19 23:59:59 order_code:1234567890 phone:18624906090 product_type:超级订阅一个月]}
-2021/10/19 16:42:35 points.go:55: info  接收到消息 &{E_code:jywx_activity_message E_userId:6103bb722abfa5f4d81bb1d1 E_time:1634632955 E_app:jyapp_node1 E_body:map[buy_time:2021-10-19 22:22:22 end_time:2021-11-19 23:59:59 order_code:1234567890 phone:18624906090 product_type:超级订阅一个月]}
-2021/10/19 16:42:37 points.go:55: info  接收到消息 &{E_code:jywx_activity_message E_userId:6103bb722abfa5f4d81bb1d1 E_time:1634632957 E_app:jyapp_node1 E_body:map[buy_time:2021-10-19 22:22:22 end_time:2021-11-19 23:59:59 order_code:1234567890 phone:18624906090 product_type:超级订阅一个月]}
-2021/10/19 16:42:39 points.go:55: info  接收到消息 &{E_code:jywx_activity_message E_userId:6103bb722abfa5f4d81bb1d1 E_time:1634632959 E_app:jyapp_node1 E_body:map[buy_time:2021-10-19 22:22:22 end_time:2021-11-19 23:59:59 order_code:1234567890 phone:18624906090 product_type:超级订阅一个月]}
-2021/10/19 16:53:32 points.go:55: info  接收到消息 &{E_code:jyweb_article_open E_userId:5d6378301c298a5aac7b5402 E_time:1634633609 E_app:jywx_node E_body:map[]}
-2021/10/19 16:53:32 points.go:111: info  &{E_code:jyweb_article_open E_userId:5d6378301c298a5aac7b5402 E_time:1634633609 E_app:jywx_node E_body:map[]} 超过一天最大次数 5 限制,不再增加积分
-2021/10/19 16:54:13 points.go:55: info  接收到消息 &{E_code:jyweb_article_open E_userId:5d6378301c298a5aac7b5402 E_time:1634633650 E_app:jywx_node E_body:map[]}
-2021/10/19 16:54:13 points.go:111: info  &{E_code:jyweb_article_open E_userId:5d6378301c298a5aac7b5402 E_time:1634633650 E_app:jywx_node E_body:map[]} 超过一天最大次数 5 限制,不再增加积分
-2021/10/19 17:02:05 points.go:55: info  接收到消息 &{E_code:jywx_activity_message E_userId:6103bb722abfa5f4d81bb1d1 E_time:1634634125 E_app:jyapp_node1 E_body:map[buy_time:2021-10-19 22:22:22 end_time:2021-11-19 23:59:59 order_code:1234567890 phone:18624906090 product_type:超级订阅一个月]}
-2021/10/19 17:02:05 points.go:55: info  接收到消息 &{E_code:jywx_activity_message E_userId:6103bb722abfa5f4d81bb1d1 E_time:1634634125 E_app:jyapp_node1 E_body:map[buy_time:2021-10-19 22:22:22 end_time:2021-11-19 23:59:59 order_code:1234567890 phone:18624906090 product_type:超级订阅一个月]}
-2022/10/14 16:58:27 handler.go:50: info  接收到消息 &{E_code:jypc_phone_register E_userId:63244875b3030467a7731d1a E_time:1663322230 E_app:jyweb_node2 E_body:map[]}
-2022/10/14 16:58:27 integral.go:48: info  userId:"63244875b3030467a7731d1a" appId:"10000" pointType:1002 point:500 endDate:"2023-09-16 17:57:10" 已成功增加 500 积分
-2022/10/14 16:58:27 handler.go:50: info  接收到消息 &{E_code:jyapp_phone_register E_userId:632accb0d68f952d2d900f75 E_time:1663749296 E_app:jyapp_node1 E_body:map[]}
-2022/10/14 16:58:27 integral.go:48: info  userId:"632accb0d68f952d2d900f75" appId:"10000" pointType:1002 point:500 endDate:"2023-09-21 16:34:56" 已成功增加 500 积分
-2022/10/14 16:58:27 handler.go:50: info  接收到消息 &{E_code:jyapp_wx_register E_userId:6331060aedfddf70485ef856 E_time:1664157194 E_app:jyapp_node1 E_body:map[]}
-2022/10/14 16:58:27 integral.go:48: info  userId:"6331060aedfddf70485ef856" appId:"10000" pointType:1002 point:500 endDate:"2023-09-26 09:53:14" 已成功增加 500 积分
-2022/10/14 16:58:27 handler.go:50: info  接收到消息 &{E_code:jyapp_wx_register E_userId:633109b6edfddf70485ef874 E_time:1664158134 E_app:jyapp_node1 E_body:map[]}
-2022/10/14 16:58:27 integral.go:48: info  userId:"633109b6edfddf70485ef874" appId:"10000" pointType:1002 point:500 endDate:"2023-09-26 10:08:54" 已成功增加 500 积分
-2022/10/14 16:58:27 handler.go:50: info  接收到消息 &{E_code:jyapp_phone_register E_userId:62dfcc6ed692ae1030443b8e E_time:1658834030 E_app:jyapp_node1 E_body:map[]}
-2022/10/14 16:58:27 integral.go:48: info  userId:"62dfcc6ed692ae1030443b8e" appId:"10000" pointType:1002 point:500 endDate:"2023-07-26 19:13:50" 已成功增加 500 积分
-2022/10/14 16:58:27 handler.go:50: info  接收到消息 &{E_code:jyapp_phone_register E_userId:62e0a44cdcd1c56a3a7e94eb E_time:1658889292 E_app:jyapp_node1 E_body:map[]}
-2022/10/14 16:58:27 integral.go:48: info  userId:"62e0a44cdcd1c56a3a7e94eb" appId:"10000" pointType:1002 point:500 endDate:"2023-07-27 10:34:52" 已成功增加 500 积分
-2022/10/14 16:58:27 handler.go:50: info  接收到消息 &{E_code:jyapp_phone_register E_userId:6334ff3ad53b3573db11000a E_time:1664417594 E_app:jyapp_node1 E_body:map[]}
-2022/10/14 16:58:27 integral.go:48: info  userId:"6334ff3ad53b3573db11000a" appId:"10000" pointType:1002 point:500 endDate:"2023-09-29 10:13:14" 已成功增加 500 积分
-2022/10/14 16:58:27 handler.go:50: info  接收到消息 &{E_code:jyapp_phone_register E_userId:62e0ce59d01623ea2d37efb4 E_time:1658900057 E_app:jyapp_node1 E_body:map[]}
-2022/10/14 16:58:27 integral.go:48: info  userId:"62e0ce59d01623ea2d37efb4" appId:"10000" pointType:1002 point:500 endDate:"2023-07-27 13:34:17" 已成功增加 500 积分
-2022/10/14 16:58:27 handler.go:50: info  接收到消息 &{E_code:jyapp_phone_register E_userId:62eb873d214e89fe951e9532 E_time:1659602750 E_app:jyapp_node1 E_body:map[]}
-2022/10/14 16:58:27 integral.go:48: info  userId:"62eb873d214e89fe951e9532" appId:"10000" pointType:1002 point:500 endDate:"2023-08-04 16:45:50" 已成功增加 500 积分
-2022/10/14 16:58:27 handler.go:50: info  接收到消息 &{E_code:jyapp_phone_register E_userId:62ecc1ab03bd39a735f37332 E_time:1659683244 E_app:jyapp_node1 E_body:map[]}
-2022/10/14 16:58:27 integral.go:48: info  userId:"62ecc1ab03bd39a735f37332" appId:"10000" pointType:1002 point:500 endDate:"2023-08-05 15:07:24" 已成功增加 500 积分
-2022/10/14 16:58:27 handler.go:50: info  接收到消息 &{E_code:jyapp_phone_register E_userId:62eccece03bd39a735f37609 E_time:1659686607 E_app:jyapp_node1 E_body:map[]}
-2022/10/14 16:58:27 integral.go:48: info  userId:"62eccece03bd39a735f37609" appId:"10000" pointType:1002 point:500 endDate:"2023-08-05 16:03:27" 已成功增加 500 积分
-2022/10/14 16:58:27 handler.go:50: info  接收到消息 &{E_code:jyapp_phone_register E_userId:62ee054003bd39a735f38673 E_time:1659766081 E_app:jyapp_node1 E_body:map[]}
-2022/10/14 16:58:28 integral.go:48: info  userId:"62ee054003bd39a735f38673" appId:"10000" pointType:1002 point:500 endDate:"2023-08-06 14:08:01" 已成功增加 500 积分
-2022/10/14 16:58:28 handler.go:50: info  接收到消息 &{E_code:jyapp_phone_register E_userId:62f5bb54a572708f4a12abd8 E_time:1660271444 E_app:jyapp_node1 E_body:map[]}
-2022/10/14 16:58:28 integral.go:48: info  userId:"62f5bb54a572708f4a12abd8" appId:"10000" pointType:1002 point:500 endDate:"2023-08-12 10:30:44" 已成功增加 500 积分
-2022/10/14 16:58:28 handler.go:50: info  接收到消息 &{E_code:jyapp_phone_register E_userId:62f5c223a572708f4a12b9ae E_time:1660273187 E_app:jyapp_node1 E_body:map[]}
-2022/10/14 16:58:28 integral.go:48: info  userId:"62f5c223a572708f4a12b9ae" appId:"10000" pointType:1002 point:500 endDate:"2023-08-12 10:59:47" 已成功增加 500 积分
-2022/10/14 16:58:28 handler.go:50: info  接收到消息 &{E_code:jypc_phone_register E_userId:62fdae800728991b203aea48 E_time:1660792449 E_app:jyweb_node2 E_body:map[]}
-2022/10/14 16:58:28 integral.go:48: info  userId:"62fdae800728991b203aea48" appId:"10000" pointType:1002 point:500 endDate:"2023-08-18 11:14:09" 已成功增加 500 积分
-2022/10/14 16:58:28 handler.go:50: info  接收到消息 &{E_code:jypc_phone_register E_userId:62fdd2470728991b203aeb04 E_time:1660801607 E_app:jyweb_node2 E_body:map[]}
-2022/10/14 16:58:28 integral.go:48: info  userId:"62fdd2470728991b203aeb04" appId:"10000" pointType:1002 point:500 endDate:"2023-08-18 13:46:47" 已成功增加 500 积分
-2022/10/14 16:58:28 handler.go:50: info  接收到消息 &{E_code:jypc_phone_register E_userId:62ff01870728991b203aee97 E_time:1660879240 E_app:jyweb_node2 E_body:map[]}
-2022/10/14 16:58:28 integral.go:48: info  userId:"62ff01870728991b203aee97" appId:"10000" pointType:1002 point:500 endDate:"2023-08-19 11:20:40" 已成功增加 500 积分
-2022/10/14 16:58:28 handler.go:50: info  接收到消息 &{E_code:jypc_phone_register E_userId:62ff34c6f24aabedc9d19e9c E_time:1660892358 E_app:jyweb_node2 E_body:map[]}
-2022/10/14 16:58:28 integral.go:48: info  userId:"62ff34c6f24aabedc9d19e9c" appId:"10000" pointType:1002 point:500 endDate:"2023-08-19 14:59:18" 已成功增加 500 积分
-2022/10/14 16:58:28 handler.go:50: info  接收到消息 &{E_code:jyapp_phone_register E_userId:62ff3f1fceddb8edec83079c E_time:1660895007 E_app:jyapp_node1 E_body:map[]}
-2022/10/14 16:58:28 integral.go:48: info  userId:"62ff3f1fceddb8edec83079c" appId:"10000" pointType:1002 point:500 endDate:"2023-08-19 15:43:27" 已成功增加 500 积分
-2022/10/14 16:58:28 handler.go:50: info  接收到消息 &{E_code:jyapp_phone_register E_userId:62ff3f5dceddb8edec83079f E_time:1660895069 E_app:jyapp_node1 E_body:map[]}
-2022/10/14 16:58:28 integral.go:48: info  userId:"62ff3f5dceddb8edec83079f" appId:"10000" pointType:1002 point:500 endDate:"2023-08-19 15:44:29" 已成功增加 500 积分
-2022/10/14 16:58:28 handler.go:50: info  接收到消息 &{E_code:jypc_phone_register E_userId:6305ce6fbf4d58023bea5493 E_time:1661324911 E_app:jyweb_node2 E_body:map[]}
-2022/10/14 16:58:28 integral.go:48: info  userId:"6305ce6fbf4d58023bea5493" appId:"10000" pointType:1002 point:500 endDate:"2023-08-24 15:08:31" 已成功增加 500 积分
-2022/10/14 16:58:28 handler.go:50: info  接收到消息 &{E_code:jydocs_doc_open E_userId:623bd0c0ec4ebdd49c5c5e8e E_time:1661418084 E_app:jywx_node E_body:map[]}
-2022/10/14 16:58:33 integral.go:48: info  userId:"623bd0c0ec4ebdd49c5c5e8e" appId:"10000" pointType:1005 point:5 endDate:"2023-08-25 17:01:24" 已成功增加 5 积分
-2022/10/14 16:58:33 handler.go:50: info  接收到消息 &{E_code:jyapp_wx_register E_userId:630d85758fcbb8a1aa386cbe E_time:1661830518 E_app:jyapp_node1 E_body:map[]}
-2022/10/14 16:58:33 integral.go:48: info  userId:"630d85758fcbb8a1aa386cbe" appId:"10000" pointType:1002 point:500 endDate:"2023-08-30 11:35:18" 已成功增加 500 积分
-2022/10/14 16:58:33 handler.go:50: info  接收到消息 &{E_code:jyapp_phone_register E_userId:630dbceff777cdb7978ac1fc E_time:1661844720 E_app:jyapp_node1 E_body:map[]}
-2022/10/14 16:58:33 integral.go:48: info  userId:"630dbceff777cdb7978ac1fc" appId:"10000" pointType:1002 point:500 endDate:"2023-08-30 15:32:00" 已成功增加 500 积分

services/activity/bidderPlan/services.go

@@ -72,12 +72,23 @@ func (act *Activity) Questionnaire() {
 func (act *Activity) Period() {
 	userId := gconv.String(act.GetSession("userId"))
 	rData, errMsg := func() (map[string]interface{}, error) {
+
+		reqParam := map[string]interface{}{}
+		if err := json.Unmarshal(act.Body(), &reqParam); err != nil {
+			return nil, fmt.Errorf("请求参数异常")
+		}
+		//先满足双十一活动
+		if from := gconv.String(reqParam["from"]); from == "doubleEleven" && activity.MembershipDay.DoubleEleven {
+			return map[string]interface{}{
+				"before": activity.MembershipDay.T1.Unix(),  //预热开始时间
+				"clock":  activity.MembershipDay.DailyClock, //预热活动每天开抢时间
+				"start":  activity.MembershipDay.T2.Unix(),  //活动开始
+				"end":    activity.MembershipDay.Ed.Unix(),  //活动结束
+				"now":    time.Now().Unix(),                 //服务器当前时间戳
+			}, nil
+		}
 		return map[string]interface{}{
-			"before": activity.MembershipDay.T1.Unix(),  //预热开始时间
-			"clock":  activity.MembershipDay.DailyClock, //预热活动每天开抢时间
-			"start":  activity.MembershipDay.T2.Unix(),  //活动开始
-			"end":    activity.MembershipDay.Ed.Unix(),  //活动结束
-			"now":    time.Now().Unix(),                 //服务器当前时间戳
+			"now": time.Now().Unix(), //服务器当前时间戳
 		}, nil
 	}()
 	if errMsg != nil {