From 6703897fb1231785503b793445c60842f97cd4f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A9=99=E5=AD=90?= <454313500@qq.com>
Date: Sun, 10 Nov 2024 20:17:36 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=AE=8C=E5=96=84=E5=B0=8F=E7=A8=8B?=
=?UTF-8?q?=E5=BA=8F=E9=80=9A=E7=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../HttpModels/SubscribeNoticeHttpModel.cs | 12 ++++++++++--
.../WeChatMiniProgramManager.cs | 5 +++--
.../WeChatMiniProgramNoticeEventHandler.cs | 1 +
.../Settings/DigitalCollectiblesSettingProvider.cs | 2 +-
4 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/Yi.Abp.Net8/framework/Yi.Framework.WeChat.MiniProgram/HttpModels/SubscribeNoticeHttpModel.cs b/Yi.Abp.Net8/framework/Yi.Framework.WeChat.MiniProgram/HttpModels/SubscribeNoticeHttpModel.cs
index 77a0f067..52df848c 100644
--- a/Yi.Abp.Net8/framework/Yi.Framework.WeChat.MiniProgram/HttpModels/SubscribeNoticeHttpModel.cs
+++ b/Yi.Abp.Net8/framework/Yi.Framework.WeChat.MiniProgram/HttpModels/SubscribeNoticeHttpModel.cs
@@ -14,7 +14,10 @@ public class SubscribeNoticeRequest
///
public string template_id { get; set; }
-
+ ///
+ /// 跳转页面
+ ///
+ public string page { get; set; }
///
/// 小程序模板消息的数据
@@ -44,7 +47,12 @@ public class SubscribeNoticeInput
/// 小程序模板id
///
public string template_id { get; set; }
-
+
+ ///
+ /// 跳转页面
+ ///
+ public string page { get; set; }
+
///
/// 公众号模板消息的数据
///
diff --git a/Yi.Abp.Net8/framework/Yi.Framework.WeChat.MiniProgram/WeChatMiniProgramManager.cs b/Yi.Abp.Net8/framework/Yi.Framework.WeChat.MiniProgram/WeChatMiniProgramManager.cs
index d5f5685f..8fdfb1b9 100644
--- a/Yi.Abp.Net8/framework/Yi.Framework.WeChat.MiniProgram/WeChatMiniProgramManager.cs
+++ b/Yi.Abp.Net8/framework/Yi.Framework.WeChat.MiniProgram/WeChatMiniProgramManager.cs
@@ -60,10 +60,11 @@ public class WeChatMiniProgramManager : IWeChatMiniProgramManager, ISingletonDep
{
touser = input.touser,
template_id = input.template_id,
+ page = input.page,
data = input.data,
- miniprogram_state = _options.Notice.State??"formal"
+ miniprogram_state = _options.Notice?.State??"formal"
};
- req.template_id=req.template_id?? _options.Notice.TemplateId;
+ req.template_id=req.template_id?? _options.Notice?.TemplateId;
using (HttpClient httpClient = new HttpClient())
{
diff --git a/Yi.Abp.Net8/module/digital-collectibles/Yi.Framework.DigitalCollectibles.Application/WeChatMiniProgramNoticeEventHandler.cs b/Yi.Abp.Net8/module/digital-collectibles/Yi.Framework.DigitalCollectibles.Application/WeChatMiniProgramNoticeEventHandler.cs
index 1713cfa1..00c792e7 100644
--- a/Yi.Abp.Net8/module/digital-collectibles/Yi.Framework.DigitalCollectibles.Application/WeChatMiniProgramNoticeEventHandler.cs
+++ b/Yi.Abp.Net8/module/digital-collectibles/Yi.Framework.DigitalCollectibles.Application/WeChatMiniProgramNoticeEventHandler.cs
@@ -54,6 +54,7 @@ public class WeChatMiniProgramNoticeEventHandler : ILocalEventHandler()
{
//活动名称
diff --git a/Yi.Abp.Net8/module/digital-collectibles/Yi.Framework.DigitalCollectibles.Domain.Shared/Settings/DigitalCollectiblesSettingProvider.cs b/Yi.Abp.Net8/module/digital-collectibles/Yi.Framework.DigitalCollectibles.Domain.Shared/Settings/DigitalCollectiblesSettingProvider.cs
index 3b5f831a..293792ed 100644
--- a/Yi.Abp.Net8/module/digital-collectibles/Yi.Framework.DigitalCollectibles.Domain.Shared/Settings/DigitalCollectiblesSettingProvider.cs
+++ b/Yi.Abp.Net8/module/digital-collectibles/Yi.Framework.DigitalCollectibles.Domain.Shared/Settings/DigitalCollectiblesSettingProvider.cs
@@ -22,7 +22,7 @@ namespace Yi.Abp.Domain.Shared.Settings
new SettingDefinition("MiningMinIntervalSeconds", "3"),
//每次挖到矿的概率--控制爆率
- new SettingDefinition("MiningMinProbability", "0.06"),
+ new SettingDefinition("MiningMinProbability", "0.9"),
//交易税率--控制频繁交易
new SettingDefinition("MarketTaxRate", "0.02"),