From f0ca9fb79a91544c037c55a291be00e8c469bf34 Mon Sep 17 00:00:00 2001
From: liaoxujun@qq.com <liaoxujun@qq.com>
Date: 星期二, 05 三月 2024 12:17:32 +0800
Subject: [PATCH] 经销商注册逻辑
---
CoreCms.Net.IServices/Distribution/ICoreCmsDistributionConditionServices.cs | 2
CoreCms.Net.Repository/Distribution/CoreCmsDistributionRepository.cs | 2
CoreCms.Net.Web.Admin/Controllers/Com/ToolsController.cs | 4
CoreCms.Net.Web.Admin/Controllers/Distribution/CoreCmsDistributionController.cs | 8
CoreCms.Net.Web.WebApi/CoreCms.Net.Web.WebApi.xml | 6
CoreCms.Net.Uni-App/CoreShop/pages/member/distribution/index/index.vue | 2
CoreCms.Net.Web.Admin/wwwroot/views/shop/setting/index.html | 2
CoreCms.Net.Web.Admin/CoreCms.Net.Web.Admin.csproj.user | 1
CoreCms.Net.Web.Admin/Controllers/Distribution/CoreCmsDistributionGradeController.cs | 4
CoreCms.Net.Web.Admin/wwwroot/views/distribution/distributor/edit.html | 6
CoreCms.Net.Services/Agent/CoreCmsAgentServices.cs | 4
CoreCms.Net.Web.Admin/wwwroot/views/good/goods/create.html | 26
CoreCms.Net.Uni-App/CoreShop/pages/member/distribution/panel/panel.vue | 2
CoreCms.Net.Web.Admin/Properties/PublishProfiles/FolderProfile.pubxml.user | 11
CoreCms.Net.Repository/Distribution/CoreCmsDistributionConditionRepository.cs | 2
CoreCms.Net.Web.Admin/Controllers/Distribution/CoreCmsDistributionOrderController.cs | 12
CoreCms.Net.Web.Admin/wwwroot/views/distribution/setting/index.html | 4
CoreCms.Net.Web.Admin/wwwroot/views/distribution/order/details.html | 2
CoreCms.Net.RedisMQ/OrderAgentOrDistributionSubscribe.cs | 14
CoreCms.Net.Web.Admin/appsettings.json | 4
CoreCms.Net.IServices/Distribution/ICoreCmsDistributionOrderServices.cs | 2
CoreCms.Net.Repository/Distribution/CoreCmsDistributionOrderRepository.cs | 2
CoreCms.Net.Utility/bin/Debug/net8.0/CoreCms.Net.Model.xml | 104 +++++-
CoreCms.Net.IServices/Distribution/ICoreCmsDistributionGradeServices.cs | 2
CoreCms.Net.Web.Admin/wwwroot/views/good/goods/edit.html | 22
CoreCms.Net.Model/CoreCms.Net.Model.xml | 104 +++++-
CoreCms.Net.Uni-App/CoreShop/pages/share/jump/jump.vue | 2
CoreCms.Net.Web.WebApi/appsettings.json | 4
CoreCms.Net.IRepository/Distribution/ICoreCmsDistributionRepository.cs | 2
CoreCms.Net.Model/Entities/Distribution/CoreCmsDistribution.cs | 52 ++
CoreCms.Net.Model/ViewModels/DTO/Distribution/DistributionRankingDTO.cs | 4
CoreCms.Net.Web.Admin/wwwroot/views/distribution/grade/edit.html | 2
CoreCms.Net.Web.WebApi/Controllers/DistributionController.cs | 20
.gitignore | 2
CoreCms.Net.Model/Entities/Distribution/CoreCmsDistributionConditionPartial.cs | 2
CoreCms.Net.Web.Admin/wwwroot/views/distribution/grade/index.html | 2
CoreCms.Net.Model/FromBody/FMAgent.cs | 2
CoreCms.Net.Model/FromBody/FMDistribution.cs | 44 ++
CoreCms.Net.Uni-App/CoreShop/pages/member/agent/panel/panel.vue | 2
CoreCms.Net.Web.Admin/wwwroot/views/distribution/grade/create.html | 2
CoreCms.Net.Configuration/GlobalConstVars.cs | 10
CoreCms.Net.Model/Entities/Distribution/CoreCmsDistributionOrder.cs | 12
CoreCms.Net.Model/Entities/Distribution/CoreCmsDistributionGrade.cs | 6
CoreCms.Net.Model/Entities/Distribution/CoreCmsDistributionPartial.cs | 2
CoreCms.Net.Model/bin/Debug/net8.0/CoreCms.Net.Model.xml | 104 +++++-
CoreCms.Net.Services/Distribution/CoreCmsDistributionOrderServices.cs | 4
CoreCms.Net.Model/Entities/Agent/CoreCmsAgentOrderPartial.cs | 6
CoreCms.Net.Configuration/GlobalEnumVars.cs | 6
CoreCms.Net.Web.Admin/wwwroot/views/distribution/distributor/create.html | 6
CoreCms.Net.Web.Admin/wwwroot/views/distribution/distributor/details.html | 2
CoreCms.Net.IRepository/Distribution/ICoreCmsDistributionGradeRepository.cs | 2
CoreCms.Net.IRepository/Distribution/ICoreCmsDistributionConditionRepository.cs | 2
CoreCms.Net.Web.Admin/wwwroot/views/distribution/order/index.html | 6
CoreCms.Net.Model/Entities/Distribution/CoreCmsDistributionCondition.cs | 6
CoreCms.Net.Uni-App/CoreShop/common/request/http.api.js | 6
CoreCms.Net.Web.Admin/CoreCms.Net.Web.Admin.xml | 8
CoreCms.Net.Repository/Distribution/CoreCmsDistributionGradeRepository.cs | 2
CoreCms.Net.Model/Entities/Distribution/CoreCmsDistributionOrderPartial.cs | 6
CoreCms.Net.Web.Admin/Properties/PublishProfiles/FolderProfile.pubxml | 21 +
CoreCms.Net.Web.Admin/wwwroot/views/index.html | 2
CoreCms.Net.Web.Admin/CoreCms.Net.Web.Admin.csproj | 3
CoreCms.Net.Configuration/SystemSettingConstVars.cs | 10
CoreCms.Net.IRepository/Distribution/ICoreCmsDistributionOrderRepository.cs | 2
CoreCms.Net.Configuration/SystemSettingDictionary.cs | 8
CoreCms.Net.Services/Distribution/CoreCmsDistributionServices.cs | 22
CoreCms.Net.Services/User/CoreCmsUserServices.cs | 4
CoreCms.Net.Uni-App/CoreShop/pages/member/agent/myStore/myStore.vue | 2
CoreCms.Net.Web.Admin/wwwroot/views/distribution/distributor/index.html | 8
CoreCms.Net.Uni-App/CoreShop/pages/member/distribution/myStore/myStore.vue | 2
CoreCms.Net.IServices/Distribution/ICoreCmsDistributionServices.cs | 6
CoreCms.Net.Uni-App/CoreShop/pages/member/distribution/commissionDetails/commissionDetails.vue | 2
CoreCms.Net.RedisMQ/OrderFinishCommandSubscribe.cs | 2
CoreCms.Net.Services/Distribution/CoreCmsDistributionConditionServices.cs | 2
CoreCms.Net.Services/Distribution/CoreCmsDistributionGradeServices.cs | 2
74 files changed, 538 insertions(+), 252 deletions(-)
diff --git a/.gitignore b/.gitignore
index 38d9f1c..6eaf211 100644
--- a/.gitignore
+++ b/.gitignore
@@ -51,3 +51,5 @@
CoreCms.Net.Web.WebApi/wwwroot/static/qrCode/weChat/
CoreCms.Net.Web.WebApi/wwwroot/upload/20240229/20240229100418_6365.jpg
CoreCms.Net.Web.WebApi/wwwroot/upload/
+WXCertUtil.exe
+WXCertUtil/
diff --git a/CoreCms.Net.Configuration/GlobalConstVars.cs b/CoreCms.Net.Configuration/GlobalConstVars.cs
index e41fe78..26050a7 100644
--- a/CoreCms.Net.Configuration/GlobalConstVars.cs
+++ b/CoreCms.Net.Configuration/GlobalConstVars.cs
@@ -193,10 +193,10 @@
public const string CacheCoreCmsCart = "CacheCoreCmsCart"; // 璐墿杞﹁〃
public const string CacheCoreCmsClerk = "CacheCoreCmsClerk"; //搴楅摵搴楀憳鍏宠仈琛�
public const string CacheCoreCmsCoupon = "CacheCoreCmsCoupon"; // 浼樻儬鍒歌〃
- public const string CacheCoreCmsDistribution = "CacheCoreCmsDistribution"; // 鍒嗛攢鍟嗚〃
- public const string CacheCoreCmsDistributionCondition = "CacheCoreCmsDistributionCondition"; //鍒嗛攢鍟嗙瓑绾у崌绾ф潯浠�
- public const string CacheCoreCmsDistributionGrade = "CacheCoreCmsDistributionGrade"; // 鍒嗛攢鍟嗙瓑绾ц缃〃
- public const string CacheCoreCmsDistributionOrder = "CacheCoreCmsDistributionOrder"; //鍒嗛攢鍟嗚鍗曡褰曡〃
+ public const string CacheCoreCmsDistribution = "CacheCoreCmsDistribution"; // 缁忛攢鍟嗚〃
+ public const string CacheCoreCmsDistributionCondition = "CacheCoreCmsDistributionCondition"; //缁忛攢鍟嗙瓑绾у崌绾ф潯浠�
+ public const string CacheCoreCmsDistributionGrade = "CacheCoreCmsDistributionGrade"; // 缁忛攢鍟嗙瓑绾ц缃〃
+ public const string CacheCoreCmsDistributionOrder = "CacheCoreCmsDistributionOrder"; //缁忛攢鍟嗚鍗曡褰曡〃
public const string CacheCoreCmsDistributionResult = "CacheCoreCmsDistributionResult"; // 绛夌骇浣ｉ噾琛�
public const string CacheCoreCmsErrorMessageLog = "CacheCoreCmsErrorMessageLog"; //鍚庡彴寮傚父閿欒琛�
public const string CacheCoreCmsForm = "CacheCoreCmsForm"; //琛ㄥ崟
@@ -364,7 +364,7 @@
/// <summary>
- /// 璁㈠崟瀹岀粨鍚庤蛋浠ｇ悊鎴栧垎閿�鍟嗘彁鎴愬鐞�
+ /// 璁㈠崟瀹岀粨鍚庤蛋浠ｇ悊鎴栫粡閿�鍟嗘彁鎴愬鐞�
/// </summary>
public const string OrderAgentOrDistribution = "OrderAgentOrDistributionQueue";
/// <summary>
diff --git a/CoreCms.Net.Configuration/GlobalEnumVars.cs b/CoreCms.Net.Configuration/GlobalEnumVars.cs
index ea958e7..a7e4ab5 100644
--- a/CoreCms.Net.Configuration/GlobalEnumVars.cs
+++ b/CoreCms.Net.Configuration/GlobalEnumVars.cs
@@ -2294,7 +2294,7 @@
#region 鍒嗛攢璁剧疆
/// <summary>
- /// 鍒嗛攢鍟嗙敵璇峰鏍哥姸鎬�
+ /// 缁忛攢鍟嗙敵璇峰鏍哥姸鎬�
/// </summary>
public enum DistributionVerifyStatus
{
@@ -2315,7 +2315,7 @@
VerifyRefuse = 3,
}
/// <summary>
- /// 鍒嗛攢鍟嗚鍗曡褰曡〃鏄惁缁撶畻鐘舵��
+ /// 缁忛攢鍟嗚鍗曡褰曡〃鏄惁缁撶畻鐘舵��
/// </summary>
public enum DistributionOrderSettlementStatus
@@ -2431,7 +2431,7 @@
}
/// <summary>
- /// 鎴愪负鍒嗛攢鍟嗘潯浠�
+ /// 鎴愪负缁忛攢鍟嗘潯浠�
/// </summary>
public enum DistributionConditionType
{
diff --git a/CoreCms.Net.Configuration/SystemSettingConstVars.cs b/CoreCms.Net.Configuration/SystemSettingConstVars.cs
index 1fa7a9d..0d14efa 100644
--- a/CoreCms.Net.Configuration/SystemSettingConstVars.cs
+++ b/CoreCms.Net.Configuration/SystemSettingConstVars.cs
@@ -123,7 +123,7 @@
/// </summary>
public const string OpenDistribution = "openDistribution";
/// <summary>
- /// 鐢ㄦ埛椤荤煡锛氭垚涓哄垎閿�鍟嗗悗锛屽彲浠ヨ幏鍙栦剑閲戯紝鐢ㄦ埛鍙彲琚帹鑽愪竴娆★紝瓒婃棭鎺ㄨ崘瓒婅繑鍒╄秺澶氬摝銆�
+ /// 鐢ㄦ埛椤荤煡锛氭垚涓虹粡閿�鍟嗗悗锛屽彲浠ヨ幏鍙栦剑閲戯紝鐢ㄦ埛鍙彲琚帹鑽愪竴娆★紝瓒婃棭鎺ㄨ崘瓒婅繑鍒╄秺澶氬摝銆�
/// </summary>
public const string DistributionNotes = "distributionNotes";
/// <summary>
@@ -151,19 +151,19 @@
/// </summary>
public const string DistributionLevel = "distributionLevel";
/// <summary>
- /// 鎴愪负鍒嗛攢鍟嗘潯浠讹細1鏃犳潯浠�(闇�瑕佸鏍�),2鐢宠(闇�瑕佸鏍�),3鏃犳潯浠�,4娉ㄥ唽璐﹀彿鑷姩寮�閫�
+ /// 鎴愪负缁忛攢鍟嗘潯浠讹細1鏃犳潯浠�(闇�瑕佸鏍�),2鐢宠(闇�瑕佸鏍�),3鏃犳潯浠�,4娉ㄥ唽璐﹀彿鑷姩寮�閫�
/// </summary>
public const string DistributionType = "distributionType";
/// <summary>
- /// 娑堣垂鑷姩鎴愪负鍒嗛攢鍟嗭細鍏�
+ /// 娑堣垂鑷姩鎴愪负缁忛攢鍟嗭細鍏�
/// </summary>
public const string DistributionMoney = "distributionMoney";
/// <summary>
- /// 璐拱鍟嗗搧鎴愪负鍒嗛攢鍟嗭細1鍏抽棴锛�2浠绘剰鍟嗗搧锛�3鎸囧畾鍟嗗搧
+ /// 璐拱鍟嗗搧鎴愪负缁忛攢鍟嗭細1鍏抽棴锛�2浠绘剰鍟嗗搧锛�3鎸囧畾鍟嗗搧
/// </summary>
public const string DistributionGoods = "distributionGoods";
/// <summary>
- /// 璐拱鍟嗗搧鎴愪负鍒嗛攢鍟嗘寚瀹氬晢鍝佸簭鍒楀彿
+ /// 璐拱鍟嗗搧鎴愪负缁忛攢鍟嗘寚瀹氬晢鍝佸簭鍒楀彿
/// </summary>
public const string DistributionGoodsId = "distributionGoodsId";
/// <summary>
diff --git a/CoreCms.Net.Configuration/SystemSettingDictionary.cs b/CoreCms.Net.Configuration/SystemSettingDictionary.cs
index 345127b..a35e1c7 100644
--- a/CoreCms.Net.Configuration/SystemSettingDictionary.cs
+++ b/CoreCms.Net.Configuration/SystemSettingDictionary.cs
@@ -115,10 +115,10 @@
di.Add(SystemSettingConstVars.DistributionLevel, new DictionaryKeyValues() { sKey = "鍒嗛攢灞傜骇", sValue = "2" });
- di.Add(SystemSettingConstVars.DistributionType, new DictionaryKeyValues() { sKey = "鎴愪负鍒嗛攢鍟嗘潯浠�", sValue = "1" });
- di.Add(SystemSettingConstVars.DistributionMoney, new DictionaryKeyValues() { sKey = "娑堣垂鑷姩鎴愪负鍒嗛攢鍟�", sValue = "100" });
- di.Add(SystemSettingConstVars.DistributionGoods, new DictionaryKeyValues() { sKey = "璐拱鍟嗗搧鎴愪负鍒嗛攢鍟�", sValue = "1" });
- di.Add(SystemSettingConstVars.DistributionGoodsId, new DictionaryKeyValues() { sKey = "璐拱鍟嗗搧鎴愪负鍒嗛攢鍟嗘寚瀹氬晢鍝佸簭鍒楀彿", sValue = "0" });
+ di.Add(SystemSettingConstVars.DistributionType, new DictionaryKeyValues() { sKey = "鎴愪负缁忛攢鍟嗘潯浠�", sValue = "1" });
+ di.Add(SystemSettingConstVars.DistributionMoney, new DictionaryKeyValues() { sKey = "娑堣垂鑷姩鎴愪负缁忛攢鍟�", sValue = "100" });
+ di.Add(SystemSettingConstVars.DistributionGoods, new DictionaryKeyValues() { sKey = "璐拱鍟嗗搧鎴愪负缁忛攢鍟�", sValue = "1" });
+ di.Add(SystemSettingConstVars.DistributionGoodsId, new DictionaryKeyValues() { sKey = "璐拱鍟嗗搧鎴愪负缁忛攢鍟嗘寚瀹氬晢鍝佸簭鍒楀彿", sValue = "0" });
//閭�璇峰ソ鍙�
di.Add(SystemSettingConstVars.CommissionType, new DictionaryKeyValues() { sKey = "浣ｉ噾绫诲瀷", sValue = "1" });
diff --git a/CoreCms.Net.IRepository/Distribution/ICoreCmsDistributionConditionRepository.cs b/CoreCms.Net.IRepository/Distribution/ICoreCmsDistributionConditionRepository.cs
index 2921412..230af7d 100644
--- a/CoreCms.Net.IRepository/Distribution/ICoreCmsDistributionConditionRepository.cs
+++ b/CoreCms.Net.IRepository/Distribution/ICoreCmsDistributionConditionRepository.cs
@@ -20,7 +20,7 @@
namespace CoreCms.Net.IRepository
{
/// <summary>
- /// 鍒嗛攢鍟嗙瓑绾у崌绾ф潯浠� 宸ュ巶鎺ュ彛
+ /// 缁忛攢鍟嗙瓑绾у崌绾ф潯浠� 宸ュ巶鎺ュ彛
/// </summary>
public interface ICoreCmsDistributionConditionRepository : IBaseRepository<CoreCmsDistributionCondition>
{
diff --git a/CoreCms.Net.IRepository/Distribution/ICoreCmsDistributionGradeRepository.cs b/CoreCms.Net.IRepository/Distribution/ICoreCmsDistributionGradeRepository.cs
index b95feb4..3d7a6d2 100644
--- a/CoreCms.Net.IRepository/Distribution/ICoreCmsDistributionGradeRepository.cs
+++ b/CoreCms.Net.IRepository/Distribution/ICoreCmsDistributionGradeRepository.cs
@@ -11,7 +11,7 @@
namespace CoreCms.Net.IRepository
{
/// <summary>
- /// 鍒嗛攢鍟嗙瓑绾ц缃〃 宸ュ巶鎺ュ彛
+ /// 缁忛攢鍟嗙瓑绾ц缃〃 宸ュ巶鎺ュ彛
/// </summary>
public interface ICoreCmsDistributionGradeRepository : IBaseRepository<CoreCmsDistributionGrade>
{
diff --git a/CoreCms.Net.IRepository/Distribution/ICoreCmsDistributionOrderRepository.cs b/CoreCms.Net.IRepository/Distribution/ICoreCmsDistributionOrderRepository.cs
index fccae68..216638b 100644
--- a/CoreCms.Net.IRepository/Distribution/ICoreCmsDistributionOrderRepository.cs
+++ b/CoreCms.Net.IRepository/Distribution/ICoreCmsDistributionOrderRepository.cs
@@ -11,7 +11,7 @@
namespace CoreCms.Net.IRepository
{
/// <summary>
- /// 鍒嗛攢鍟嗚鍗曡褰曡〃 宸ュ巶鎺ュ彛
+ /// 缁忛攢鍟嗚鍗曡褰曡〃 宸ュ巶鎺ュ彛
/// </summary>
public interface ICoreCmsDistributionOrderRepository : IBaseRepository<CoreCmsDistributionOrder>
{
diff --git a/CoreCms.Net.IRepository/Distribution/ICoreCmsDistributionRepository.cs b/CoreCms.Net.IRepository/Distribution/ICoreCmsDistributionRepository.cs
index 75313e4..15f881f 100644
--- a/CoreCms.Net.IRepository/Distribution/ICoreCmsDistributionRepository.cs
+++ b/CoreCms.Net.IRepository/Distribution/ICoreCmsDistributionRepository.cs
@@ -11,7 +11,7 @@
namespace CoreCms.Net.IRepository
{
/// <summary>
- /// 鍒嗛攢鍟嗚〃 宸ュ巶鎺ュ彛
+ /// 缁忛攢鍟嗚〃 宸ュ巶鎺ュ彛
/// </summary>
public interface ICoreCmsDistributionRepository : IBaseRepository<CoreCmsDistribution>
{
diff --git a/CoreCms.Net.IServices/Distribution/ICoreCmsDistributionConditionServices.cs b/CoreCms.Net.IServices/Distribution/ICoreCmsDistributionConditionServices.cs
index c1a26be..de59971 100644
--- a/CoreCms.Net.IServices/Distribution/ICoreCmsDistributionConditionServices.cs
+++ b/CoreCms.Net.IServices/Distribution/ICoreCmsDistributionConditionServices.cs
@@ -20,7 +20,7 @@
namespace CoreCms.Net.IServices
{
/// <summary>
- /// 鍒嗛攢鍟嗙瓑绾у崌绾ф潯浠� 鏈嶅姟宸ュ巶鎺ュ彛
+ /// 缁忛攢鍟嗙瓑绾у崌绾ф潯浠� 鏈嶅姟宸ュ巶鎺ュ彛
/// </summary>
public interface ICoreCmsDistributionConditionServices : IBaseServices<CoreCmsDistributionCondition>
{
diff --git a/CoreCms.Net.IServices/Distribution/ICoreCmsDistributionGradeServices.cs b/CoreCms.Net.IServices/Distribution/ICoreCmsDistributionGradeServices.cs
index 3ac4016..56d2674 100644
--- a/CoreCms.Net.IServices/Distribution/ICoreCmsDistributionGradeServices.cs
+++ b/CoreCms.Net.IServices/Distribution/ICoreCmsDistributionGradeServices.cs
@@ -20,7 +20,7 @@
namespace CoreCms.Net.IServices
{
/// <summary>
- /// 鍒嗛攢鍟嗙瓑绾ц缃〃 鏈嶅姟宸ュ巶鎺ュ彛
+ /// 缁忛攢鍟嗙瓑绾ц缃〃 鏈嶅姟宸ュ巶鎺ュ彛
/// </summary>
public interface ICoreCmsDistributionGradeServices : IBaseServices<CoreCmsDistributionGrade>
{
diff --git a/CoreCms.Net.IServices/Distribution/ICoreCmsDistributionOrderServices.cs b/CoreCms.Net.IServices/Distribution/ICoreCmsDistributionOrderServices.cs
index f996774..8c91b64 100644
--- a/CoreCms.Net.IServices/Distribution/ICoreCmsDistributionOrderServices.cs
+++ b/CoreCms.Net.IServices/Distribution/ICoreCmsDistributionOrderServices.cs
@@ -20,7 +20,7 @@
namespace CoreCms.Net.IServices
{
/// <summary>
- /// 鍒嗛攢鍟嗚鍗曡褰曡〃 鏈嶅姟宸ュ巶鎺ュ彛
+ /// 缁忛攢鍟嗚鍗曡褰曡〃 鏈嶅姟宸ュ巶鎺ュ彛
/// </summary>
public interface ICoreCmsDistributionOrderServices : IBaseServices<CoreCmsDistributionOrder>
{
diff --git a/CoreCms.Net.IServices/Distribution/ICoreCmsDistributionServices.cs b/CoreCms.Net.IServices/Distribution/ICoreCmsDistributionServices.cs
index 2c07150..4f1bca5 100644
--- a/CoreCms.Net.IServices/Distribution/ICoreCmsDistributionServices.cs
+++ b/CoreCms.Net.IServices/Distribution/ICoreCmsDistributionServices.cs
@@ -21,12 +21,12 @@
namespace CoreCms.Net.IServices
{
/// <summary>
- /// 鍒嗛攢鍟嗚〃 鏈嶅姟宸ュ巶鎺ュ彛
+ /// 缁忛攢鍟嗚〃 鏈嶅姟宸ュ巶鎺ュ彛
/// </summary>
public interface ICoreCmsDistributionServices : IBaseServices<CoreCmsDistribution>
{
/// <summary>
- /// 鑾峰彇鍒嗛攢鍟嗕俊鎭�
+ /// 鑾峰彇缁忛攢鍟嗕俊鎭�
/// </summary>
/// <param name="userId">鐢ㄦ埛id</param>
/// <param name="checkStatus">鏄惁妫�鏌ユ弧瓒虫潯浠�</param>
@@ -69,7 +69,7 @@
Task<WebApiCallBack> GetGradeAndCommission(int userId);
- //妫�鏌ユ槸鍚﹀彲浠ユ垚涓哄垎閿�鍟�
+ //妫�鏌ユ槸鍚﹀彲浠ユ垚涓虹粡閿�鍟�
Task CheckCondition(Dictionary<string, DictionaryKeyValues> allConfigs, CoreCmsDistribution info,
int userId = 0);
diff --git a/CoreCms.Net.Model/CoreCms.Net.Model.xml b/CoreCms.Net.Model/CoreCms.Net.Model.xml
index 1d424b9..cd4e4dc 100644
--- a/CoreCms.Net.Model/CoreCms.Net.Model.xml
+++ b/CoreCms.Net.Model/CoreCms.Net.Model.xml
@@ -405,7 +405,7 @@
浠ｇ悊鍟嗚鍗曡褰曡〃
</summary>
<summary>
- 鍒嗛攢鍟嗚鍗曡褰曡〃
+ 缁忛攢鍟嗚鍗曡褰曡〃
</summary>
</member>
<member name="M:CoreCms.Net.Model.Entities.CoreCmsAgentOrder.#ctor">
@@ -470,7 +470,7 @@
</member>
<member name="P:CoreCms.Net.Model.Entities.CoreCmsAgentOrder.distributorName">
<summary>
- 鍒嗛攢鍟�
+ 缁忛攢鍟�
</summary>
</member>
<member name="P:CoreCms.Net.Model.Entities.CoreCmsAgentOrder.goodsAmount">
@@ -1924,15 +1924,15 @@
</member>
<member name="T:CoreCms.Net.Model.Entities.CoreCmsDistribution">
<summary>
- 鍒嗛攢鍟嗚〃
+ 缁忛攢鍟嗚〃
</summary>
<summary>
- 鍒嗛攢鍟嗚〃
+ 缁忛攢鍟嗚〃
</summary>
</member>
<member name="M:CoreCms.Net.Model.Entities.CoreCmsDistribution.#ctor">
<summary>
- 鍒嗛攢鍟嗚〃
+ 缁忛攢鍟嗚〃
</summary>
</member>
<member name="P:CoreCms.Net.Model.Entities.CoreCmsDistribution.id">
@@ -1947,7 +1947,7 @@
</member>
<member name="P:CoreCms.Net.Model.Entities.CoreCmsDistribution.name">
<summary>
- 鍒嗛攢鍟嗗悕绉�
+ 缁忛攢鍟嗗悕绉�
</summary>
</member>
<member name="P:CoreCms.Net.Model.Entities.CoreCmsDistribution.gradeId">
@@ -2013,6 +2013,26 @@
<member name="P:CoreCms.Net.Model.Entities.CoreCmsDistribution.isDelete">
<summary>
鏄惁鍒犻櫎
+ </summary>
+ </member>
+ <member name="P:CoreCms.Net.Model.Entities.CoreCmsDistribution.areaCode">
+ <summary>
+ 搴楅摵鍖哄煙
+ </summary>
+ </member>
+ <member name="P:CoreCms.Net.Model.Entities.CoreCmsDistribution.address">
+ <summary>
+ 鍦板潃璇︽儏
+ </summary>
+ </member>
+ <member name="P:CoreCms.Net.Model.Entities.CoreCmsDistribution.sales">
+ <summary>
+ 骞撮攢鍞
+ </summary>
+ </member>
+ <member name="P:CoreCms.Net.Model.Entities.CoreCmsDistribution.profession">
+ <summary>
+ 鎵�灞炶涓�
</summary>
</member>
<member name="P:CoreCms.Net.Model.Entities.CoreCmsDistribution.TotalSettlementAmount">
@@ -2092,15 +2112,15 @@
</member>
<member name="T:CoreCms.Net.Model.Entities.CoreCmsDistributionCondition">
<summary>
- 鍒嗛攢鍟嗙瓑绾у崌绾ф潯浠�
+ 缁忛攢鍟嗙瓑绾у崌绾ф潯浠�
</summary>
<summary>
- 鍒嗛攢鍟嗙瓑绾у崌绾ф潯浠�
+ 缁忛攢鍟嗙瓑绾у崌绾ф潯浠�
</summary>
</member>
<member name="M:CoreCms.Net.Model.Entities.CoreCmsDistributionCondition.#ctor">
<summary>
- 鍒嗛攢鍟嗙瓑绾у崌绾ф潯浠�
+ 缁忛攢鍟嗙瓑绾у崌绾ф潯浠�
</summary>
</member>
<member name="P:CoreCms.Net.Model.Entities.CoreCmsDistributionCondition.id">
@@ -2130,12 +2150,12 @@
</member>
<member name="T:CoreCms.Net.Model.Entities.CoreCmsDistributionGrade">
<summary>
- 鍒嗛攢鍟嗙瓑绾ц缃〃
+ 缁忛攢鍟嗙瓑绾ц缃〃
</summary>
</member>
<member name="M:CoreCms.Net.Model.Entities.CoreCmsDistributionGrade.#ctor">
<summary>
- 鍒嗛攢鍟嗙瓑绾ц缃〃
+ 缁忛攢鍟嗙瓑绾ц缃〃
</summary>
</member>
<member name="P:CoreCms.Net.Model.Entities.CoreCmsDistributionGrade.id">
@@ -2170,15 +2190,15 @@
</member>
<member name="T:CoreCms.Net.Model.Entities.CoreCmsDistributionOrder">
<summary>
- 鍒嗛攢鍟嗚鍗曡褰曡〃
+ 缁忛攢鍟嗚鍗曡褰曡〃
</summary>
<summary>
- 鍒嗛攢鍟嗚鍗曡褰曡〃
+ 缁忛攢鍟嗚鍗曡褰曡〃
</summary>
</member>
<member name="M:CoreCms.Net.Model.Entities.CoreCmsDistributionOrder.#ctor">
<summary>
- 鍒嗛攢鍟嗚鍗曡褰曡〃
+ 缁忛攢鍟嗚鍗曡褰曡〃
</summary>
</member>
<member name="P:CoreCms.Net.Model.Entities.CoreCmsDistributionOrder.id">
@@ -2188,7 +2208,7 @@
</member>
<member name="P:CoreCms.Net.Model.Entities.CoreCmsDistributionOrder.userId">
<summary>
- 鐢ㄦ埛鍒嗛攢鍟唅d
+ 鐢ㄦ埛缁忛攢鍟唅d
</summary>
</member>
<member name="P:CoreCms.Net.Model.Entities.CoreCmsDistributionOrder.buyUserId">
@@ -2243,7 +2263,7 @@
</member>
<member name="P:CoreCms.Net.Model.Entities.CoreCmsDistributionOrder.distributorName">
<summary>
- 鍒嗛攢鍟�
+ 缁忛攢鍟�
</summary>
</member>
<member name="P:CoreCms.Net.Model.Entities.CoreCmsDistributionOrder.goodsAmount">
@@ -9068,7 +9088,7 @@
</member>
<member name="P:CoreCms.Net.Model.FromBody.FMAdminCreateAgentPost.name">
<summary>
- 鍒嗛攢鍟嗗悕绉�
+ 缁忛攢鍟嗗悕绉�
</summary>
</member>
<member name="P:CoreCms.Net.Model.FromBody.FMAdminCreateAgentPost.gradeId">
@@ -9253,7 +9273,47 @@
</member>
<member name="T:CoreCms.Net.Model.FromBody.FMDistributionApply">
<summary>
- 鐢宠鎴愪负鍒嗛攢鍟嗘帴鍙ｆ彁浜ゅ弬鏁�
+ 鐢宠鎴愪负缁忛攢鍟嗘帴鍙ｆ彁浜ゅ弬鏁�
+ </summary>
+ </member>
+ <member name="P:CoreCms.Net.Model.FromBody.FMDistributionApply.mobile">
+ <summary>
+ 鐢佃瘽
+ </summary>
+ </member>
+ <member name="P:CoreCms.Net.Model.FromBody.FMDistributionApply.name">
+ <summary>
+ 鑱旂郴浜�
+ </summary>
+ </member>
+ <member name="P:CoreCms.Net.Model.FromBody.FMDistributionApply.storeName">
+ <summary>
+ 搴楅摵鍚嶇О
+ </summary>
+ </member>
+ <member name="P:CoreCms.Net.Model.FromBody.FMDistributionApply.areaCode">
+ <summary>
+ 鍦板潃鍒嗙被
+ </summary>
+ </member>
+ <member name="P:CoreCms.Net.Model.FromBody.FMDistributionApply.address">
+ <summary>
+ 璇︾粏鍦板潃
+ </summary>
+ </member>
+ <member name="P:CoreCms.Net.Model.FromBody.FMDistributionApply.storeBanner">
+ <summary>
+ 搴楅摵闂ㄥご
+ </summary>
+ </member>
+ <member name="P:CoreCms.Net.Model.FromBody.FMDistributionApply.sales">
+ <summary>
+ 閿�鍞搴�
+ </summary>
+ </member>
+ <member name="P:CoreCms.Net.Model.FromBody.FMDistributionApply.profession">
+ <summary>
+ 鎵�灞炶涓�
</summary>
</member>
<member name="T:CoreCms.Net.Model.FromBody.FMSetDistributionStorePost">
@@ -9263,7 +9323,7 @@
</member>
<member name="T:CoreCms.Net.Model.FromBody.FMAdminCreateDistributionPost">
<summary>
- 鍚庡彴鍒涘缓鍒嗛攢鍟嗘彁浜ゅ弬鏁�
+ 鍚庡彴鍒涘缓缁忛攢鍟嗘彁浜ゅ弬鏁�
</summary>
</member>
<member name="P:CoreCms.Net.Model.FromBody.FMAdminCreateDistributionPost.registeredUserMobile">
@@ -9278,7 +9338,7 @@
</member>
<member name="P:CoreCms.Net.Model.FromBody.FMAdminCreateDistributionPost.name">
<summary>
- 鍒嗛攢鍟嗗悕绉�
+ 缁忛攢鍟嗗悕绉�
</summary>
</member>
<member name="P:CoreCms.Net.Model.FromBody.FMAdminCreateDistributionPost.gradeId">
@@ -11203,12 +11263,12 @@
</member>
<member name="P:CoreCms.Net.Model.ViewModels.DTO.Distribution.DistributionRankingDTO.id">
<summary>
- 鍒嗛攢鍟嗗簭鍒�
+ 缁忛攢鍟嗗簭鍒�
</summary>
</member>
<member name="P:CoreCms.Net.Model.ViewModels.DTO.Distribution.DistributionRankingDTO.nickname">
<summary>
- 鍒嗛攢鍟嗘樀绉�
+ 缁忛攢鍟嗘樀绉�
</summary>
</member>
<member name="P:CoreCms.Net.Model.ViewModels.DTO.Distribution.DistributionRankingDTO.createtime">
diff --git a/CoreCms.Net.Model/Entities/Agent/CoreCmsAgentOrderPartial.cs b/CoreCms.Net.Model/Entities/Agent/CoreCmsAgentOrderPartial.cs
index f1d907f..1bf6ee5 100644
--- a/CoreCms.Net.Model/Entities/Agent/CoreCmsAgentOrderPartial.cs
+++ b/CoreCms.Net.Model/Entities/Agent/CoreCmsAgentOrderPartial.cs
@@ -16,7 +16,7 @@
namespace CoreCms.Net.Model.Entities
{
/// <summary>
- /// 鍒嗛攢鍟嗚鍗曡褰曡〃
+ /// 缁忛攢鍟嗚鍗曡褰曡〃
/// </summary>
public partial class CoreCmsAgentOrder
{
@@ -36,9 +36,9 @@
public System.String buyUserAvatar { get; set; }
/// <summary>
- /// 鍒嗛攢鍟�
+ /// 缁忛攢鍟�
/// </summary>
- [Display(Name = "鍒嗛攢鍟�")]
+ [Display(Name = "缁忛攢鍟�")]
[SugarColumn(IsIgnore = true)]
public System.String distributorName { get; set; }
diff --git a/CoreCms.Net.Model/Entities/Distribution/CoreCmsDistribution.cs b/CoreCms.Net.Model/Entities/Distribution/CoreCmsDistribution.cs
index 191a1f9..e1d2549 100644
--- a/CoreCms.Net.Model/Entities/Distribution/CoreCmsDistribution.cs
+++ b/CoreCms.Net.Model/Entities/Distribution/CoreCmsDistribution.cs
@@ -13,13 +13,13 @@
namespace CoreCms.Net.Model.Entities
{
/// <summary>
- /// 鍒嗛攢鍟嗚〃
+ /// 缁忛攢鍟嗚〃
/// </summary>
- [SugarTable("CoreCmsDistribution",TableDescription = "鍒嗛攢鍟嗚〃")]
+ [SugarTable("CoreCmsDistribution",TableDescription = "缁忛攢鍟嗚〃")]
public partial class CoreCmsDistribution
{
/// <summary>
- /// 鍒嗛攢鍟嗚〃
+ /// 缁忛攢鍟嗚〃
/// </summary>
public CoreCmsDistribution()
{
@@ -40,10 +40,10 @@
[Required(ErrorMessage = "璇疯緭鍏0}")]
public System.Int32 userId { get; set; }
/// <summary>
- /// 鍒嗛攢鍟嗗悕绉�
+ /// 缁忛攢鍟嗗悕绉�
/// </summary>
- [Display(Name = "鍒嗛攢鍟嗗悕绉�")]
- [SugarColumn(ColumnDescription = "鍒嗛攢鍟嗗悕绉�", IsNullable = true)]
+ [Display(Name = "缁忛攢鍟嗗悕绉�")]
+ [SugarColumn(ColumnDescription = "缁忛攢鍟嗗悕绉�", IsNullable = true)]
[StringLength(255, ErrorMessage = "銆恵0}銆戜笉鑳借秴杩噞1}瀛楃闀垮害")]
public System.String name { get; set; }
/// <summary>
@@ -64,14 +64,14 @@
/// 寰俊鍙�
/// </summary>
[Display(Name = "寰俊鍙�")]
- [SugarColumn(ColumnDescription = "寰俊鍙�", IsNullable = true)]
+ [SugarColumn(ColumnDescription = "寰俊鍙�", IsNullable = false)]
[StringLength(50, ErrorMessage = "銆恵0}銆戜笉鑳借秴杩噞1}瀛楃闀垮害")]
public System.String weixin { get; set; }
/// <summary>
/// qq鍙�
/// </summary>
[Display(Name = "qq鍙�")]
- [SugarColumn(ColumnDescription = "qq鍙�", IsNullable = true)]
+ [SugarColumn(ColumnDescription = "qq鍙�", IsNullable = false)]
[StringLength(50, ErrorMessage = "銆恵0}銆戜笉鑳借秴杩噞1}瀛楃闀垮害")]
public System.String qq { get; set; }
/// <summary>
@@ -85,21 +85,21 @@
/// 搴楅摵Logo
/// </summary>
[Display(Name = "搴楅摵Logo")]
- [SugarColumn(ColumnDescription = "搴楅摵Logo", IsNullable = true)]
+ [SugarColumn(ColumnDescription = "搴楅摵Logo", IsNullable = false)]
[StringLength(255, ErrorMessage = "銆恵0}銆戜笉鑳借秴杩噞1}瀛楃闀垮害")]
public System.String storeLogo { get; set; }
/// <summary>
/// 搴楅摵Banner
/// </summary>
[Display(Name = "搴楅摵Banner")]
- [SugarColumn(ColumnDescription = "搴楅摵Banner", IsNullable = true)]
+ [SugarColumn(ColumnDescription = "搴楅摵Banner", IsNullable = false)]
[StringLength(255, ErrorMessage = "銆恵0}銆戜笉鑳借秴杩噞1}瀛楃闀垮害")]
public System.String storeBanner { get; set; }
/// <summary>
/// 搴楅摵绠�浠�
/// </summary>
[Display(Name = "搴楅摵绠�浠�")]
- [SugarColumn(ColumnDescription = "搴楅摵绠�浠�", IsNullable = true)]
+ [SugarColumn(ColumnDescription = "搴楅摵绠�浠�", IsNullable = false)]
[StringLength(255, ErrorMessage = "銆恵0}銆戜笉鑳借秴杩噞1}瀛楃闀垮害")]
public System.String storeDesc { get; set; }
/// <summary>
@@ -135,5 +135,35 @@
[SugarColumn(ColumnDescription = "鏄惁鍒犻櫎")]
[Required(ErrorMessage = "璇疯緭鍏0}")]
public System.Boolean isDelete { get; set; }
+ /********************************************* 澧炲姞瀛楁 ************************************/
+ /// <summary>
+ /// 搴楅摵鍖哄煙
+ /// </summary>
+ [Display(Name = "搴楅摵鍖哄煙")]
+ [SugarColumn(ColumnDescription = "搴楅摵鍖哄煙" , IsNullable = true)]
+ public string areaCode { get; set; }
+
+ /// <summary>
+ /// 鍦板潃璇︽儏
+ /// </summary>
+ [Display(Name = "鍦板潃璇︽儏")]
+ [SugarColumn(ColumnDescription = "鍦板潃璇︽儏")]
+ public string address { get; set; }
+
+ /// <summary>
+ /// 骞撮攢鍞
+ /// </summary>
+ [Display(Name = "骞撮攢鍞")]
+ [SugarColumn(ColumnDescription = "骞撮攢鍞")]
+ public decimal sales { get; set; } = 0;
+
+
+ /// <summary>
+ /// 鎵�灞炶涓�
+ /// </summary>
+ [Display(Name = "鎵�灞炶涓�")]
+ [SugarColumn(ColumnDescription = "鎵�灞炶涓�")]
+ public string profession { get; set; }
+
}
}
\ No newline at end of file
diff --git a/CoreCms.Net.Model/Entities/Distribution/CoreCmsDistributionCondition.cs b/CoreCms.Net.Model/Entities/Distribution/CoreCmsDistributionCondition.cs
index 5c1a836..989e2e9 100644
--- a/CoreCms.Net.Model/Entities/Distribution/CoreCmsDistributionCondition.cs
+++ b/CoreCms.Net.Model/Entities/Distribution/CoreCmsDistributionCondition.cs
@@ -13,13 +13,13 @@
namespace CoreCms.Net.Model.Entities
{
/// <summary>
- /// 鍒嗛攢鍟嗙瓑绾у崌绾ф潯浠�
+ /// 缁忛攢鍟嗙瓑绾у崌绾ф潯浠�
/// </summary>
- [SugarTable("CoreCmsDistributionCondition",TableDescription = "鍒嗛攢鍟嗙瓑绾у崌绾ф潯浠�")]
+ [SugarTable("CoreCmsDistributionCondition",TableDescription = "缁忛攢鍟嗙瓑绾у崌绾ф潯浠�")]
public partial class CoreCmsDistributionCondition
{
/// <summary>
- /// 鍒嗛攢鍟嗙瓑绾у崌绾ф潯浠�
+ /// 缁忛攢鍟嗙瓑绾у崌绾ф潯浠�
/// </summary>
public CoreCmsDistributionCondition()
{
diff --git a/CoreCms.Net.Model/Entities/Distribution/CoreCmsDistributionConditionPartial.cs b/CoreCms.Net.Model/Entities/Distribution/CoreCmsDistributionConditionPartial.cs
index f070586..d8f3be6 100644
--- a/CoreCms.Net.Model/Entities/Distribution/CoreCmsDistributionConditionPartial.cs
+++ b/CoreCms.Net.Model/Entities/Distribution/CoreCmsDistributionConditionPartial.cs
@@ -14,7 +14,7 @@
namespace CoreCms.Net.Model.Entities
{
/// <summary>
- /// 鍒嗛攢鍟嗙瓑绾у崌绾ф潯浠�
+ /// 缁忛攢鍟嗙瓑绾у崌绾ф潯浠�
/// </summary>
public partial class CoreCmsDistributionCondition
{
diff --git a/CoreCms.Net.Model/Entities/Distribution/CoreCmsDistributionGrade.cs b/CoreCms.Net.Model/Entities/Distribution/CoreCmsDistributionGrade.cs
index c187942..200e8a2 100644
--- a/CoreCms.Net.Model/Entities/Distribution/CoreCmsDistributionGrade.cs
+++ b/CoreCms.Net.Model/Entities/Distribution/CoreCmsDistributionGrade.cs
@@ -13,13 +13,13 @@
namespace CoreCms.Net.Model.Entities
{
/// <summary>
- /// 鍒嗛攢鍟嗙瓑绾ц缃〃
+ /// 缁忛攢鍟嗙瓑绾ц缃〃
/// </summary>
- [SugarTable("CoreCmsDistributionGrade",TableDescription = "鍒嗛攢鍟嗙瓑绾ц缃〃")]
+ [SugarTable("CoreCmsDistributionGrade",TableDescription = "缁忛攢鍟嗙瓑绾ц缃〃")]
public partial class CoreCmsDistributionGrade
{
/// <summary>
- /// 鍒嗛攢鍟嗙瓑绾ц缃〃
+ /// 缁忛攢鍟嗙瓑绾ц缃〃
/// </summary>
public CoreCmsDistributionGrade()
{
diff --git a/CoreCms.Net.Model/Entities/Distribution/CoreCmsDistributionOrder.cs b/CoreCms.Net.Model/Entities/Distribution/CoreCmsDistributionOrder.cs
index 465ab46..dbb7561 100644
--- a/CoreCms.Net.Model/Entities/Distribution/CoreCmsDistributionOrder.cs
+++ b/CoreCms.Net.Model/Entities/Distribution/CoreCmsDistributionOrder.cs
@@ -13,13 +13,13 @@
namespace CoreCms.Net.Model.Entities
{
/// <summary>
- /// 鍒嗛攢鍟嗚鍗曡褰曡〃
+ /// 缁忛攢鍟嗚鍗曡褰曡〃
/// </summary>
- [SugarTable("CoreCmsDistributionOrder",TableDescription = "鍒嗛攢鍟嗚鍗曡褰曡〃")]
+ [SugarTable("CoreCmsDistributionOrder",TableDescription = "缁忛攢鍟嗚鍗曡褰曡〃")]
public partial class CoreCmsDistributionOrder
{
/// <summary>
- /// 鍒嗛攢鍟嗚鍗曡褰曡〃
+ /// 缁忛攢鍟嗚鍗曡褰曡〃
/// </summary>
public CoreCmsDistributionOrder()
{
@@ -33,10 +33,10 @@
[Required(ErrorMessage = "璇疯緭鍏0}")]
public System.Int32 id { get; set; }
/// <summary>
- /// 鐢ㄦ埛鍒嗛攢鍟唅d
+ /// 鐢ㄦ埛缁忛攢鍟唅d
/// </summary>
- [Display(Name = "鐢ㄦ埛鍒嗛攢鍟唅d")]
- [SugarColumn(ColumnDescription = "鐢ㄦ埛鍒嗛攢鍟唅d")]
+ [Display(Name = "鐢ㄦ埛缁忛攢鍟唅d")]
+ [SugarColumn(ColumnDescription = "鐢ㄦ埛缁忛攢鍟唅d")]
[Required(ErrorMessage = "璇疯緭鍏0}")]
public System.Int32 userId { get; set; }
/// <summary>
diff --git a/CoreCms.Net.Model/Entities/Distribution/CoreCmsDistributionOrderPartial.cs b/CoreCms.Net.Model/Entities/Distribution/CoreCmsDistributionOrderPartial.cs
index eb9c971..1eb14f4 100644
--- a/CoreCms.Net.Model/Entities/Distribution/CoreCmsDistributionOrderPartial.cs
+++ b/CoreCms.Net.Model/Entities/Distribution/CoreCmsDistributionOrderPartial.cs
@@ -15,7 +15,7 @@
namespace CoreCms.Net.Model.Entities
{
/// <summary>
- /// 鍒嗛攢鍟嗚鍗曡褰曡〃
+ /// 缁忛攢鍟嗚鍗曡褰曡〃
/// </summary>
public partial class CoreCmsDistributionOrder
{
@@ -36,9 +36,9 @@
/// <summary>
- /// 鍒嗛攢鍟�
+ /// 缁忛攢鍟�
/// </summary>
- [Display(Name = "鍒嗛攢鍟�")]
+ [Display(Name = "缁忛攢鍟�")]
[SugarColumn(IsIgnore = true)]
public string distributorName { get; set; }
diff --git a/CoreCms.Net.Model/Entities/Distribution/CoreCmsDistributionPartial.cs b/CoreCms.Net.Model/Entities/Distribution/CoreCmsDistributionPartial.cs
index afee953..b8230d3 100644
--- a/CoreCms.Net.Model/Entities/Distribution/CoreCmsDistributionPartial.cs
+++ b/CoreCms.Net.Model/Entities/Distribution/CoreCmsDistributionPartial.cs
@@ -14,7 +14,7 @@
namespace CoreCms.Net.Model.Entities
{
/// <summary>
- /// 鍒嗛攢鍟嗚〃
+ /// 缁忛攢鍟嗚〃
/// </summary>
public partial class CoreCmsDistribution
{
diff --git a/CoreCms.Net.Model/FromBody/FMAgent.cs b/CoreCms.Net.Model/FromBody/FMAgent.cs
index a69efbd..39f4eaa 100644
--- a/CoreCms.Net.Model/FromBody/FMAgent.cs
+++ b/CoreCms.Net.Model/FromBody/FMAgent.cs
@@ -74,7 +74,7 @@
public System.Int32 userId { get; set; }
/// <summary>
- /// 鍒嗛攢鍟嗗悕绉�
+ /// 缁忛攢鍟嗗悕绉�
/// </summary>
public System.String name { get; set; }
diff --git a/CoreCms.Net.Model/FromBody/FMDistribution.cs b/CoreCms.Net.Model/FromBody/FMDistribution.cs
index 2a1cbd6..313eb27 100644
--- a/CoreCms.Net.Model/FromBody/FMDistribution.cs
+++ b/CoreCms.Net.Model/FromBody/FMDistribution.cs
@@ -18,15 +18,49 @@
{
//API鎺ュ彛鎻愪氦================================================
/// <summary>
- /// 鐢宠鎴愪负鍒嗛攢鍟嗘帴鍙ｆ彁浜ゅ弬鏁�
+ /// 鐢宠鎴愪负缁忛攢鍟嗘帴鍙ｆ彁浜ゅ弬鏁�
/// </summary>
public class FMDistributionApply
{
+
public string agreement { get; set; }
+ /// <summary>
+ /// 鐢佃瘽
+ /// </summary>
public string mobile { get; set; }
+ /// <summary>
+ /// 鑱旂郴浜�
+ /// </summary>
public string name { get; set; }
- public string qq { get; set; }
- public string weixin { get; set; }
+ /// <summary>
+ /// 搴楅摵鍚嶇О
+ /// </summary>
+ public string storeName { get; set; }
+ /// <summary>
+ /// 鍦板潃鍒嗙被
+ /// </summary>
+ public string areaCode { get; set; }
+
+ /// <summary>
+ /// 璇︾粏鍦板潃
+ /// </summary>
+ public string address { get; set; }
+
+ /// <summary>
+ /// 搴楅摵闂ㄥご
+ /// </summary>
+ public string storeBanner { get; set; }
+ //public string qq { get; set; }
+ //public string weixin { get; set; }
+ /// <summary>
+ /// 閿�鍞搴�
+ /// </summary>
+ public decimal sales { get; set; }
+
+ /// <summary>
+ /// 鎵�灞炶涓�
+ /// </summary>
+ public string profession { get; set; }
}
@@ -42,7 +76,7 @@
}
/// <summary>
- /// 鍚庡彴鍒涘缓鍒嗛攢鍟嗘彁浜ゅ弬鏁�
+ /// 鍚庡彴鍒涘缓缁忛攢鍟嗘彁浜ゅ弬鏁�
/// </summary>
public class FMAdminCreateDistributionPost
{
@@ -58,7 +92,7 @@
public System.Int32 userId { get; set; }
/// <summary>
- /// 鍒嗛攢鍟嗗悕绉�
+ /// 缁忛攢鍟嗗悕绉�
/// </summary>
public System.String name { get; set; }
diff --git a/CoreCms.Net.Model/ViewModels/DTO/Distribution/DistributionRankingDTO.cs b/CoreCms.Net.Model/ViewModels/DTO/Distribution/DistributionRankingDTO.cs
index 13b3cfd..37a4cea 100644
--- a/CoreCms.Net.Model/ViewModels/DTO/Distribution/DistributionRankingDTO.cs
+++ b/CoreCms.Net.Model/ViewModels/DTO/Distribution/DistributionRankingDTO.cs
@@ -15,13 +15,13 @@
public class DistributionRankingDTO
{
/// <summary>
- /// 鍒嗛攢鍟嗗簭鍒�
+ /// 缁忛攢鍟嗗簭鍒�
/// </summary>
public int id { get; set; }
/// <summary>
- /// 鍒嗛攢鍟嗘樀绉�
+ /// 缁忛攢鍟嗘樀绉�
/// </summary>
public string nickname { get; set; }
diff --git a/CoreCms.Net.Model/bin/Debug/net8.0/CoreCms.Net.Model.xml b/CoreCms.Net.Model/bin/Debug/net8.0/CoreCms.Net.Model.xml
index 1d424b9..cd4e4dc 100644
--- a/CoreCms.Net.Model/bin/Debug/net8.0/CoreCms.Net.Model.xml
+++ b/CoreCms.Net.Model/bin/Debug/net8.0/CoreCms.Net.Model.xml
@@ -405,7 +405,7 @@
浠ｇ悊鍟嗚鍗曡褰曡〃
</summary>
<summary>
- 鍒嗛攢鍟嗚鍗曡褰曡〃
+ 缁忛攢鍟嗚鍗曡褰曡〃
</summary>
</member>
<member name="M:CoreCms.Net.Model.Entities.CoreCmsAgentOrder.#ctor">
@@ -470,7 +470,7 @@
</member>
<member name="P:CoreCms.Net.Model.Entities.CoreCmsAgentOrder.distributorName">
<summary>
- 鍒嗛攢鍟�
+ 缁忛攢鍟�
</summary>
</member>
<member name="P:CoreCms.Net.Model.Entities.CoreCmsAgentOrder.goodsAmount">
@@ -1924,15 +1924,15 @@
</member>
<member name="T:CoreCms.Net.Model.Entities.CoreCmsDistribution">
<summary>
- 鍒嗛攢鍟嗚〃
+ 缁忛攢鍟嗚〃
</summary>
<summary>
- 鍒嗛攢鍟嗚〃
+ 缁忛攢鍟嗚〃
</summary>
</member>
<member name="M:CoreCms.Net.Model.Entities.CoreCmsDistribution.#ctor">
<summary>
- 鍒嗛攢鍟嗚〃
+ 缁忛攢鍟嗚〃
</summary>
</member>
<member name="P:CoreCms.Net.Model.Entities.CoreCmsDistribution.id">
@@ -1947,7 +1947,7 @@
</member>
<member name="P:CoreCms.Net.Model.Entities.CoreCmsDistribution.name">
<summary>
- 鍒嗛攢鍟嗗悕绉�
+ 缁忛攢鍟嗗悕绉�
</summary>
</member>
<member name="P:CoreCms.Net.Model.Entities.CoreCmsDistribution.gradeId">
@@ -2013,6 +2013,26 @@
<member name="P:CoreCms.Net.Model.Entities.CoreCmsDistribution.isDelete">
<summary>
鏄惁鍒犻櫎
+ </summary>
+ </member>
+ <member name="P:CoreCms.Net.Model.Entities.CoreCmsDistribution.areaCode">
+ <summary>
+ 搴楅摵鍖哄煙
+ </summary>
+ </member>
+ <member name="P:CoreCms.Net.Model.Entities.CoreCmsDistribution.address">
+ <summary>
+ 鍦板潃璇︽儏
+ </summary>
+ </member>
+ <member name="P:CoreCms.Net.Model.Entities.CoreCmsDistribution.sales">
+ <summary>
+ 骞撮攢鍞
+ </summary>
+ </member>
+ <member name="P:CoreCms.Net.Model.Entities.CoreCmsDistribution.profession">
+ <summary>
+ 鎵�灞炶涓�
</summary>
</member>
<member name="P:CoreCms.Net.Model.Entities.CoreCmsDistribution.TotalSettlementAmount">
@@ -2092,15 +2112,15 @@
</member>
<member name="T:CoreCms.Net.Model.Entities.CoreCmsDistributionCondition">
<summary>
- 鍒嗛攢鍟嗙瓑绾у崌绾ф潯浠�
+ 缁忛攢鍟嗙瓑绾у崌绾ф潯浠�
</summary>
<summary>
- 鍒嗛攢鍟嗙瓑绾у崌绾ф潯浠�
+ 缁忛攢鍟嗙瓑绾у崌绾ф潯浠�
</summary>
</member>
<member name="M:CoreCms.Net.Model.Entities.CoreCmsDistributionCondition.#ctor">
<summary>
- 鍒嗛攢鍟嗙瓑绾у崌绾ф潯浠�
+ 缁忛攢鍟嗙瓑绾у崌绾ф潯浠�
</summary>
</member>
<member name="P:CoreCms.Net.Model.Entities.CoreCmsDistributionCondition.id">
@@ -2130,12 +2150,12 @@
</member>
<member name="T:CoreCms.Net.Model.Entities.CoreCmsDistributionGrade">
<summary>
- 鍒嗛攢鍟嗙瓑绾ц缃〃
+ 缁忛攢鍟嗙瓑绾ц缃〃
</summary>
</member>
<member name="M:CoreCms.Net.Model.Entities.CoreCmsDistributionGrade.#ctor">
<summary>
- 鍒嗛攢鍟嗙瓑绾ц缃〃
+ 缁忛攢鍟嗙瓑绾ц缃〃
</summary>
</member>
<member name="P:CoreCms.Net.Model.Entities.CoreCmsDistributionGrade.id">
@@ -2170,15 +2190,15 @@
</member>
<member name="T:CoreCms.Net.Model.Entities.CoreCmsDistributionOrder">
<summary>
- 鍒嗛攢鍟嗚鍗曡褰曡〃
+ 缁忛攢鍟嗚鍗曡褰曡〃
</summary>
<summary>
- 鍒嗛攢鍟嗚鍗曡褰曡〃
+ 缁忛攢鍟嗚鍗曡褰曡〃
</summary>
</member>
<member name="M:CoreCms.Net.Model.Entities.CoreCmsDistributionOrder.#ctor">
<summary>
- 鍒嗛攢鍟嗚鍗曡褰曡〃
+ 缁忛攢鍟嗚鍗曡褰曡〃
</summary>
</member>
<member name="P:CoreCms.Net.Model.Entities.CoreCmsDistributionOrder.id">
@@ -2188,7 +2208,7 @@
</member>
<member name="P:CoreCms.Net.Model.Entities.CoreCmsDistributionOrder.userId">
<summary>
- 鐢ㄦ埛鍒嗛攢鍟唅d
+ 鐢ㄦ埛缁忛攢鍟唅d
</summary>
</member>
<member name="P:CoreCms.Net.Model.Entities.CoreCmsDistributionOrder.buyUserId">
@@ -2243,7 +2263,7 @@
</member>
<member name="P:CoreCms.Net.Model.Entities.CoreCmsDistributionOrder.distributorName">
<summary>
- 鍒嗛攢鍟�
+ 缁忛攢鍟�
</summary>
</member>
<member name="P:CoreCms.Net.Model.Entities.CoreCmsDistributionOrder.goodsAmount">
@@ -9068,7 +9088,7 @@
</member>
<member name="P:CoreCms.Net.Model.FromBody.FMAdminCreateAgentPost.name">
<summary>
- 鍒嗛攢鍟嗗悕绉�
+ 缁忛攢鍟嗗悕绉�
</summary>
</member>
<member name="P:CoreCms.Net.Model.FromBody.FMAdminCreateAgentPost.gradeId">
@@ -9253,7 +9273,47 @@
</member>
<member name="T:CoreCms.Net.Model.FromBody.FMDistributionApply">
<summary>
- 鐢宠鎴愪负鍒嗛攢鍟嗘帴鍙ｆ彁浜ゅ弬鏁�
+ 鐢宠鎴愪负缁忛攢鍟嗘帴鍙ｆ彁浜ゅ弬鏁�
+ </summary>
+ </member>
+ <member name="P:CoreCms.Net.Model.FromBody.FMDistributionApply.mobile">
+ <summary>
+ 鐢佃瘽
+ </summary>
+ </member>
+ <member name="P:CoreCms.Net.Model.FromBody.FMDistributionApply.name">
+ <summary>
+ 鑱旂郴浜�
+ </summary>
+ </member>
+ <member name="P:CoreCms.Net.Model.FromBody.FMDistributionApply.storeName">
+ <summary>
+ 搴楅摵鍚嶇О
+ </summary>
+ </member>
+ <member name="P:CoreCms.Net.Model.FromBody.FMDistributionApply.areaCode">
+ <summary>
+ 鍦板潃鍒嗙被
+ </summary>
+ </member>
+ <member name="P:CoreCms.Net.Model.FromBody.FMDistributionApply.address">
+ <summary>
+ 璇︾粏鍦板潃
+ </summary>
+ </member>
+ <member name="P:CoreCms.Net.Model.FromBody.FMDistributionApply.storeBanner">
+ <summary>
+ 搴楅摵闂ㄥご
+ </summary>
+ </member>
+ <member name="P:CoreCms.Net.Model.FromBody.FMDistributionApply.sales">
+ <summary>
+ 閿�鍞搴�
+ </summary>
+ </member>
+ <member name="P:CoreCms.Net.Model.FromBody.FMDistributionApply.profession">
+ <summary>
+ 鎵�灞炶涓�
</summary>
</member>
<member name="T:CoreCms.Net.Model.FromBody.FMSetDistributionStorePost">
@@ -9263,7 +9323,7 @@
</member>
<member name="T:CoreCms.Net.Model.FromBody.FMAdminCreateDistributionPost">
<summary>
- 鍚庡彴鍒涘缓鍒嗛攢鍟嗘彁浜ゅ弬鏁�
+ 鍚庡彴鍒涘缓缁忛攢鍟嗘彁浜ゅ弬鏁�
</summary>
</member>
<member name="P:CoreCms.Net.Model.FromBody.FMAdminCreateDistributionPost.registeredUserMobile">
@@ -9278,7 +9338,7 @@
</member>
<member name="P:CoreCms.Net.Model.FromBody.FMAdminCreateDistributionPost.name">
<summary>
- 鍒嗛攢鍟嗗悕绉�
+ 缁忛攢鍟嗗悕绉�
</summary>
</member>
<member name="P:CoreCms.Net.Model.FromBody.FMAdminCreateDistributionPost.gradeId">
@@ -11203,12 +11263,12 @@
</member>
<member name="P:CoreCms.Net.Model.ViewModels.DTO.Distribution.DistributionRankingDTO.id">
<summary>
- 鍒嗛攢鍟嗗簭鍒�
+ 缁忛攢鍟嗗簭鍒�
</summary>
</member>
<member name="P:CoreCms.Net.Model.ViewModels.DTO.Distribution.DistributionRankingDTO.nickname">
<summary>
- 鍒嗛攢鍟嗘樀绉�
+ 缁忛攢鍟嗘樀绉�
</summary>
</member>
<member name="P:CoreCms.Net.Model.ViewModels.DTO.Distribution.DistributionRankingDTO.createtime">
diff --git a/CoreCms.Net.RedisMQ/OrderAgentOrDistributionSubscribe.cs b/CoreCms.Net.RedisMQ/OrderAgentOrDistributionSubscribe.cs
index b5112dc..658deb0 100644
--- a/CoreCms.Net.RedisMQ/OrderAgentOrDistributionSubscribe.cs
+++ b/CoreCms.Net.RedisMQ/OrderAgentOrDistributionSubscribe.cs
@@ -17,7 +17,7 @@
namespace CoreCms.Net.RedisMQ
{
/// <summary>
- /// 璁㈠崟瀹岀粨鍚庤蛋浠ｇ悊鎴栧垎閿�鍟嗘彁鎴愬鐞�
+ /// 璁㈠崟瀹岀粨鍚庤蛋浠ｇ悊鎴栫粡閿�鍟嗘彁鎴愬鐞�
/// </summary>
public class OrderAgentOrDistributionSubscribe : IRedisSubscribe
{
@@ -41,7 +41,7 @@
}
/// <summary>
- /// 璁㈠崟瀹岀粨鍚庤蛋浠ｇ悊鎴栧垎閿�鍟嗘彁鎴愬鐞�
+ /// 璁㈠崟瀹岀粨鍚庤蛋浠ｇ悊鎴栫粡閿�鍟嗘彁鎴愬鐞�
/// </summary>
/// <param name="msg"></param>
/// <returns></returns>
@@ -75,14 +75,14 @@
case (int)GlobalEnumVars.CommissionChannel.浠呭垎閿� when openDistribution == 1:
{
var jm = await _distributionOrderServices.AddData(order); //娣诲姞鍒嗕韩鍏宠仈璁㈠崟鏃ュ織
- //鍒ゆ柇鏄惁鍙互鎴愪负鍒嗛攢鍟�
+ //鍒ゆ柇鏄惁鍙互鎴愪负缁忛攢鍟�
//鍏堝垽鏂槸鍚﹀凡缁忔槸缁忛攢鍟嗕簡銆�
bool check = await _distributionServices.ExistsAsync(p => p.userId == order.userId);
var distributionType = CommonHelper.GetConfigDictionary(allConfigs, SystemSettingConstVars.DistributionType).ObjectToInt(0);
if (distributionType == 3) //鏃犻渶瀹℃牳锛屼絾鏄婊¤冻鎻愪氦
{
var info = new CoreCmsDistribution();
- //鍒ゆ柇鏄惁鍒嗛攢鍟�
+ //鍒ゆ柇鏄惁缁忛攢鍟�
if (check == false)
{
await _distributionServices.CheckCondition(allConfigs, info, order.userId);
@@ -121,14 +121,14 @@
}
await _distributionOrderServices.AddData(order); //娣诲姞鍒嗕韩鍏宠仈璁㈠崟鏃ュ織
- //鍒ゆ柇鏄惁鍙互鎴愪负鍒嗛攢鍟�
+ //鍒ゆ柇鏄惁鍙互鎴愪负缁忛攢鍟�
//鍏堝垽鏂槸鍚﹀凡缁忔槸缁忛攢鍟嗕簡銆�
bool check = await _distributionServices.ExistsAsync(p => p.userId == order.userId);
var distributionType = CommonHelper.GetConfigDictionary(allConfigs, SystemSettingConstVars.DistributionType).ObjectToInt(0);
if (distributionType == 3) //鏃犻渶瀹℃牳锛屼絾鏄婊¤冻鎻愪氦
{
var info = new CoreCmsDistribution();
- //鍒ゆ柇鏄惁鍒嗛攢鍟�
+ //鍒ゆ柇鏄惁缁忛攢鍟�
if (check == false)
{
await _distributionServices.CheckCondition(allConfigs, info, order.userId);
@@ -167,7 +167,7 @@
if (distributionType == 3) //鏃犻渶瀹℃牳锛屼絾鏄婊¤冻鎻愪氦
{
var info = new CoreCmsDistribution();
- //鍒ゆ柇鏄惁鍒嗛攢鍟�
+ //鍒ゆ柇鏄惁缁忛攢鍟�
if (check == false)
{
await _distributionServices.CheckCondition(allConfigs, info, order.userId);
diff --git a/CoreCms.Net.RedisMQ/OrderFinishCommandSubscribe.cs b/CoreCms.Net.RedisMQ/OrderFinishCommandSubscribe.cs
index 22deb48..6961144 100644
--- a/CoreCms.Net.RedisMQ/OrderFinishCommandSubscribe.cs
+++ b/CoreCms.Net.RedisMQ/OrderFinishCommandSubscribe.cs
@@ -57,7 +57,7 @@
}
else
{
- //瀵瑰凡缁忚鍏ュ垎閿�浣ｉ噾璁㈠崟琛ㄩ噷闈㈢殑鏁版嵁杩涜鍌ㄥ�煎埌鍒嗛攢鍟嗕綑棰濆唴銆�
+ //瀵瑰凡缁忚鍏ュ垎閿�浣ｉ噾璁㈠崟琛ㄩ噷闈㈢殑鏁版嵁杩涜鍌ㄥ�煎埌缁忛攢鍟嗕綑棰濆唴銆�
await _distributionOrderServices.FinishOrder(msg);
//瀵瑰凡缁忚鍏ヤ唬鐞嗗晢浣ｉ噾璁㈠崟琛ㄩ噷闈㈢殑鏁版嵁杩涜鍌ㄥ�煎埌浠ｇ悊鍟嗕綑棰濆唴銆�
await _agentOrderServices.FinishOrder(msg);
diff --git a/CoreCms.Net.Repository/Distribution/CoreCmsDistributionConditionRepository.cs b/CoreCms.Net.Repository/Distribution/CoreCmsDistributionConditionRepository.cs
index fe6b01b..cbe5e1d 100644
--- a/CoreCms.Net.Repository/Distribution/CoreCmsDistributionConditionRepository.cs
+++ b/CoreCms.Net.Repository/Distribution/CoreCmsDistributionConditionRepository.cs
@@ -24,7 +24,7 @@
namespace CoreCms.Net.Repository
{
/// <summary>
- /// 鍒嗛攢鍟嗙瓑绾у崌绾ф潯浠� 鎺ュ彛瀹炵幇
+ /// 缁忛攢鍟嗙瓑绾у崌绾ф潯浠� 鎺ュ彛瀹炵幇
/// </summary>
public class CoreCmsDistributionConditionRepository : BaseRepository<CoreCmsDistributionCondition>, ICoreCmsDistributionConditionRepository
{
diff --git a/CoreCms.Net.Repository/Distribution/CoreCmsDistributionGradeRepository.cs b/CoreCms.Net.Repository/Distribution/CoreCmsDistributionGradeRepository.cs
index 94595ad..c6a212a 100644
--- a/CoreCms.Net.Repository/Distribution/CoreCmsDistributionGradeRepository.cs
+++ b/CoreCms.Net.Repository/Distribution/CoreCmsDistributionGradeRepository.cs
@@ -24,7 +24,7 @@
namespace CoreCms.Net.Repository
{
/// <summary>
- /// 鍒嗛攢鍟嗙瓑绾ц缃〃 鎺ュ彛瀹炵幇
+ /// 缁忛攢鍟嗙瓑绾ц缃〃 鎺ュ彛瀹炵幇
/// </summary>
public class CoreCmsDistributionGradeRepository : BaseRepository<CoreCmsDistributionGrade>, ICoreCmsDistributionGradeRepository
{
diff --git a/CoreCms.Net.Repository/Distribution/CoreCmsDistributionOrderRepository.cs b/CoreCms.Net.Repository/Distribution/CoreCmsDistributionOrderRepository.cs
index 6b82787..80f0e23 100644
--- a/CoreCms.Net.Repository/Distribution/CoreCmsDistributionOrderRepository.cs
+++ b/CoreCms.Net.Repository/Distribution/CoreCmsDistributionOrderRepository.cs
@@ -25,7 +25,7 @@
namespace CoreCms.Net.Repository
{
/// <summary>
- /// 鍒嗛攢鍟嗚鍗曡褰曡〃 鎺ュ彛瀹炵幇
+ /// 缁忛攢鍟嗚鍗曡褰曡〃 鎺ュ彛瀹炵幇
/// </summary>
public class CoreCmsDistributionOrderRepository : BaseRepository<CoreCmsDistributionOrder>, ICoreCmsDistributionOrderRepository
{
diff --git a/CoreCms.Net.Repository/Distribution/CoreCmsDistributionRepository.cs b/CoreCms.Net.Repository/Distribution/CoreCmsDistributionRepository.cs
index 422c55c..7801a2a 100644
--- a/CoreCms.Net.Repository/Distribution/CoreCmsDistributionRepository.cs
+++ b/CoreCms.Net.Repository/Distribution/CoreCmsDistributionRepository.cs
@@ -23,7 +23,7 @@
namespace CoreCms.Net.Repository
{
/// <summary>
- /// 鍒嗛攢鍟嗚〃 鎺ュ彛瀹炵幇
+ /// 缁忛攢鍟嗚〃 鎺ュ彛瀹炵幇
/// </summary>
public class CoreCmsDistributionRepository : BaseRepository<CoreCmsDistribution>, ICoreCmsDistributionRepository
{
diff --git a/CoreCms.Net.Services/Agent/CoreCmsAgentServices.cs b/CoreCms.Net.Services/Agent/CoreCmsAgentServices.cs
index e6a93e9..8fd441e 100644
--- a/CoreCms.Net.Services/Agent/CoreCmsAgentServices.cs
+++ b/CoreCms.Net.Services/Agent/CoreCmsAgentServices.cs
@@ -57,10 +57,10 @@
}
- #region 鑾峰彇鍒嗛攢鍟嗕俊鎭�
+ #region 鑾峰彇缁忛攢鍟嗕俊鎭�
/// <summary>
- /// 鑾峰彇鍒嗛攢鍟嗕俊鎭�
+ /// 鑾峰彇缁忛攢鍟嗕俊鎭�
/// </summary>
/// <param name="userId">鐢ㄦ埛id</param>
/// <returns></returns>
diff --git a/CoreCms.Net.Services/Distribution/CoreCmsDistributionConditionServices.cs b/CoreCms.Net.Services/Distribution/CoreCmsDistributionConditionServices.cs
index 9e09f7b..8c72a1b 100644
--- a/CoreCms.Net.Services/Distribution/CoreCmsDistributionConditionServices.cs
+++ b/CoreCms.Net.Services/Distribution/CoreCmsDistributionConditionServices.cs
@@ -25,7 +25,7 @@
namespace CoreCms.Net.Services
{
/// <summary>
- /// 鍒嗛攢鍟嗙瓑绾у崌绾ф潯浠� 鎺ュ彛瀹炵幇
+ /// 缁忛攢鍟嗙瓑绾у崌绾ф潯浠� 鎺ュ彛瀹炵幇
/// </summary>
public class CoreCmsDistributionConditionServices : BaseServices<CoreCmsDistributionCondition>, ICoreCmsDistributionConditionServices
{
diff --git a/CoreCms.Net.Services/Distribution/CoreCmsDistributionGradeServices.cs b/CoreCms.Net.Services/Distribution/CoreCmsDistributionGradeServices.cs
index a2021b9..6306e29 100644
--- a/CoreCms.Net.Services/Distribution/CoreCmsDistributionGradeServices.cs
+++ b/CoreCms.Net.Services/Distribution/CoreCmsDistributionGradeServices.cs
@@ -25,7 +25,7 @@
namespace CoreCms.Net.Services
{
/// <summary>
- /// 鍒嗛攢鍟嗙瓑绾ц缃〃 鎺ュ彛瀹炵幇
+ /// 缁忛攢鍟嗙瓑绾ц缃〃 鎺ュ彛瀹炵幇
/// </summary>
public class CoreCmsDistributionGradeServices : BaseServices<CoreCmsDistributionGrade>, ICoreCmsDistributionGradeServices
{
diff --git a/CoreCms.Net.Services/Distribution/CoreCmsDistributionOrderServices.cs b/CoreCms.Net.Services/Distribution/CoreCmsDistributionOrderServices.cs
index 86119c8..2c613ee 100644
--- a/CoreCms.Net.Services/Distribution/CoreCmsDistributionOrderServices.cs
+++ b/CoreCms.Net.Services/Distribution/CoreCmsDistributionOrderServices.cs
@@ -30,7 +30,7 @@
namespace CoreCms.Net.Services
{
/// <summary>
- /// 鍒嗛攢鍟嗚鍗曡褰曡〃 鎺ュ彛瀹炵幇
+ /// 缁忛攢鍟嗚鍗曡褰曡〃 鎺ュ彛瀹炵幇
/// </summary>
public class CoreCmsDistributionOrderServices : BaseServices<CoreCmsDistributionOrder>, ICoreCmsDistributionOrderServices
{
@@ -143,7 +143,7 @@
if (user != null)
{
var commission = await _distributionServices.GetGradeAndCommission(user.id);
- if (commission.status && commission.data != null) //涓嶆槸鍒嗛攢鍟嗙殑锛屼笉杩斿埄銆�
+ if (commission.status && commission.data != null) //涓嶆槸缁忛攢鍟嗙殑锛屼笉杩斿埄銆�
{
var ommissionDto = commission.data as DistributionDto;
//鐩磋繑鏈骇
diff --git a/CoreCms.Net.Services/Distribution/CoreCmsDistributionServices.cs b/CoreCms.Net.Services/Distribution/CoreCmsDistributionServices.cs
index 367ab30..4b557ab 100644
--- a/CoreCms.Net.Services/Distribution/CoreCmsDistributionServices.cs
+++ b/CoreCms.Net.Services/Distribution/CoreCmsDistributionServices.cs
@@ -33,7 +33,7 @@
namespace CoreCms.Net.Services
{
/// <summary>
- /// 鍒嗛攢鍟嗚〃 鎺ュ彛瀹炵幇
+ /// 缁忛攢鍟嗚〃 鎺ュ彛瀹炵幇
/// </summary>
public class CoreCmsDistributionServices : BaseServices<CoreCmsDistribution>, ICoreCmsDistributionServices
{
@@ -64,9 +64,9 @@
_unitOfWork = unitOfWork;
}
- #region 鑾峰彇鍒嗛攢鍟嗕俊鎭�
+ #region 鑾峰彇缁忛攢鍟嗕俊鎭�
/// <summary>
- /// 鑾峰彇鍒嗛攢鍟嗕俊鎭�
+ /// 鑾峰彇缁忛攢鍟嗕俊鎭�
/// </summary>
/// <param name="userId">鐢ㄦ埛id</param>
/// <param name="checkStatus">鏄惁妫�鏌ユ弧瓒虫潯浠�</param>
@@ -262,14 +262,14 @@
}
#endregion
- #region 妫�鏌ユ槸鍚﹀彲浠ユ垚涓哄垎閿�鍟�
- //妫�鏌ユ槸鍚﹀彲浠ユ垚涓哄垎閿�鍟�
+ #region 妫�鏌ユ槸鍚﹀彲浠ユ垚涓虹粡閿�鍟�
+ //妫�鏌ユ槸鍚﹀彲浠ユ垚涓虹粡閿�鍟�
public async Task CheckCondition(Dictionary<string, DictionaryKeyValues> allConfigs, CoreCmsDistribution info, int userId = 0)
{
//鍒ゆ柇娑堣垂
info.ConditionStatus = false;//鏉′欢鐘舵��
info.ConditionProgress = 0;
- //鑾峰彇鎴愪负鍒嗛攢鍟嗘潯浠�
+ //鑾峰彇鎴愪负缁忛攢鍟嗘潯浠�
//var DistributionType = CommonHelper.GetConfigDictionary(allConfigs, GlobalSettingConstVars.DistributionType).ObjectToInt(0);
var distributionMoney = CommonHelper.GetConfigDictionary(allConfigs, SystemSettingConstVars.DistributionMoney).ObjectToInt(0);
//鏀粯閲戦
@@ -305,7 +305,7 @@
}
else
{
- info.ConditionMsg = "鎮ㄧ殑鏉′欢鏈弧瓒筹紝璇蜂换鎰忚喘涔颁竴浠跺晢鍝佸嵆鍙垚涓哄垎閿�鍟嗐��";
+ info.ConditionMsg = "鎮ㄧ殑鏉′欢鏈弧瓒筹紝璇蜂换鎰忚喘涔颁竴浠跺晢鍝佸嵆鍙垚涓虹粡閿�鍟嗐��";
}
}
else if (distributionGoods is > 0 and 3) //璐拱鎸囧畾鍟嗗搧
@@ -324,11 +324,11 @@
var goodsInfo = await _goodsRepository.QueryByIdAsync(distributionGoodsId);
if (goodsInfo != null)
{
- info.ConditionMsg = "鎮ㄧ殑鏉′欢鏈弧瓒筹紝璇疯喘涔版寚瀹氱殑銆�" + goodsInfo.name + "銆戝晢鍝佸嵆鍙垚涓哄垎閿�鍟嗐��";
+ info.ConditionMsg = "鎮ㄧ殑鏉′欢鏈弧瓒筹紝璇疯喘涔版寚瀹氱殑銆�" + goodsInfo.name + "銆戝晢鍝佸嵆鍙垚涓虹粡閿�鍟嗐��";
}
else
{
- info.ConditionMsg = "鎮ㄧ殑鏉′欢鏈弧瓒筹紝璇疯喘涔版寚瀹氱殑鍟嗗搧鍗冲彲鎴愪负鍒嗛攢鍟嗐��";
+ info.ConditionMsg = "鎮ㄧ殑鏉′欢鏈弧瓒筹紝璇疯喘涔版寚瀹氱殑鍟嗗搧鍗冲彲鎴愪负缁忛攢鍟嗐��";
}
}
@@ -409,7 +409,7 @@
var info = await _dal.QueryByClauseAsync(p => p.userId == userId);
if (info == null)
{
- jm.msg = "涓嶆槸鍒嗛攢鍟嗙殑锛屼笉杩斿埄";
+ jm.msg = "涓嶆槸缁忛攢鍟嗙殑锛屼笉杩斿埄";
return jm;
}
var allConfigs = await _settingServices.GetConfigDictionaries();
@@ -477,7 +477,7 @@
var info = await _dal.QueryByClauseAsync(p => p.userId == userId);
if (info is { gradeId: > 0 })
{
- //鎵句笅鏈夋病鏈夊彲浠ュ崌绾х殑鍒嗛攢鍟嗙瓑绾э紙涓�娆″彧鍗囦竴绾э級
+ //鎵句笅鏈夋病鏈夊彲浠ュ崌绾х殑缁忛攢鍟嗙瓑绾э紙涓�娆″彧鍗囦竴绾э級
var grade = await _distributionGradeRepository.QueryByClauseAsync(p => p.sortId > info.gradeId && p.isAutoUpGrade == true, p => p.sortId, OrderByType.Asc, true);
if (grade == null) return jm;
{
diff --git a/CoreCms.Net.Services/User/CoreCmsUserServices.cs b/CoreCms.Net.Services/User/CoreCmsUserServices.cs
index bff646f..44b2f7d 100644
--- a/CoreCms.Net.Services/User/CoreCmsUserServices.cs
+++ b/CoreCms.Net.Services/User/CoreCmsUserServices.cs
@@ -706,8 +706,8 @@
(int)GlobalEnumVars.UserPointSourceTypes.PointTypeInviterUser, "鍙戝睍鐢ㄦ埛锛�" + userId + "璧犻�佺Н鍒�");
}
- //鏄惁榛樿娉ㄥ唽鍒嗛攢鍟�
- var distributionType = CommonHelper.GetConfigDictionary(allConfigs, SystemSettingConstVars.DistributionType).ObjectToInt(); //鏄惁榛樿娉ㄥ唽鍒嗛攢鍟�
+ //鏄惁榛樿娉ㄥ唽缁忛攢鍟�
+ var distributionType = CommonHelper.GetConfigDictionary(allConfigs, SystemSettingConstVars.DistributionType).ObjectToInt(); //鏄惁榛樿娉ㄥ唽缁忛攢鍟�
if (distributionType == (int)GlobalEnumVars.DistributionConditionType.RegOpen)
{
var iData = new CoreCmsDistribution();
diff --git a/CoreCms.Net.Uni-App/CoreShop/common/request/http.api.js b/CoreCms.Net.Uni-App/CoreShop/common/request/http.api.js
index fcb6408..e9aaef5 100644
--- a/CoreCms.Net.Uni-App/CoreShop/common/request/http.api.js
+++ b/CoreCms.Net.Uni-App/CoreShop/common/request/http.api.js
@@ -266,9 +266,9 @@
let getPageConfig = (params, config = {}) => http.post('/Api/Page/GetPageConfig', params, { custom: { methodName: 'pages.getpageconfig', needToken: false } });
- // 鑾峰彇鍒嗛攢鍟嗚繘搴︾姸鎬�
+ // 鑾峰彇缁忛攢鍟嗚繘搴︾姸鎬�
let getDistributionInfo = (params, config = {}) => http.post('/Api/Distribution/Info', params, { custom: { methodName: 'distribution_center-api-info', needToken: true } });
- // 鐢宠鍒嗛攢鍟�
+ // 鐢宠缁忛攢鍟�
let applyDistribution = (params, config = {}) => http.post('/Api/Distribution/ApplyDistribution', params, { custom: { methodName: 'distribution_center-api-applydistribution', needToken: true } });
// 搴楅摵璁剧疆
let setDistributionStore = (params, config = {}) => http.post('/Api/Distribution/SetStore', params, { custom: { methodName: 'distribution_center-api-setstore', needToken: true } });
@@ -280,7 +280,7 @@
let getDistributionTeamSum = (params, config = {}) => http.post('/Api/Distribution/GetTeamSum', params, { custom: { methodName: 'distribution.getTeamSum', needToken: true } });
//鍒嗛攢璁㈠崟缁熻
let getDistributionOrderSum = (params, config = {}) => http.post('/Api/Distribution/GetOrderSum', params, { custom: { methodName: 'distribution.getOrderSum', needToken: true } });
- //鑾峰彇鍒嗛攢鍟嗘帓琛�
+ //鑾峰彇缁忛攢鍟嗘帓琛�
let getDistributionRanking = (params, config = {}) => http.post('/Api/Distribution/getDistributionRanking', params, { custom: { methodName: 'distribution.getDistributionRanking', needToken: true } });
// 鑾峰彇浠ｇ悊鍟嗚繘搴︾姸鎬�
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/member/agent/myStore/myStore.vue b/CoreCms.Net.Uni-App/CoreShop/pages/member/agent/myStore/myStore.vue
index fac9e8a..a64467e 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/member/agent/myStore/myStore.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/member/agent/myStore/myStore.vue
@@ -213,7 +213,7 @@
}
});
},
- //鑾峰彇鍒嗛攢鍟嗕俊鎭�
+ //鑾峰彇缁忛攢鍟嗕俊鎭�
getAgent: function (store) {
let _this = this;
_this.$u.api.getAgentStoreInfo({
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/member/agent/panel/panel.vue b/CoreCms.Net.Uni-App/CoreShop/pages/member/agent/panel/panel.vue
index ab30eef..ffd9f99 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/member/agent/panel/panel.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/member/agent/panel/panel.vue
@@ -115,7 +115,7 @@
// router: '/pages/member/agent/shareLog/shareLog'
//},
},
- info: {}, //鍒嗛攢鍟嗕俊鎭�
+ info: {}, //缁忛攢鍟嗕俊鎭�
userInfo: {}, // 鐢ㄦ埛淇℃伅
shareUrl: this.$globalConstVars.shareUrl
}
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/member/distribution/commissionDetails/commissionDetails.vue b/CoreCms.Net.Uni-App/CoreShop/pages/member/distribution/commissionDetails/commissionDetails.vue
index fea4e58..dae37ac 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/member/distribution/commissionDetails/commissionDetails.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/member/distribution/commissionDetails/commissionDetails.vue
@@ -99,7 +99,7 @@
data() {
return {
showMoney: false, //鏄惁鏄剧ず閲戦
- info: {}, //鍒嗛攢鍟嗕俊鎭�
+ info: {}, //缁忛攢鍟嗕俊鎭�
userInfo: {}, // 鐢ㄦ埛淇℃伅
//鏃ユ湡閫夋嫨
showCalendar: false,
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/member/distribution/index/index.vue b/CoreCms.Net.Uni-App/CoreShop/pages/member/distribution/index/index.vue
index 3aab11b..f0475ee 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/member/distribution/index/index.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/member/distribution/index/index.vue
@@ -28,7 +28,7 @@
</view>
</view>
<!--鏍囬-->
- <view class="coreshop-text-black coreshop-font-md coreshop-padding-10 coreshop-solid-bottom">鍒嗛攢鍟嗛』鐭�</view>
+ <view class="coreshop-text-black coreshop-font-md coreshop-padding-10 coreshop-solid-bottom">缁忛攢鍟嗛』鐭�</view>
<!--鍐呭-->
<view class="coreshop-text-gray coreshop-margin-20">
<u-parse :content="distributionNotes" :selectable="true"></u-parse>
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/member/distribution/myStore/myStore.vue b/CoreCms.Net.Uni-App/CoreShop/pages/member/distribution/myStore/myStore.vue
index b67cf74..8a036e1 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/member/distribution/myStore/myStore.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/member/distribution/myStore/myStore.vue
@@ -211,7 +211,7 @@
}
});
},
- //鑾峰彇鍒嗛攢鍟嗕俊鎭�
+ //鑾峰彇缁忛攢鍟嗕俊鎭�
getDistribution: function (store) {
let _this = this;
_this.$u.api.getDistributionStoreInfo({
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/member/distribution/panel/panel.vue b/CoreCms.Net.Uni-App/CoreShop/pages/member/distribution/panel/panel.vue
index fb08b7c..45e115b 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/member/distribution/panel/panel.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/member/distribution/panel/panel.vue
@@ -114,7 +114,7 @@
// router: '/pages/member/distribution/shareLog/shareLog'
//},
},
- info: {}, //鍒嗛攢鍟嗕俊鎭�
+ info: {}, //缁忛攢鍟嗕俊鎭�
userInfo: {}, // 鐢ㄦ埛淇℃伅
}
},
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/share/jump/jump.vue b/CoreCms.Net.Uni-App/CoreShop/pages/share/jump/jump.vue
index ddba823..392720c 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/share/jump/jump.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/share/jump/jump.vue
@@ -205,7 +205,7 @@
_this.gotoIndex();
}
},
- //璺宠浆鍒嗛攢鍟嗗晢瀹堕棬搴�
+ //璺宠浆缁忛攢鍟嗗晢瀹堕棬搴�
gotoStore(id) {
if (id) {
uni.$u.route({
diff --git a/CoreCms.Net.Utility/bin/Debug/net8.0/CoreCms.Net.Model.xml b/CoreCms.Net.Utility/bin/Debug/net8.0/CoreCms.Net.Model.xml
index 1d424b9..cd4e4dc 100644
--- a/CoreCms.Net.Utility/bin/Debug/net8.0/CoreCms.Net.Model.xml
+++ b/CoreCms.Net.Utility/bin/Debug/net8.0/CoreCms.Net.Model.xml
@@ -405,7 +405,7 @@
浠ｇ悊鍟嗚鍗曡褰曡〃
</summary>
<summary>
- 鍒嗛攢鍟嗚鍗曡褰曡〃
+ 缁忛攢鍟嗚鍗曡褰曡〃
</summary>
</member>
<member name="M:CoreCms.Net.Model.Entities.CoreCmsAgentOrder.#ctor">
@@ -470,7 +470,7 @@
</member>
<member name="P:CoreCms.Net.Model.Entities.CoreCmsAgentOrder.distributorName">
<summary>
- 鍒嗛攢鍟�
+ 缁忛攢鍟�
</summary>
</member>
<member name="P:CoreCms.Net.Model.Entities.CoreCmsAgentOrder.goodsAmount">
@@ -1924,15 +1924,15 @@
</member>
<member name="T:CoreCms.Net.Model.Entities.CoreCmsDistribution">
<summary>
- 鍒嗛攢鍟嗚〃
+ 缁忛攢鍟嗚〃
</summary>
<summary>
- 鍒嗛攢鍟嗚〃
+ 缁忛攢鍟嗚〃
</summary>
</member>
<member name="M:CoreCms.Net.Model.Entities.CoreCmsDistribution.#ctor">
<summary>
- 鍒嗛攢鍟嗚〃
+ 缁忛攢鍟嗚〃
</summary>
</member>
<member name="P:CoreCms.Net.Model.Entities.CoreCmsDistribution.id">
@@ -1947,7 +1947,7 @@
</member>
<member name="P:CoreCms.Net.Model.Entities.CoreCmsDistribution.name">
<summary>
- 鍒嗛攢鍟嗗悕绉�
+ 缁忛攢鍟嗗悕绉�
</summary>
</member>
<member name="P:CoreCms.Net.Model.Entities.CoreCmsDistribution.gradeId">
@@ -2013,6 +2013,26 @@
<member name="P:CoreCms.Net.Model.Entities.CoreCmsDistribution.isDelete">
<summary>
鏄惁鍒犻櫎
+ </summary>
+ </member>
+ <member name="P:CoreCms.Net.Model.Entities.CoreCmsDistribution.areaCode">
+ <summary>
+ 搴楅摵鍖哄煙
+ </summary>
+ </member>
+ <member name="P:CoreCms.Net.Model.Entities.CoreCmsDistribution.address">
+ <summary>
+ 鍦板潃璇︽儏
+ </summary>
+ </member>
+ <member name="P:CoreCms.Net.Model.Entities.CoreCmsDistribution.sales">
+ <summary>
+ 骞撮攢鍞
+ </summary>
+ </member>
+ <member name="P:CoreCms.Net.Model.Entities.CoreCmsDistribution.profession">
+ <summary>
+ 鎵�灞炶涓�
</summary>
</member>
<member name="P:CoreCms.Net.Model.Entities.CoreCmsDistribution.TotalSettlementAmount">
@@ -2092,15 +2112,15 @@
</member>
<member name="T:CoreCms.Net.Model.Entities.CoreCmsDistributionCondition">
<summary>
- 鍒嗛攢鍟嗙瓑绾у崌绾ф潯浠�
+ 缁忛攢鍟嗙瓑绾у崌绾ф潯浠�
</summary>
<summary>
- 鍒嗛攢鍟嗙瓑绾у崌绾ф潯浠�
+ 缁忛攢鍟嗙瓑绾у崌绾ф潯浠�
</summary>
</member>
<member name="M:CoreCms.Net.Model.Entities.CoreCmsDistributionCondition.#ctor">
<summary>
- 鍒嗛攢鍟嗙瓑绾у崌绾ф潯浠�
+ 缁忛攢鍟嗙瓑绾у崌绾ф潯浠�
</summary>
</member>
<member name="P:CoreCms.Net.Model.Entities.CoreCmsDistributionCondition.id">
@@ -2130,12 +2150,12 @@
</member>
<member name="T:CoreCms.Net.Model.Entities.CoreCmsDistributionGrade">
<summary>
- 鍒嗛攢鍟嗙瓑绾ц缃〃
+ 缁忛攢鍟嗙瓑绾ц缃〃
</summary>
</member>
<member name="M:CoreCms.Net.Model.Entities.CoreCmsDistributionGrade.#ctor">
<summary>
- 鍒嗛攢鍟嗙瓑绾ц缃〃
+ 缁忛攢鍟嗙瓑绾ц缃〃
</summary>
</member>
<member name="P:CoreCms.Net.Model.Entities.CoreCmsDistributionGrade.id">
@@ -2170,15 +2190,15 @@
</member>
<member name="T:CoreCms.Net.Model.Entities.CoreCmsDistributionOrder">
<summary>
- 鍒嗛攢鍟嗚鍗曡褰曡〃
+ 缁忛攢鍟嗚鍗曡褰曡〃
</summary>
<summary>
- 鍒嗛攢鍟嗚鍗曡褰曡〃
+ 缁忛攢鍟嗚鍗曡褰曡〃
</summary>
</member>
<member name="M:CoreCms.Net.Model.Entities.CoreCmsDistributionOrder.#ctor">
<summary>
- 鍒嗛攢鍟嗚鍗曡褰曡〃
+ 缁忛攢鍟嗚鍗曡褰曡〃
</summary>
</member>
<member name="P:CoreCms.Net.Model.Entities.CoreCmsDistributionOrder.id">
@@ -2188,7 +2208,7 @@
</member>
<member name="P:CoreCms.Net.Model.Entities.CoreCmsDistributionOrder.userId">
<summary>
- 鐢ㄦ埛鍒嗛攢鍟唅d
+ 鐢ㄦ埛缁忛攢鍟唅d
</summary>
</member>
<member name="P:CoreCms.Net.Model.Entities.CoreCmsDistributionOrder.buyUserId">
@@ -2243,7 +2263,7 @@
</member>
<member name="P:CoreCms.Net.Model.Entities.CoreCmsDistributionOrder.distributorName">
<summary>
- 鍒嗛攢鍟�
+ 缁忛攢鍟�
</summary>
</member>
<member name="P:CoreCms.Net.Model.Entities.CoreCmsDistributionOrder.goodsAmount">
@@ -9068,7 +9088,7 @@
</member>
<member name="P:CoreCms.Net.Model.FromBody.FMAdminCreateAgentPost.name">
<summary>
- 鍒嗛攢鍟嗗悕绉�
+ 缁忛攢鍟嗗悕绉�
</summary>
</member>
<member name="P:CoreCms.Net.Model.FromBody.FMAdminCreateAgentPost.gradeId">
@@ -9253,7 +9273,47 @@
</member>
<member name="T:CoreCms.Net.Model.FromBody.FMDistributionApply">
<summary>
- 鐢宠鎴愪负鍒嗛攢鍟嗘帴鍙ｆ彁浜ゅ弬鏁�
+ 鐢宠鎴愪负缁忛攢鍟嗘帴鍙ｆ彁浜ゅ弬鏁�
+ </summary>
+ </member>
+ <member name="P:CoreCms.Net.Model.FromBody.FMDistributionApply.mobile">
+ <summary>
+ 鐢佃瘽
+ </summary>
+ </member>
+ <member name="P:CoreCms.Net.Model.FromBody.FMDistributionApply.name">
+ <summary>
+ 鑱旂郴浜�
+ </summary>
+ </member>
+ <member name="P:CoreCms.Net.Model.FromBody.FMDistributionApply.storeName">
+ <summary>
+ 搴楅摵鍚嶇О
+ </summary>
+ </member>
+ <member name="P:CoreCms.Net.Model.FromBody.FMDistributionApply.areaCode">
+ <summary>
+ 鍦板潃鍒嗙被
+ </summary>
+ </member>
+ <member name="P:CoreCms.Net.Model.FromBody.FMDistributionApply.address">
+ <summary>
+ 璇︾粏鍦板潃
+ </summary>
+ </member>
+ <member name="P:CoreCms.Net.Model.FromBody.FMDistributionApply.storeBanner">
+ <summary>
+ 搴楅摵闂ㄥご
+ </summary>
+ </member>
+ <member name="P:CoreCms.Net.Model.FromBody.FMDistributionApply.sales">
+ <summary>
+ 閿�鍞搴�
+ </summary>
+ </member>
+ <member name="P:CoreCms.Net.Model.FromBody.FMDistributionApply.profession">
+ <summary>
+ 鎵�灞炶涓�
</summary>
</member>
<member name="T:CoreCms.Net.Model.FromBody.FMSetDistributionStorePost">
@@ -9263,7 +9323,7 @@
</member>
<member name="T:CoreCms.Net.Model.FromBody.FMAdminCreateDistributionPost">
<summary>
- 鍚庡彴鍒涘缓鍒嗛攢鍟嗘彁浜ゅ弬鏁�
+ 鍚庡彴鍒涘缓缁忛攢鍟嗘彁浜ゅ弬鏁�
</summary>
</member>
<member name="P:CoreCms.Net.Model.FromBody.FMAdminCreateDistributionPost.registeredUserMobile">
@@ -9278,7 +9338,7 @@
</member>
<member name="P:CoreCms.Net.Model.FromBody.FMAdminCreateDistributionPost.name">
<summary>
- 鍒嗛攢鍟嗗悕绉�
+ 缁忛攢鍟嗗悕绉�
</summary>
</member>
<member name="P:CoreCms.Net.Model.FromBody.FMAdminCreateDistributionPost.gradeId">
@@ -11203,12 +11263,12 @@
</member>
<member name="P:CoreCms.Net.Model.ViewModels.DTO.Distribution.DistributionRankingDTO.id">
<summary>
- 鍒嗛攢鍟嗗簭鍒�
+ 缁忛攢鍟嗗簭鍒�
</summary>
</member>
<member name="P:CoreCms.Net.Model.ViewModels.DTO.Distribution.DistributionRankingDTO.nickname">
<summary>
- 鍒嗛攢鍟嗘樀绉�
+ 缁忛攢鍟嗘樀绉�
</summary>
</member>
<member name="P:CoreCms.Net.Model.ViewModels.DTO.Distribution.DistributionRankingDTO.createtime">
diff --git a/CoreCms.Net.Web.Admin/Controllers/Com/ToolsController.cs b/CoreCms.Net.Web.Admin/Controllers/Com/ToolsController.cs
index af628d3..58077c2 100644
--- a/CoreCms.Net.Web.Admin/Controllers/Com/ToolsController.cs
+++ b/CoreCms.Net.Web.Admin/Controllers/Com/ToolsController.cs
@@ -934,11 +934,11 @@
#endregion
- #region 鍚庡彴鐢熸垚鍒嗛攢鍟嗗皬绋嬪簭鐮�============================================================
+ #region 鍚庡彴鐢熸垚缁忛攢鍟嗗皬绋嬪簭鐮�============================================================
// POST: Api/Tools/GetDistributionWxCode
/// <summary>
- /// 鍚庡彴鐢熸垚鍒嗛攢鍟嗗皬绋嬪簭鐮�
+ /// 鍚庡彴鐢熸垚缁忛攢鍟嗗皬绋嬪簭鐮�
/// </summary>
/// <returns></returns>
[HttpPost]
diff --git a/CoreCms.Net.Web.Admin/Controllers/Distribution/CoreCmsDistributionController.cs b/CoreCms.Net.Web.Admin/Controllers/Distribution/CoreCmsDistributionController.cs
index c6ee4ae..54e6806 100644
--- a/CoreCms.Net.Web.Admin/Controllers/Distribution/CoreCmsDistributionController.cs
+++ b/CoreCms.Net.Web.Admin/Controllers/Distribution/CoreCmsDistributionController.cs
@@ -33,9 +33,9 @@
namespace CoreCms.Net.Web.Admin.Controllers
{
/// <summary>
- /// 鍒嗛攢鍟嗚〃
+ /// 缁忛攢鍟嗚〃
/// </summary>
- [Description("鍒嗛攢鍟嗚〃")]
+ [Description("缁忛攢鍟嗚〃")]
[Route("api/[controller]/[action]")]
[ApiController]
[RequiredErrorForAdmin]
@@ -115,7 +115,7 @@
//鐢ㄦ埛Id int
var userId = Request.Form["userId"].FirstOrDefault().ObjectToInt(0);
if (userId > 0) where = where.And(p => p.userId == userId);
- //鍒嗛攢鍟嗗悕绉� nvarchar
+ //缁忛攢鍟嗗悕绉� nvarchar
var name = Request.Form["name"].FirstOrDefault();
if (!string.IsNullOrEmpty(name)) where = where.And(p => p.name.Contains(name));
//鍒嗛攢绛夌骇 int
@@ -301,7 +301,7 @@
var isDistribution = await _coreCmsDistributionServices.ExistsAsync(p => p.userId == user.id);
if (isDistribution)
{
- jm.msg = "鎻愪氦鐨勩�愬凡娉ㄥ唽鎵嬫満鍙枫�戝凡缁忔槸鍒嗛攢鍟嗕簡銆�";
+ jm.msg = "鎻愪氦鐨勩�愬凡娉ㄥ唽鎵嬫満鍙枫�戝凡缁忔槸缁忛攢鍟嗕簡銆�";
return jm;
}
var model = new CoreCmsDistribution();
diff --git a/CoreCms.Net.Web.Admin/Controllers/Distribution/CoreCmsDistributionGradeController.cs b/CoreCms.Net.Web.Admin/Controllers/Distribution/CoreCmsDistributionGradeController.cs
index 729de6e..1d9e99d 100644
--- a/CoreCms.Net.Web.Admin/Controllers/Distribution/CoreCmsDistributionGradeController.cs
+++ b/CoreCms.Net.Web.Admin/Controllers/Distribution/CoreCmsDistributionGradeController.cs
@@ -32,9 +32,9 @@
namespace CoreCms.Net.Web.Admin.Controllers
{
/// <summary>
- /// 鍒嗛攢鍟嗙瓑绾ц缃〃
+ /// 缁忛攢鍟嗙瓑绾ц缃〃
/// </summary>
- [Description("鍒嗛攢鍟嗙瓑绾ц缃〃")]
+ [Description("缁忛攢鍟嗙瓑绾ц缃〃")]
[Route("api/[controller]/[action]")]
[ApiController]
[RequiredErrorForAdmin]
diff --git a/CoreCms.Net.Web.Admin/Controllers/Distribution/CoreCmsDistributionOrderController.cs b/CoreCms.Net.Web.Admin/Controllers/Distribution/CoreCmsDistributionOrderController.cs
index 5339bfd..4f5eaf9 100644
--- a/CoreCms.Net.Web.Admin/Controllers/Distribution/CoreCmsDistributionOrderController.cs
+++ b/CoreCms.Net.Web.Admin/Controllers/Distribution/CoreCmsDistributionOrderController.cs
@@ -34,9 +34,9 @@
namespace CoreCms.Net.Web.Admin.Controllers
{
/// <summary>
- /// 鍒嗛攢鍟嗚鍗曡褰曡〃
+ /// 缁忛攢鍟嗚鍗曡褰曡〃
///</summary>
- [Description("鍒嗛攢鍟嗚鍗曡褰曡〃")]
+ [Description("缁忛攢鍟嗚鍗曡褰曡〃")]
[Route("api/[controller]/[action]")]
[ApiController]
[RequiredErrorForAdmin]
@@ -105,7 +105,7 @@
{
where = where.And(p => p.id == id);
}
- //鐢ㄦ埛鍒嗛攢鍟唅d int
+ //鐢ㄦ埛缁忛攢鍟唅d int
var userId = Request.Form["userId"].FirstOrDefault().ObjectToInt(0);
if (userId > 0)
{
@@ -284,7 +284,7 @@
mySheet.SetColumnWidth(0, 10 * 256);
var cell1 = headerRow.CreateCell(1);
- cell1.SetCellValue("鐢ㄦ埛鍒嗛攢鍟唅d");
+ cell1.SetCellValue("鐢ㄦ埛缁忛攢鍟唅d");
cell1.CellStyle = headerStyle;
mySheet.SetColumnWidth(1, 10 * 256);
@@ -420,7 +420,7 @@
{
where = where.And(p => p.id == id);
}
- //鐢ㄦ埛鍒嗛攢鍟唅d int
+ //鐢ㄦ埛缁忛攢鍟唅d int
var userId = Request.Form["userId"].FirstOrDefault().ObjectToInt(0);
if (userId > 0)
{
@@ -491,7 +491,7 @@
mySheet.SetColumnWidth(0, 10 * 256);
var cell1 = headerRow.CreateCell(1);
- cell1.SetCellValue("鐢ㄦ埛鍒嗛攢鍟唅d");
+ cell1.SetCellValue("鐢ㄦ埛缁忛攢鍟唅d");
cell1.CellStyle = headerStyle;
mySheet.SetColumnWidth(1, 10 * 256);
diff --git a/CoreCms.Net.Web.Admin/CoreCms.Net.Web.Admin.csproj b/CoreCms.Net.Web.Admin/CoreCms.Net.Web.Admin.csproj
index 744f439..da9513b 100644
--- a/CoreCms.Net.Web.Admin/CoreCms.Net.Web.Admin.csproj
+++ b/CoreCms.Net.Web.Admin/CoreCms.Net.Web.Admin.csproj
@@ -626,6 +626,9 @@
</ItemGroup>
<ItemGroup>
+ <Content Update="NLog.config">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </Content>
<Content Update="wwwroot\views\content\advert\advertisement\create.html">
<ExcludeFromSingleFile>true</ExcludeFromSingleFile>
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
diff --git a/CoreCms.Net.Web.Admin/CoreCms.Net.Web.Admin.csproj.user b/CoreCms.Net.Web.Admin/CoreCms.Net.Web.Admin.csproj.user
index 320db1d..a8e7a36 100644
--- a/CoreCms.Net.Web.Admin/CoreCms.Net.Web.Admin.csproj.user
+++ b/CoreCms.Net.Web.Admin/CoreCms.Net.Web.Admin.csproj.user
@@ -5,5 +5,6 @@
</PropertyGroup>
<PropertyGroup>
<ActiveDebugProfile>CoreCms.Net.Web.Admin</ActiveDebugProfile>
+ <NameOfLastUsedPublishProfile>E:\workdir\鐧惧垎鐧惧晢鍩庡悗鍙癨CoreCms.Net.Web.Admin\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
</PropertyGroup>
</Project>
\ No newline at end of file
diff --git a/CoreCms.Net.Web.Admin/CoreCms.Net.Web.Admin.xml b/CoreCms.Net.Web.Admin/CoreCms.Net.Web.Admin.xml
index 5d68a29..316443e 100644
--- a/CoreCms.Net.Web.Admin/CoreCms.Net.Web.Admin.xml
+++ b/CoreCms.Net.Web.Admin/CoreCms.Net.Web.Admin.xml
@@ -771,7 +771,7 @@
</member>
<member name="M:CoreCms.Net.Web.Admin.Controllers.ToolsController.GetDistributionWxCode(CoreCms.Net.Model.FromBody.FMIntId)">
<summary>
- 鍚庡彴鐢熸垚鍒嗛攢鍟嗗皬绋嬪簭鐮�
+ 鍚庡彴鐢熸垚缁忛攢鍟嗗皬绋嬪簭鐮�
</summary>
<returns></returns>
</member>
@@ -923,7 +923,7 @@
</member>
<member name="T:CoreCms.Net.Web.Admin.Controllers.CoreCmsDistributionController">
<summary>
- 鍒嗛攢鍟嗚〃
+ 缁忛攢鍟嗚〃
</summary>
</member>
<member name="M:CoreCms.Net.Web.Admin.Controllers.CoreCmsDistributionController.#ctor(Microsoft.AspNetCore.Hosting.IWebHostEnvironment,CoreCms.Net.IServices.ICoreCmsDistributionServices,CoreCms.Net.IServices.ICoreCmsUserGradeServices,CoreCms.Net.IServices.ICoreCmsDistributionGradeServices,CoreCms.Net.IServices.ICoreCmsUserServices)">
@@ -986,7 +986,7 @@
</member>
<member name="T:CoreCms.Net.Web.Admin.Controllers.CoreCmsDistributionGradeController">
<summary>
- 鍒嗛攢鍟嗙瓑绾ц缃〃
+ 缁忛攢鍟嗙瓑绾ц缃〃
</summary>
</member>
<member name="M:CoreCms.Net.Web.Admin.Controllers.CoreCmsDistributionGradeController.#ctor(Microsoft.AspNetCore.Hosting.IWebHostEnvironment,CoreCms.Net.IServices.ICoreCmsDistributionGradeServices,CoreCms.Net.IServices.ICoreCmsUserGradeServices,CoreCms.Net.IServices.ICoreCmsDistributionConditionServices,CoreCms.Net.IServices.ICoreCmsDistributionResultServices)">
@@ -1136,7 +1136,7 @@
</member>
<member name="T:CoreCms.Net.Web.Admin.Controllers.CoreCmsDistributionOrderController">
<summary>
- 鍒嗛攢鍟嗚鍗曡褰曡〃
+ 缁忛攢鍟嗚鍗曡褰曡〃
</summary>
</member>
<member name="M:CoreCms.Net.Web.Admin.Controllers.CoreCmsDistributionOrderController.#ctor(Microsoft.AspNetCore.Hosting.IWebHostEnvironment,CoreCms.Net.IServices.ICoreCmsDistributionOrderServices)">
diff --git a/CoreCms.Net.Web.Admin/Properties/PublishProfiles/FolderProfile.pubxml b/CoreCms.Net.Web.Admin/Properties/PublishProfiles/FolderProfile.pubxml
new file mode 100644
index 0000000..986aa14
--- /dev/null
+++ b/CoreCms.Net.Web.Admin/Properties/PublishProfiles/FolderProfile.pubxml
@@ -0,0 +1,21 @@
+锘�<?xml version="1.0" encoding="utf-8"?>
+<!--
+https://go.microsoft.com/fwlink/?LinkID=208121.
+-->
+<Project>
+ <PropertyGroup>
+ <DeleteExistingFiles>false</DeleteExistingFiles>
+ <ExcludeApp_Data>false</ExcludeApp_Data>
+ <LaunchSiteAfterPublish>true</LaunchSiteAfterPublish>
+ <LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration>
+ <LastUsedPlatform>Any CPU</LastUsedPlatform>
+ <PublishProvider>FileSystem</PublishProvider>
+ <PublishUrl>D:\鐧惧垎鐧惧叺娉昞amdin</PublishUrl>
+ <WebPublishMethod>FileSystem</WebPublishMethod>
+ <_TargetId>Folder</_TargetId>
+ <SiteUrlToLaunchAfterPublish />
+ <TargetFramework>net8.0</TargetFramework>
+ <ProjectGuid>95487ef2-3942-4f9b-8ece-acd7a4b304d9</ProjectGuid>
+ <SelfContained>false</SelfContained>
+ </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/CoreCms.Net.Web.Admin/Properties/PublishProfiles/FolderProfile.pubxml.user b/CoreCms.Net.Web.Admin/Properties/PublishProfiles/FolderProfile.pubxml.user
new file mode 100644
index 0000000..5e03a17
--- /dev/null
+++ b/CoreCms.Net.Web.Admin/Properties/PublishProfiles/FolderProfile.pubxml.user
@@ -0,0 +1,11 @@
+锘�<?xml version="1.0" encoding="utf-8"?>
+<!--
+https://go.microsoft.com/fwlink/?LinkID=208121.
+-->
+<Project>
+ <PropertyGroup>
+ <_PublishTargetUrl>D:\鐧惧垎鐧惧叺娉昞amdin</_PublishTargetUrl>
+ <History>True|2024-03-05T03:41:33.0893153Z||;True|2024-03-05T11:40:03.2217071+08:00||;True|2024-03-05T11:36:59.7527058+08:00||;True|2024-03-05T11:28:53.3016177+08:00||;True|2024-03-05T11:25:36.1455179+08:00||;True|2024-03-05T11:21:14.3434416+08:00||;True|2024-03-05T11:19:24.1653295+08:00||;True|2024-03-05T11:09:56.2458501+08:00||;True|2024-03-05T11:07:48.5516657+08:00||;True|2024-03-05T11:02:55.2646393+08:00||;True|2024-03-05T10:56:05.2900663+08:00||;</History>
+ <LastFailureDetails />
+ </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/CoreCms.Net.Web.Admin/appsettings.json b/CoreCms.Net.Web.Admin/appsettings.json
index c513152..a20cd45 100644
--- a/CoreCms.Net.Web.Admin/appsettings.json
+++ b/CoreCms.Net.Web.Admin/appsettings.json
@@ -92,8 +92,8 @@
"WeiXinEncodingAesKey": "",
"WeiXinToken": "",
//灏忕▼搴�
- "WxOpenAppId": "wx82d29cbe0ad39d47",
- "WxOpenAppSecret": "fe7395fe3eecd00e4a40e590eb835f31",
+ "WxOpenAppId": "wx45d700a970238807",
+ "WxOpenAppSecret": "3e9e4e68695ffc62f51b5ec1d1ddf942",
"WxOpenToken": "",
"WxOpenEncodingAESKey": ""
}
diff --git a/CoreCms.Net.Web.Admin/wwwroot/views/distribution/distributor/create.html b/CoreCms.Net.Web.Admin/wwwroot/views/distribution/distributor/create.html
index d817c30..36bc66b 100644
--- a/CoreCms.Net.Web.Admin/wwwroot/views/distribution/distributor/create.html
+++ b/CoreCms.Net.Web.Admin/wwwroot/views/distribution/distributor/create.html
@@ -10,9 +10,9 @@
</div>
<div class="layui-form-item">
- <label for="name" class="layui-form-label layui-form-required">鍒嗛攢鍟嗗悕绉�</label>
+ <label for="name" class="layui-form-label layui-form-required">缁忛攢鍟嗗悕绉�</label>
<div class="layui-input-inline">
- <input name="name" lay-verify="required|verifyname" class="layui-input" placeholder="璇疯緭鍏ュ垎閿�鍟嗗悕绉�" lay-reqText="璇疯緭鍏ュ垎閿�鍟嗗悕绉�" />
+ <input name="name" lay-verify="required|verifyname" class="layui-input" placeholder="璇疯緭鍏ョ粡閿�鍟嗗悕绉�" lay-reqText="璇疯緭鍏ョ粡閿�鍟嗗悕绉�" />
</div>
<label for="mobile" class="layui-form-label layui-form-required">鑱旂郴鎵嬫満鍙�</label>
<div class="layui-input-inline">
@@ -87,7 +87,7 @@
});
form.verify({
- verifyname: [/^.{0,255}$/, '鍒嗛攢鍟嗗悕绉版渶澶у彧鍏佽杈撳叆255浣嶅瓧绗�'],
+ verifyname: [/^.{0,255}$/, '缁忛攢鍟嗗悕绉版渶澶у彧鍏佽杈撳叆255浣嶅瓧绗�'],
verifymobile: [/^.{0,50}$/, '鎵嬫満鍙锋渶澶у彧鍏佽杈撳叆50浣嶅瓧绗�'],
verifyweixin: [/^.{0,50}$/, '寰俊鍙锋渶澶у彧鍏佽杈撳叆50浣嶅瓧绗�'],
verifyqq: [/^.{0,50}$/, 'qq鍙锋渶澶у彧鍏佽杈撳叆50浣嶅瓧绗�'],
diff --git a/CoreCms.Net.Web.Admin/wwwroot/views/distribution/distributor/details.html b/CoreCms.Net.Web.Admin/wwwroot/views/distribution/distributor/details.html
index 2264f31..6542b44 100644
--- a/CoreCms.Net.Web.Admin/wwwroot/views/distribution/distributor/details.html
+++ b/CoreCms.Net.Web.Admin/wwwroot/views/distribution/distributor/details.html
@@ -22,7 +22,7 @@
<tr>
<td>
- <label for="name">鍒嗛攢鍟嗗悕绉�</label>
+ <label for="name">缁忛攢鍟嗗悕绉�</label>
</td>
<td>
{{ d.params.data.model.name || '' }}
diff --git a/CoreCms.Net.Web.Admin/wwwroot/views/distribution/distributor/edit.html b/CoreCms.Net.Web.Admin/wwwroot/views/distribution/distributor/edit.html
index e156e16..c377a58 100644
--- a/CoreCms.Net.Web.Admin/wwwroot/views/distribution/distributor/edit.html
+++ b/CoreCms.Net.Web.Admin/wwwroot/views/distribution/distributor/edit.html
@@ -4,9 +4,9 @@
<input type="hidden" name="userId" value="{{d.params.data.model.userId || '' }}" />
<div class="layui-form-item">
- <label for="name" class="layui-form-label layui-form-required">鍒嗛攢鍟嗗悕绉�</label>
+ <label for="name" class="layui-form-label layui-form-required">缁忛攢鍟嗗悕绉�</label>
<div class="layui-input-inline">
- <input name="name" lay-verify="required|verifyname" class="layui-input" placeholder="璇疯緭鍏ュ垎閿�鍟嗗悕绉�" lay-reqText="璇疯緭鍏ュ垎閿�鍟嗗悕绉�" value="{{d.params.data.model.name || '' }}" />
+ <input name="name" lay-verify="required|verifyname" class="layui-input" placeholder="璇疯緭鍏ョ粡閿�鍟嗗悕绉�" lay-reqText="璇疯緭鍏ョ粡閿�鍟嗗悕绉�" value="{{d.params.data.model.name || '' }}" />
</div>
<label for="mobile" class="layui-form-label layui-form-required">鎵嬫満鍙�</label>
<div class="layui-input-inline">
@@ -80,7 +80,7 @@
});
form.verify({
- verifyname: [/^[\S]{0,255}$/, '鍒嗛攢鍟嗗悕绉版渶澶у彧鍏佽杈撳叆255浣嶅瓧绗︼紝涓斾笉鑳藉嚭鐜扮┖鏍�'],
+ verifyname: [/^[\S]{0,255}$/, '缁忛攢鍟嗗悕绉版渶澶у彧鍏佽杈撳叆255浣嶅瓧绗︼紝涓斾笉鑳藉嚭鐜扮┖鏍�'],
verifymobile: [/^[\S]{0,50}$/, '鎵嬫満鍙锋渶澶у彧鍏佽杈撳叆50浣嶅瓧绗︼紝涓斾笉鑳藉嚭鐜扮┖鏍�'],
verifyweixin: [/^[\S]{0,50}$/, '寰俊鍙锋渶澶у彧鍏佽杈撳叆50浣嶅瓧绗︼紝涓斾笉鑳藉嚭鐜扮┖鏍�'],
verifyqq: [/^[\S]{0,50}$/, 'qq鍙锋渶澶у彧鍏佽杈撳叆50浣嶅瓧绗︼紝涓斾笉鑳藉嚭鐜扮┖鏍�'],
diff --git a/CoreCms.Net.Web.Admin/wwwroot/views/distribution/distributor/index.html b/CoreCms.Net.Web.Admin/wwwroot/views/distribution/distributor/index.html
index 4ca22cd..fbb2e62 100644
--- a/CoreCms.Net.Web.Admin/wwwroot/views/distribution/distributor/index.html
+++ b/CoreCms.Net.Web.Admin/wwwroot/views/distribution/distributor/index.html
@@ -1,4 +1,4 @@
-<title>鍒嗛攢鍟嗚〃</title>
+<title>缁忛攢鍟嗚〃</title>
<!--褰撳墠浣嶇疆寮�濮�-->
<div class="layui-card layadmin-header">
<div class="layui-breadcrumb" lay-filter="breadcrumb">
@@ -23,12 +23,12 @@
<div class="layui-inline">
<div class="layui-input-inline">
- <input type="number" name="id" placeholder="鍒嗛攢鍟嗗簭鍒�" class="layui-input">
+ <input type="number" name="id" placeholder="缁忛攢鍟嗗簭鍒�" class="layui-input">
</div>
</div>
<div class="layui-inline">
<div class="layui-input-inline">
- <input type="text" name="name" placeholder="璇疯緭鍏ュ垎閿�鍟嗗悕绉�" class="layui-input">
+ <input type="text" name="name" placeholder="璇疯緭鍏ョ粡閿�鍟嗗悕绉�" class="layui-input">
</div>
</div>
@@ -173,7 +173,7 @@
}
}
},
- { field: 'name', title: '鍒嗛攢鍟嗗悕绉�', sort: false, width: 105 },
+ { field: 'name', title: '缁忛攢鍟嗗悕绉�', sort: false, width: 105 },
{
field: 'gradeId', title: '鍒嗛攢绛夌骇', sort: false, width: 90, templet: function (data) {
for (var i = 0; i < d.data.grades.length; i++) {
diff --git a/CoreCms.Net.Web.Admin/wwwroot/views/distribution/grade/create.html b/CoreCms.Net.Web.Admin/wwwroot/views/distribution/grade/create.html
index 3bdf52e..8c1030f 100644
--- a/CoreCms.Net.Web.Admin/wwwroot/views/distribution/grade/create.html
+++ b/CoreCms.Net.Web.Admin/wwwroot/views/distribution/grade/create.html
@@ -13,7 +13,7 @@
<div class="layui-input-inline layui-inline-2">
<input type="checkbox" lay-filter="switch" name="isDefault" lay-skin="switch" lay-text="寮�鍚瘄鍏抽棴">
</div>
- <div class="layui-form-mid layui-word-aux">褰撳墠绛夌骇鏄惁榛樿鍒嗛攢鍟嗙瓑绾�</div>
+ <div class="layui-form-mid layui-word-aux">褰撳墠绛夌骇鏄惁榛樿缁忛攢鍟嗙瓑绾�</div>
</div>
<div class="layui-form-item">
diff --git a/CoreCms.Net.Web.Admin/wwwroot/views/distribution/grade/edit.html b/CoreCms.Net.Web.Admin/wwwroot/views/distribution/grade/edit.html
index 9af20ab..917abf9 100644
--- a/CoreCms.Net.Web.Admin/wwwroot/views/distribution/grade/edit.html
+++ b/CoreCms.Net.Web.Admin/wwwroot/views/distribution/grade/edit.html
@@ -14,7 +14,7 @@
<div class="layui-input-inline layui-inline-2">
<input type="checkbox" lay-filter="switch" name="isDefault" {{ d.params.data.model.isDefault ? 'checked' : '' }} lay-skin="switch" lay-text="鏄瘄鍚�">
</div>
- <div class="layui-form-mid layui-word-aux">褰撳墠绛夌骇鏄惁榛樿鍒嗛攢鍟嗙瓑绾�</div>
+ <div class="layui-form-mid layui-word-aux">褰撳墠绛夌骇鏄惁榛樿缁忛攢鍟嗙瓑绾�</div>
</div>
<div class="layui-form-item">
diff --git a/CoreCms.Net.Web.Admin/wwwroot/views/distribution/grade/index.html b/CoreCms.Net.Web.Admin/wwwroot/views/distribution/grade/index.html
index 1d43e13..ebd41f0 100644
--- a/CoreCms.Net.Web.Admin/wwwroot/views/distribution/grade/index.html
+++ b/CoreCms.Net.Web.Admin/wwwroot/views/distribution/grade/index.html
@@ -1,4 +1,4 @@
-<title>鍒嗛攢鍟嗙瓑绾ц缃〃</title>
+<title>缁忛攢鍟嗙瓑绾ц缃〃</title>
<!--褰撳墠浣嶇疆寮�濮�-->
<div class="layui-card layadmin-header">
<div class="layui-breadcrumb" lay-filter="breadcrumb">
diff --git a/CoreCms.Net.Web.Admin/wwwroot/views/distribution/order/details.html b/CoreCms.Net.Web.Admin/wwwroot/views/distribution/order/details.html
index 045f9a7..85d4c71 100644
--- a/CoreCms.Net.Web.Admin/wwwroot/views/distribution/order/details.html
+++ b/CoreCms.Net.Web.Admin/wwwroot/views/distribution/order/details.html
@@ -17,7 +17,7 @@
<tr>
<td>
- <label for="userId">鐢ㄦ埛鍒嗛攢鍟唅d</label>
+ <label for="userId">鐢ㄦ埛缁忛攢鍟唅d</label>
</td>
<td>
{{ d.params.data.userId || '' }}
diff --git a/CoreCms.Net.Web.Admin/wwwroot/views/distribution/order/index.html b/CoreCms.Net.Web.Admin/wwwroot/views/distribution/order/index.html
index ec8f824..fc6c74c 100644
--- a/CoreCms.Net.Web.Admin/wwwroot/views/distribution/order/index.html
+++ b/CoreCms.Net.Web.Admin/wwwroot/views/distribution/order/index.html
@@ -1,4 +1,4 @@
-<title>鍒嗛攢鍟嗚鍗曡褰曡〃</title>
+<title>缁忛攢鍟嗚鍗曡褰曡〃</title>
<!--褰撳墠浣嶇疆寮�濮�-->
<div class="layui-card layadmin-header">
<div class="layui-breadcrumb" lay-filter="breadcrumb">
@@ -22,7 +22,7 @@
<div class="layui-form-item">
<div class="layui-inline">
<div class="layui-input-inline">
- <input type="text" name="distributorName" placeholder="璇疯緭鍏ョ敤鎴峰垎閿�鍟�" class="layui-input">
+ <input type="text" name="distributorName" placeholder="璇疯緭鍏ョ敤鎴风粡閿�鍟�" class="layui-input">
</div>
</div>
<div class="layui-inline">
@@ -126,7 +126,7 @@
[
//{ type: "checkbox", fixed: "left" },
{ field: 'id', title: '搴忓垪', width: 60, sort: false },
- { field: 'userId', title: '鐢ㄦ埛鍒嗛攢鍟�', sort: false, templet: function (data) { return data.distributorName + "锛�" + data.userId + "锛�" } },
+ { field: 'userId', title: '鐢ㄦ埛缁忛攢鍟�', sort: false, templet: function (data) { return data.distributorName + "锛�" + data.userId + "锛�" } },
{ field: 'buyUserId', title: '涓嬪崟鐢ㄦ埛', sort: false, templet: function (data) { return data.buyUserNickName + "锛�" + data.buyUserId + "锛�" } },
{ field: 'orderId', title: '璁㈠崟缂栧彿', sort: false },
{ field: 'amount', title: '缁撶畻閲戦', sort: false, width: 105, templet: function (data) { return '锟�' + data.amount } },
diff --git a/CoreCms.Net.Web.Admin/wwwroot/views/distribution/setting/index.html b/CoreCms.Net.Web.Admin/wwwroot/views/distribution/setting/index.html
index ed6041f..be30e91 100644
--- a/CoreCms.Net.Web.Admin/wwwroot/views/distribution/setting/index.html
+++ b/CoreCms.Net.Web.Admin/wwwroot/views/distribution/setting/index.html
@@ -64,7 +64,7 @@
</div>
<fieldset class="layui-elem-field layui-field-title" style="margin-top: 20px;">
- <legend>鎴愪负鍒嗛攢鍟�</legend>
+ <legend>鎴愪负缁忛攢鍟�</legend>
</fieldset>
<div class="layui-form-item">
@@ -211,7 +211,7 @@
});
editor2.setData(d.data.configs['distributionAgreement']['sValue']);
- //鐩戝惉璐拱鍟嗗搧鎴愪负鍒嗛攢鍟嗘寜閽�
+ //鐩戝惉璐拱鍟嗗搧鎴愪负缁忛攢鍟嗘寜閽�
form.on('radio(distributionGoods)', function (data) {
if (data.value === "3") {
$('#distributionGoods').show();
diff --git a/CoreCms.Net.Web.Admin/wwwroot/views/good/goods/create.html b/CoreCms.Net.Web.Admin/wwwroot/views/good/goods/create.html
index 80e0a37..be1c923 100644
--- a/CoreCms.Net.Web.Admin/wwwroot/views/good/goods/create.html
+++ b/CoreCms.Net.Web.Admin/wwwroot/views/good/goods/create.html
@@ -285,7 +285,7 @@
<i class="layui-icon layui-icon-set"></i>纭畾
</button>
</div>
- <label class="layui-form-label"> 涓�绾ц繑鐜�</label>
+ <label class="layui-form-label">缁忛攢鍟嗚繑鐜�</label>
<div class="layui-input-inline layui-inline-2">
<input class="layui-input" id="oneKeySetLevelOne">
</div>
@@ -450,15 +450,15 @@
<th>璐у彿</th>
<th>SKU</th>
<th>閲嶉噺(鍏�)</th>
- <th>璧犻�佺Н鍒�</th>
- <th>绉垎鏈�澶�<br />鍙姷閲戦</th>
+ <!-- <th>璧犻�佺Н鍒�</th>
+ <th>绉垎鏈�澶�<br />鍙姷閲戦</th> -->
<th>搴撳瓨</th>
<th><i class="required-color">*</i>閿�鍞环</th>
<th>鎴愭湰浠�</th>
<th>甯傚満浠�</th>
- <th>涓�绾ц繑鐜�</th>
- <th>浜岀骇杩旂幇</th>
- <th>涓夌骇杩旂幇</th>
+ <th>缁忛攢鍟嗚繑鐜�</th>
+ <!-- <th>浜岀骇杩旂幇</th>
+ <th>涓夌骇杩旂幇</th> -->
<th>鎿嶄綔</th>
</tr>
</thead>
@@ -499,12 +499,12 @@
<td>
<input type="number" name="product[weight][]" value="{{item.weight}}" placeholder="閲嶉噺" class="layui-input layui-inline-1">
</td>
- <td>
+ <!-- <td>
<input type="number" name="product[points][]" value="{{item.points}}" placeholder="绉垎" class="layui-input layui-inline-1">
- </td>
- <td>
+ </td> -->
+ <!-- <td>
<input type="text" name="product[pointsDeduction][]" value="{{item.pointsDeduction}}" placeholder="閲戦" class="layui-input layui-inline-1">
- </td>
+ </td> -->
<td class="have-add-td">
<input type="number" name="product[stock][]" value="{{item.stock}}" placeholder="搴撳瓨" class="layui-input layui-inline-1 goods-stock">
</td>
@@ -518,14 +518,14 @@
<input type="text" name="product[mktprice][]" value="{{item.mktprice}}" placeholder="甯傚満浠�" class="layui-input layui-inline-1">
</td>
<td>
- <input type="text" name="product[levelOne][]" value="{{item.levelOne}}" placeholder="涓�绾ц繑鐜�" class="layui-input layui-inline-1">
+ <input type="text" name="product[levelOne][]" value="{{item.levelOne}}" placeholder="缁忛攢鍟嗚繑鐜�" class="layui-input layui-inline-1">
</td>
- <td>
+ <!-- <td>
<input type="text" name="product[levelTwo][]" value="{{item.levelTwo}}" placeholder="浜岀骇杩旂幇" class="layui-input layui-inline-1">
</td>
<td>
<input type="text" name="product[levelThree][]" value="{{item.levelThree}}" placeholder="涓夌骇杩旂幇" class="layui-input layui-inline-1">
- </td>
+ </td> -->
<td>
<a class="layui-btn layui-btn-danger layui-btn-xs del-class" lay-active="delTr">鍒犻櫎</a>
</td>
diff --git a/CoreCms.Net.Web.Admin/wwwroot/views/good/goods/edit.html b/CoreCms.Net.Web.Admin/wwwroot/views/good/goods/edit.html
index 189d0ab..bc12bf6 100644
--- a/CoreCms.Net.Web.Admin/wwwroot/views/good/goods/edit.html
+++ b/CoreCms.Net.Web.Admin/wwwroot/views/good/goods/edit.html
@@ -312,15 +312,15 @@
<th>璐у彿</th>
<th>SKU</th>
<th>閲嶉噺(鍏�)</th>
- <th>璧犻�佺Н鍒�</th>
- <th>绉垎鏈�澶�<br />鍙姷閲戦</th>
+ <!-- <th>璧犻�佺Н鍒�</th>
+ <th>绉垎鏈�澶�<br />鍙姷閲戦</th> -->
<th>搴撳瓨</th>
<th><i class="required-color">*</i>閿�鍞环</th>
<th>鎴愭湰浠�</th>
<th>甯傚満浠�</th>
<th>涓�绾ц繑鐜�</th>
- <th>浜岀骇杩旂幇</th>
- <th>涓夌骇杩旂幇</th>
+ <!-- <th>浜岀骇杩旂幇</th>
+ <th>涓夌骇杩旂幇</th> -->
<th>鍐荤粨搴撳瓨</th>
<th>鎿嶄綔</th>
</tr>
@@ -362,12 +362,12 @@
<td>
<input type="number" name="product[weight][]" value="{{item.weight}}" placeholder="閲嶉噺" class="layui-input layui-inline-1">
</td>
- <td>
+ <!-- <td>
<input type="number" name="product[points][]" value="{{item.points}}" placeholder="绉垎" class="layui-input layui-inline-1">
- </td>
- <td>
+ </td> -->
+ <!-- <td>
<input type="text" name="product[pointsDeduction][]" value="{{item.pointsDeduction}}" placeholder="閲戦" class="layui-input layui-inline-1">
- </td>
+ </td> -->
<td class="have-add-td">
<input type="number" name="product[stock][]" value="{{item.stock}}" placeholder="搴撳瓨" class="layui-input layui-inline-1 goods-stock">
</td>
@@ -381,14 +381,14 @@
<input type="text" name="product[mktprice][]" value="{{item.mktprice}}" placeholder="甯傚満浠�" class="layui-input layui-inline-1">
</td>
<td>
- <input type="text" name="product[levelOne][]" value="{{item.levelOne}}" placeholder="涓�绾ц繑鐜�" class="layui-input layui-inline-1">
+ <input type="text" name="product[levelOne][]" value="{{item.levelOne}}" placeholder="缁忛攢鍟嗚繑鐜�" class="layui-input layui-inline-1">
</td>
- <td>
+ <!-- <td>
<input type="text" name="product[levelTwo][]" value="{{item.levelTwo}}" placeholder="浜岀骇杩旂幇" class="layui-input layui-inline-1">
</td>
<td>
<input type="text" name="product[levelThree][]" value="{{item.levelThree}}" placeholder="涓夌骇杩旂幇" class="layui-input layui-inline-1">
- </td>
+ </td> -->
<td>
{{item.freezeStock}}
</td>
diff --git a/CoreCms.Net.Web.Admin/wwwroot/views/index.html b/CoreCms.Net.Web.Admin/wwwroot/views/index.html
index f838471..82e3b36 100644
--- a/CoreCms.Net.Web.Admin/wwwroot/views/index.html
+++ b/CoreCms.Net.Web.Admin/wwwroot/views/index.html
@@ -49,7 +49,7 @@
<li class="layui-col-xs3">
<a href="javascript:;" lay-href="/distribution/distributor/">
<i class="layui-icon layui-icon-snowflake"></i>
- <cite>鍒嗛攢鍟�</cite>
+ <cite>缁忛攢鍟�</cite>
</a>
</li>
<li class="layui-col-xs3">
diff --git a/CoreCms.Net.Web.Admin/wwwroot/views/shop/setting/index.html b/CoreCms.Net.Web.Admin/wwwroot/views/shop/setting/index.html
index 698c04d..934b84d 100644
--- a/CoreCms.Net.Web.Admin/wwwroot/views/shop/setting/index.html
+++ b/CoreCms.Net.Web.Admin/wwwroot/views/shop/setting/index.html
@@ -1237,7 +1237,7 @@
}
});
- //鐩戝惉璐拱鍟嗗搧鎴愪负鍒嗛攢鍟嗘寜閽�
+ //鐩戝惉璐拱鍟嗗搧鎴愪负缁忛攢鍟嗘寜閽�
form.on('radio(distributionGoods)', function (data) {
if (data.value === "3") {
$('#distributionGoods').show();
diff --git a/CoreCms.Net.Web.WebApi/Controllers/DistributionController.cs b/CoreCms.Net.Web.WebApi/Controllers/DistributionController.cs
index 2f43b94..840ae0b 100644
--- a/CoreCms.Net.Web.WebApi/Controllers/DistributionController.cs
+++ b/CoreCms.Net.Web.WebApi/Controllers/DistributionController.cs
@@ -82,10 +82,10 @@
//楠岃瘉鎺ュ彛====================================================================================================
- #region 鏌ヨ鐢ㄦ埛鏄惁鍙互鎴愪负鍒嗛攢鍟�
+ #region 鏌ヨ鐢ㄦ埛鏄惁鍙互鎴愪负缁忛攢鍟�
/// <summary>
- /// 鏌ヨ鐢ㄦ埛鏄惁鍙互鎴愪负鍒嗛攢鍟�
+ /// 鏌ヨ鐢ㄦ埛鏄惁鍙互鎴愪负缁忛攢鍟�
/// </summary>
/// <returns></returns>
[HttpPost]
@@ -98,10 +98,10 @@
#endregion
- #region 鐢宠鎴愪负鍒嗛攢鍟嗘帴鍙�
+ #region 鐢宠鎴愪负缁忛攢鍟嗘帴鍙�
/// <summary>
- /// 鐢宠鎴愪负鍒嗛攢鍟嗘帴鍙�
+ /// 鐢宠鎴愪负缁忛攢鍟嗘帴鍙�
/// </summary>
/// <returns></returns>
[HttpPost]
@@ -119,8 +119,12 @@
var iData = new CoreCmsDistribution();
iData.mobile = entity.mobile;
iData.name = entity.name;
- iData.weixin = entity.weixin;
- iData.qq = entity.qq;
+ iData.address = entity.address;
+ iData.areaCode = entity.areaCode;
+ iData.profession = entity.profession;
+ iData.storeBanner = entity.storeBanner;
+ iData.sales=entity.sales;
+ iData.storeName = entity.storeName;
jm = await _distributionServices.AddData(iData, _user.ID);
return jm;
@@ -279,10 +283,10 @@
#endregion
- #region 鑾峰彇鍒嗛攢鍟嗘帓琛�
+ #region 鑾峰彇缁忛攢鍟嗘帓琛�
/// <summary>
- /// 鑾峰彇鍒嗛攢鍟嗘帓琛�
+ /// 鑾峰彇缁忛攢鍟嗘帓琛�
/// </summary>
/// <returns></returns>
[HttpPost]
diff --git a/CoreCms.Net.Web.WebApi/CoreCms.Net.Web.WebApi.xml b/CoreCms.Net.Web.WebApi/CoreCms.Net.Web.WebApi.xml
index d5e3936..5181c00 100644
--- a/CoreCms.Net.Web.WebApi/CoreCms.Net.Web.WebApi.xml
+++ b/CoreCms.Net.Web.WebApi/CoreCms.Net.Web.WebApi.xml
@@ -342,13 +342,13 @@
</member>
<member name="M:CoreCms.Net.Web.WebApi.Controllers.DistributionController.Info">
<summary>
- 鏌ヨ鐢ㄦ埛鏄惁鍙互鎴愪负鍒嗛攢鍟�
+ 鏌ヨ鐢ㄦ埛鏄惁鍙互鎴愪负缁忛攢鍟�
</summary>
<returns></returns>
</member>
<member name="M:CoreCms.Net.Web.WebApi.Controllers.DistributionController.ApplyDistribution(CoreCms.Net.Model.FromBody.FMDistributionApply)">
<summary>
- 鐢宠鎴愪负鍒嗛攢鍟嗘帴鍙�
+ 鐢宠鎴愪负缁忛攢鍟嗘帴鍙�
</summary>
<returns></returns>
</member>
@@ -378,7 +378,7 @@
</member>
<member name="M:CoreCms.Net.Web.WebApi.Controllers.DistributionController.GetDistributionRanking(CoreCms.Net.Model.FromBody.FMPageByIntId)">
<summary>
- 鑾峰彇鍒嗛攢鍟嗘帓琛�
+ 鑾峰彇缁忛攢鍟嗘帓琛�
</summary>
<returns></returns>
</member>
diff --git a/CoreCms.Net.Web.WebApi/appsettings.json b/CoreCms.Net.Web.WebApi/appsettings.json
index 1a63d36..a25de6e 100644
--- a/CoreCms.Net.Web.WebApi/appsettings.json
+++ b/CoreCms.Net.Web.WebApi/appsettings.json
@@ -99,8 +99,8 @@
"WeiXinEncodingAesKey": "",
"WeiXinToken": "",
//灏忕▼搴�
- "WxOpenAppId": "wx82d29cbe0ad39d47",
- "WxOpenAppSecret": "fe7395fe3eecd00e4a40e590eb835f31",
+ "WxOpenAppId": "wx45d700a970238807",
+ "WxOpenAppSecret": "3e9e4e68695ffc62f51b5ec1d1ddf942",
"WxOpenToken": "",
"WxOpenEncodingAESKey": ""
}
--
Gitblit v1.9.1