From 7a3a4f8012a72f80d8dd62064a76655c803da864 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期三, 29 五月 2024 12:42:45 +0800
Subject: [PATCH] Merge branch 'master' of http://47.108.235.38:8080/r/baifenbaishop
---
CoreCms.Net.Model/Entities/baifenbingfa/Promote/bloggers.cs | 2
CoreCms.Net.Repository/Good/CoreCmsGoodsRepository.cs | 7
CoreCms.Net.Model/Entities/baifenbingfa/apply/applyModel.cs | 2
CoreCms.Net.Web.Admin/wwwroot/views/baifenbingfa/corecmsproducts/index.html | 44 ++++-
CoreCms.Net.Repository/Distribution/CoreCmsDistributionRepository.cs | 4
CoreCms.Net.Services/Good/CoreCmsGoodsServices.cs | 5
CoreCms.Net.Model/Entities/Distribution/DistributionAchievement.cs | 2
CoreCms.Net.Web.Admin/wwwroot/views/order/orders/details.html | 6
CoreCms.Net.Model/Entities/baifenbingfa/job/jobSeting.cs | 2
CoreCms.Net.Web.Admin/wwwroot/views/good/goods/details.html | 6
CoreCms.Net.Model/Entities/Order/CoreCmsOrderItem.cs | 16 +
CoreCms.Net.Web.Admin/wwwroot/views/distribution/distributor/edit.html | 12 +
CoreCms.Net.Repository/Order/CoreCmsOrderRepository.cs | 6
CoreCms.Net.Web.Admin/Controllers/baifenbingfa/CoreCmsProductsController.cs | 13 +
CoreCms.Net.Web.Admin/wwwroot/views/good/goods/create.html | 18 ++
CoreCms.Net.Model/Entities/baifenbingfa/Promote/OffLineDistributor/OfflineDistributorOder.cs | 2
CoreCms.Net.IServices/baifenbingfa/IBfbfComAPIService.cs | 7
CoreCms.Net.Model/Entities/Shop/CoreCmsStore.cs | 2
CoreCms.Net.Model/FromBody/FMCart.cs | 4
CoreCms.Net.Web.Admin/wwwroot/views/good/goods/edit.html | 12 +
CoreCms.Net.Model/Entities/baifenbingfa/job/ApplicantProfile.cs | 6
CoreCms.Net.Web.Admin/wwwroot/views/distribution/distributor/achievement.html | 10
CoreCms.Net.Model/Entities/Distribution/CoreCmsDistribution.cs | 19 ++
CoreCms.Net.Web.WebApi/Controllers/DistributionController.cs | 2
CoreCms.Net.Model/Entities/baifenbingfa/Promote/OffLineDistributor/OfflineDistributorMeeting.cs | 2
CoreCms.Net.Model/FromBody/FMDistribution.cs | 10 +
CoreCms.Net.Services/baifenbingfa/BfbfComAPIService.cs | 8 +
CoreCms.Net.Model/Entities/Good/CoreCmsGoodsPartial.cs | 6
CoreCms.Net.Services/Cart/CoreCmsCartServices.cs | 24 ++
CoreCms.Net.Web.WebApi/Controllers/CartController.cs | 2
CoreCms.Net.Configuration/GlobalEnumVars.cs | 4
CoreCms.Net.Model/Entities/baifenbingfa/Promote/session.cs | 2
CoreCms.Net.Web.Admin/wwwroot/views/distribution/distributor/create.html | 14 +
CoreCms.Net.Web.Admin/wwwroot/views/order/orders/index.html | 14 +
CoreCms.Net.Model/ViewModels/DTO/CartDto.cs | 10 +
CoreCms.Net.Web.Admin/wwwroot/views/distribution/distributor/details.html | 49 ++++++
CoreCms.Net.Model/Entities/User/CoreCmsUser.cs | 2
CoreCms.Net.Model/Entities/Order/CoreCmsPlanOrder.cs | 2
CoreCms.Net.Model/Entities/Order/CoreCmsPlanOrderItem.cs | 2
CoreCms.Net.Model/Entities/baifenbingfa/Promote/meeting.cs | 2
CoreCms.Net.Model/Entities/baifenbingfa/Promote/OffLineDistributor/OfflineDistributor.cs | 2
CoreCms.Net.Model/ViewModels/DTO/ProductDto.cs | 5
CoreCms.Net.Model/Entities/Cart/CoreCmsCart.cs | 8 +
CoreCms.Net.Services/Order/CoreCmsOrderServices.cs | 5
CoreCms.Net.Repository/baifenbingfa/CoreCmsProductsRepository.cs | 5
CoreCms.Net.Model/Entities/baifenbingfa/Promote/intention.cs | 2
CoreCms.Net.Web.Admin/wwwroot/views/order/orders/ship.html | 6
CoreCms.Net.Model/Entities/Good/CoreCmsProducts.cs | 13 +
CoreCms.Net.Model/Entities/Distribution/DistributionAchievementOrder.cs | 2
CoreCms.Net.IServices/Cart/ICoreCmsCartServices.cs | 2
CoreCms.Net.Web.Admin/wwwroot/views/distribution/distributor/index.html | 29 +++
CoreCms.Net.Services/baifenbingfa/CoreCmsProductsServices.cs | 3
CoreCms.Net.Web.Admin/wwwroot/views/baifenbingfa/corecmsproducts/edit.html | 16 +-
53 files changed, 389 insertions(+), 71 deletions(-)
diff --git a/CoreCms.Net.Configuration/GlobalEnumVars.cs b/CoreCms.Net.Configuration/GlobalEnumVars.cs
index 5b16d0a..0276fcf 100644
--- a/CoreCms.Net.Configuration/GlobalEnumVars.cs
+++ b/CoreCms.Net.Configuration/GlobalEnumVars.cs
@@ -206,9 +206,9 @@
[Description("鎻愮幇")]
Tocash = 4,
/// <summary>
- /// 涓夌骇鍒嗛攢浣ｉ噾
+ /// 鍒嗛攢浣ｉ噾
/// </summary>
- [Description("涓夌骇鍒嗛攢浣ｉ噾")]
+ [Description("鍒嗛攢浣ｉ噾")]
Distribution = 5,
/// <summary>
/// 骞冲彴璋冩暣
diff --git a/CoreCms.Net.IServices/Cart/ICoreCmsCartServices.cs b/CoreCms.Net.IServices/Cart/ICoreCmsCartServices.cs
index 75dfd2d..a693378 100644
--- a/CoreCms.Net.IServices/Cart/ICoreCmsCartServices.cs
+++ b/CoreCms.Net.IServices/Cart/ICoreCmsCartServices.cs
@@ -52,7 +52,7 @@
/// <param name="cartTypes">1鏅�氳喘鐗�/2鎷煎洟妯″紡/3鍥㈣喘妯″紡/4绉掓潃妯″紡/6鐮嶄环妯″紡/7璧犲搧</param>
/// <param name="objectId">鍏宠仈瀵硅薄绫诲瀷</param>
/// <returns></returns>
- Task<WebApiCallBack> Add(int userId, int productId, int nums, int numType, int cartTypes = 1, int objectId = 0);
+ Task<WebApiCallBack> Add(int userId, int productId, int nums, int numType, int cartTypes = 1, int objectId = 0,bool isCustomizable=false);
/// <summary>
diff --git a/CoreCms.Net.IServices/baifenbingfa/IBfbfComAPIService.cs b/CoreCms.Net.IServices/baifenbingfa/IBfbfComAPIService.cs
index 9a6339c..2ee3dff 100644
--- a/CoreCms.Net.IServices/baifenbingfa/IBfbfComAPIService.cs
+++ b/CoreCms.Net.IServices/baifenbingfa/IBfbfComAPIService.cs
@@ -24,6 +24,7 @@
/// 鑾峰彇鍟嗗搧鍒嗙被
/// </summary>
/// <returns></returns>
+
Task<List<CoreCmsGoodsCategory>> GetGoodsCategory();
/// <summary>
/// 妫�鏌ョ敤鎴锋槸鍚︽槸缁忛攢鍟�
@@ -32,6 +33,12 @@
/// <returns></returns>
Task<bool> IsDictionary(int UserId);
+ /// <summary>
+ /// 璁＄畻瀹氬埗璐圭敤
+ /// </summary>
+ /// <param name="count"></param>
+ /// <returns></returns>
+ public decimal CommandCustomizable(int count);
}
diff --git a/CoreCms.Net.Model/Entities/Cart/CoreCmsCart.cs b/CoreCms.Net.Model/Entities/Cart/CoreCmsCart.cs
index b728e5b..80a1550 100644
--- a/CoreCms.Net.Model/Entities/Cart/CoreCmsCart.cs
+++ b/CoreCms.Net.Model/Entities/Cart/CoreCmsCart.cs
@@ -9,6 +9,7 @@
***********************************************************************/
using System.ComponentModel.DataAnnotations;
+using Chuanyin.Attribute;
using SqlSugar;
namespace CoreCms.Net.Model.Entities
@@ -16,6 +17,7 @@
/// <summary>
/// 璐墿杞﹁〃
/// </summary>
+ [SqlCodeFirst]
public class CoreCmsCart
{
/// <summary>
@@ -77,5 +79,11 @@
public int objectId { get; set; }
+
+ /// <summary>
+ /// 鏄惁瀹氬埗
+ /// </summary>
+ [SugarColumn(IsNullable =true)]
+ public bool isCustomizable { get; set; }=false;
}
}
\ No newline at end of file
diff --git a/CoreCms.Net.Model/Entities/Distribution/CoreCmsDistribution.cs b/CoreCms.Net.Model/Entities/Distribution/CoreCmsDistribution.cs
index 7444754..a38ccf3 100644
--- a/CoreCms.Net.Model/Entities/Distribution/CoreCmsDistribution.cs
+++ b/CoreCms.Net.Model/Entities/Distribution/CoreCmsDistribution.cs
@@ -156,8 +156,8 @@
/// 骞撮攢鍞
/// </summary>
[Display(Name = "骞撮攢鍞")]
- [SugarColumn(ColumnDescription = "骞撮攢鍞")]
- public decimal sales { get; set; } = 0;
+ [SugarColumn(ColumnDescription = "骞撮攢鍞" ,IsNullable =true)]
+ public decimal? sales { get; set; } = 0;
/// <summary>
@@ -174,7 +174,20 @@
public string storeCoordinate { get; set; }
-
+ /// <summary>
+ /// 韬唤璇�
+ /// </summary>
+ [Display(Name = "韬唤璇�")]
+ [SugarColumn(ColumnDescription = "韬唤璇�", IsNullable = true)]
+ public string idCradNumber { get; set; }
+
+
+ /// <summary>
+ /// 瀛︽牎鍚嶇О
+ /// </summary>
+ [Display(Name = "瀛︽牎鍚嶇О")]
+ [SugarColumn(ColumnDescription = "瀛︽牎鍚嶇О", IsNullable = true)]
+ public string schoolName { get; set; }
}
diff --git a/CoreCms.Net.Model/Entities/Distribution/DistributionAchievement.cs b/CoreCms.Net.Model/Entities/Distribution/DistributionAchievement.cs
index 331f061..0fcacb5 100644
--- a/CoreCms.Net.Model/Entities/Distribution/DistributionAchievement.cs
+++ b/CoreCms.Net.Model/Entities/Distribution/DistributionAchievement.cs
@@ -12,7 +12,7 @@
/// <summary>
/// 缁忛攢鍟嗕笟缁╃哗鏁堣褰曡〃
/// </summary>
- [SqlCodeFirst]
+ //[SqlCodeFirst]
public partial class DistributionAchievement:BFBaseModel
{
/// <summary>
diff --git a/CoreCms.Net.Model/Entities/Distribution/DistributionAchievementOrder.cs b/CoreCms.Net.Model/Entities/Distribution/DistributionAchievementOrder.cs
index 969a743..c17763d 100644
--- a/CoreCms.Net.Model/Entities/Distribution/DistributionAchievementOrder.cs
+++ b/CoreCms.Net.Model/Entities/Distribution/DistributionAchievementOrder.cs
@@ -13,7 +13,7 @@
/// 涓氱哗涓氬姟璁㈠崟琛�
/// 褰撴湁闇�瑕佽鍏ョ殑涓氱哗璁㈠崟鏃讹紝浜х敓涓�鏉¤鍗�
/// </summary>
- [SqlCodeFirst]
+ //[SqlCodeFirst]
public partial class DistributionAchievementOrder: BFBaseModel
{
/// <summary>
diff --git a/CoreCms.Net.Model/Entities/Good/CoreCmsGoodsPartial.cs b/CoreCms.Net.Model/Entities/Good/CoreCmsGoodsPartial.cs
index 2842b3b..f03f6c9 100644
--- a/CoreCms.Net.Model/Entities/Good/CoreCmsGoodsPartial.cs
+++ b/CoreCms.Net.Model/Entities/Good/CoreCmsGoodsPartial.cs
@@ -237,5 +237,11 @@
[SugarColumn(IsIgnore = true)]
public string area { get; set; }
+ /// <summary>
+ /// 鏄惁鏈夋敮鎸佸畾鍒剁殑
+ /// </summary>
+ [SugarColumn(IsIgnore = true)]
+ public bool isCustomizable { get; set; }= false;
+
}
}
\ No newline at end of file
diff --git a/CoreCms.Net.Model/Entities/Good/CoreCmsProducts.cs b/CoreCms.Net.Model/Entities/Good/CoreCmsProducts.cs
index 8de145c..72b923a 100644
--- a/CoreCms.Net.Model/Entities/Good/CoreCmsProducts.cs
+++ b/CoreCms.Net.Model/Entities/Good/CoreCmsProducts.cs
@@ -18,7 +18,7 @@
/// <summary>
/// 璐у搧琛�
/// </summary>
-
+ [SqlCodeFirst]
public partial class CoreCmsProducts
{
/// <summary>
@@ -256,7 +256,14 @@
public System.Boolean isDel { get; set; }
-
-
+
+ /// <summary>
+ /// 鏄惁鏀寔瀹氬埗
+ /// </summary>
+ [Display(Name = "鏄惁鏀寔瀹氬埗")]
+ [SugarColumn(ColumnDescription ="鏄惁鏀寔瀹氬埗",DefaultValue ="0")]
+ public bool isCustomizable { get; set; }=false;
+
+
}
}
diff --git a/CoreCms.Net.Model/Entities/Order/CoreCmsOrderItem.cs b/CoreCms.Net.Model/Entities/Order/CoreCmsOrderItem.cs
index bd4c6fa..3f20306 100644
--- a/CoreCms.Net.Model/Entities/Order/CoreCmsOrderItem.cs
+++ b/CoreCms.Net.Model/Entities/Order/CoreCmsOrderItem.cs
@@ -6,7 +6,8 @@
* Email: 34161541@qq.com
* CreateTime: 2024-03-01 22:14:58
* Description: 鏆傛棤
-***********************************************************************/
+***********************************************************************/
+using Chuanyin.Attribute;
using SqlSugar;
using System.ComponentModel.DataAnnotations;
@@ -16,6 +17,7 @@
/// 璁㈠崟鏄庣粏琛�
/// </summary>
[SugarTable("CoreCmsOrderItem",TableDescription = "璁㈠崟鏄庣粏琛�")]
+ [SqlCodeFirst]
public partial class CoreCmsOrderItem
{
/// <summary>
@@ -166,5 +168,17 @@
[Display(Name = "鏇存柊鏃堕棿")]
[SugarColumn(ColumnDescription = "鏇存柊鏃堕棿", IsNullable = true)]
public System.DateTime? updateTime { get; set; }
+
+ /// <summary>
+ /// 瀹氬埗璐�
+ /// </summary>
+ [SugarColumn(ColumnDescription = "瀹氬埗璐�", IsNullable = true)]
+ public decimal? CustomizableMoney { get; set; }
+
+ /// <summary>
+ /// 鏄惁瀹氬埗
+ /// </summary>
+ [SugarColumn(ColumnDescription = "鏄惁瀹氬埗", IsNullable = true)]
+ public bool? IsCustomizable { get; set; }
}
}
\ No newline at end of file
diff --git a/CoreCms.Net.Model/Entities/Order/CoreCmsPlanOrder.cs b/CoreCms.Net.Model/Entities/Order/CoreCmsPlanOrder.cs
index 4bcee55..c5408e0 100644
--- a/CoreCms.Net.Model/Entities/Order/CoreCmsPlanOrder.cs
+++ b/CoreCms.Net.Model/Entities/Order/CoreCmsPlanOrder.cs
@@ -13,7 +13,7 @@
/// <summary>
/// 璁″垝璁㈠崟琛�
/// </summary>
- [SqlCodeFirst]
+ //[SqlCodeFirst]
public class CoreCmsPlanOrder : BFBaseModel
{
diff --git a/CoreCms.Net.Model/Entities/Order/CoreCmsPlanOrderItem.cs b/CoreCms.Net.Model/Entities/Order/CoreCmsPlanOrderItem.cs
index 113204f..c02af1c 100644
--- a/CoreCms.Net.Model/Entities/Order/CoreCmsPlanOrderItem.cs
+++ b/CoreCms.Net.Model/Entities/Order/CoreCmsPlanOrderItem.cs
@@ -14,7 +14,7 @@
/// <summary>
/// 璁㈠崟鏄庣粏琛�
/// </summary>
- [SqlCodeFirst]
+ //[SqlCodeFirst]
[SugarTable("CoreCmsPlanOrderItem", TableDescription = "璁″垝璁㈠崟鏄庣粏琛�")]
public class CoreCmsPlanOrderItem : BFBaseModel
{
diff --git a/CoreCms.Net.Model/Entities/Shop/CoreCmsStore.cs b/CoreCms.Net.Model/Entities/Shop/CoreCmsStore.cs
index d626b47..9cd4c58 100644
--- a/CoreCms.Net.Model/Entities/Shop/CoreCmsStore.cs
+++ b/CoreCms.Net.Model/Entities/Shop/CoreCmsStore.cs
@@ -17,7 +17,7 @@
/// 闂ㄥ簵琛�
/// </summary>
[SugarTable("CoreCmsStore",TableDescription = "闂ㄥ簵琛�")]
- [SqlCodeFirst]
+ //[SqlCodeFirst]
public partial class CoreCmsStore
{
/// <summary>
diff --git a/CoreCms.Net.Model/Entities/User/CoreCmsUser.cs b/CoreCms.Net.Model/Entities/User/CoreCmsUser.cs
index 112c6df..0aaab12 100644
--- a/CoreCms.Net.Model/Entities/User/CoreCmsUser.cs
+++ b/CoreCms.Net.Model/Entities/User/CoreCmsUser.cs
@@ -17,7 +17,7 @@
/// 鐢ㄦ埛琛�
/// </summary>
[SugarTable("CoreCmsUser",TableDescription = "鐢ㄦ埛琛�")]
- [SqlCodeFirst]
+ //[SqlCodeFirst]
public partial class CoreCmsUser
{
/// <summary>
diff --git a/CoreCms.Net.Model/Entities/baifenbingfa/Promote/OffLineDistributor/OfflineDistributor.cs b/CoreCms.Net.Model/Entities/baifenbingfa/Promote/OffLineDistributor/OfflineDistributor.cs
index 1f699c7..0452262 100644
--- a/CoreCms.Net.Model/Entities/baifenbingfa/Promote/OffLineDistributor/OfflineDistributor.cs
+++ b/CoreCms.Net.Model/Entities/baifenbingfa/Promote/OffLineDistributor/OfflineDistributor.cs
@@ -15,7 +15,7 @@
/// </summary>
[Display(Name = "绾夸笅缁忛攢鍟嗛噰闆�")]
[SugarTable(TableDescription = "绾夸笅缁忛攢鍟嗛噰闆�")]
- [SqlCodeFirst]
+ //[SqlCodeFirst]
public partial class OfflineDistributor: BFBaseModel
{
/// <summary>
diff --git a/CoreCms.Net.Model/Entities/baifenbingfa/Promote/OffLineDistributor/OfflineDistributorMeeting.cs b/CoreCms.Net.Model/Entities/baifenbingfa/Promote/OffLineDistributor/OfflineDistributorMeeting.cs
index 9be157b..53e2f81 100644
--- a/CoreCms.Net.Model/Entities/baifenbingfa/Promote/OffLineDistributor/OfflineDistributorMeeting.cs
+++ b/CoreCms.Net.Model/Entities/baifenbingfa/Promote/OffLineDistributor/OfflineDistributorMeeting.cs
@@ -15,7 +15,7 @@
/// </summary>
[Display(Name = "娲借皥璁板綍")]
[SugarTable(TableDescription = "娲借皥璁板綍")]
- [SqlCodeFirst]
+ //[SqlCodeFirst]
public class OfflineDistributorMeeting: BFBaseModel
{
/// <summary>
diff --git a/CoreCms.Net.Model/Entities/baifenbingfa/Promote/OffLineDistributor/OfflineDistributorOder.cs b/CoreCms.Net.Model/Entities/baifenbingfa/Promote/OffLineDistributor/OfflineDistributorOder.cs
index 0b4724b..741fa8c 100644
--- a/CoreCms.Net.Model/Entities/baifenbingfa/Promote/OffLineDistributor/OfflineDistributorOder.cs
+++ b/CoreCms.Net.Model/Entities/baifenbingfa/Promote/OffLineDistributor/OfflineDistributorOder.cs
@@ -15,7 +15,7 @@
/// </summary>
[Display(Name = "绾夸笅缁忛攢鍟嗛噰闆�")]
[SugarTable(TableDescription = "绾夸笅缁忛攢鍟嗛噰闆�")]
- [SqlCodeFirst]
+ //[SqlCodeFirst]
public class OfflineDistributorOder: BFBaseModel
{
diff --git a/CoreCms.Net.Model/Entities/baifenbingfa/Promote/bloggers.cs b/CoreCms.Net.Model/Entities/baifenbingfa/Promote/bloggers.cs
index 107dc88..49aab78 100644
--- a/CoreCms.Net.Model/Entities/baifenbingfa/Promote/bloggers.cs
+++ b/CoreCms.Net.Model/Entities/baifenbingfa/Promote/bloggers.cs
@@ -16,7 +16,7 @@
/// </summary>
[Display(Name = "鎺ㄥ箍鍗氫富淇℃伅")]
[SugarTable( TableDescription = "鎺ㄥ箍鍗氫富")]
- [SqlCodeFirst]
+ //[SqlCodeFirst]
public partial class bloggersInfo: BFBaseModel
{
/// <summary>
diff --git a/CoreCms.Net.Model/Entities/baifenbingfa/Promote/intention.cs b/CoreCms.Net.Model/Entities/baifenbingfa/Promote/intention.cs
index 72c9a15..54acd58 100644
--- a/CoreCms.Net.Model/Entities/baifenbingfa/Promote/intention.cs
+++ b/CoreCms.Net.Model/Entities/baifenbingfa/Promote/intention.cs
@@ -15,7 +15,7 @@
/// </summary>
[Display(Name = "鎺ㄥ箍鍗氫富淇℃伅")]
[SugarTable(TableDescription = "鎺ㄥ箍鍗氫富")]
- [SqlCodeFirst]
+ //[SqlCodeFirst]
public partial class intention:BFBaseModel
{
/// <summary>
diff --git a/CoreCms.Net.Model/Entities/baifenbingfa/Promote/meeting.cs b/CoreCms.Net.Model/Entities/baifenbingfa/Promote/meeting.cs
index 38cc8e1..8df62ea 100644
--- a/CoreCms.Net.Model/Entities/baifenbingfa/Promote/meeting.cs
+++ b/CoreCms.Net.Model/Entities/baifenbingfa/Promote/meeting.cs
@@ -15,7 +15,7 @@
/// </summary>
[Display(Name = "娲借皥璁板綍")]
[SugarTable(TableDescription = "娲借皥璁板綍")]
- [SqlCodeFirst]
+ //[SqlCodeFirst]
public partial class meeting:BFBaseModel
{
/// <summary>
diff --git a/CoreCms.Net.Model/Entities/baifenbingfa/Promote/session.cs b/CoreCms.Net.Model/Entities/baifenbingfa/Promote/session.cs
index 8bd5739..1443a89 100644
--- a/CoreCms.Net.Model/Entities/baifenbingfa/Promote/session.cs
+++ b/CoreCms.Net.Model/Entities/baifenbingfa/Promote/session.cs
@@ -15,7 +15,7 @@
/// </summary>
[Display(Name = "娌熼�氳褰�")]
[SugarTable(TableDescription = "娌熼�氳褰�")]
- [SqlCodeFirst]
+ //[SqlCodeFirst]
public partial class session:BFBaseModel
{
/// <summary>
diff --git a/CoreCms.Net.Model/Entities/baifenbingfa/apply/applyModel.cs b/CoreCms.Net.Model/Entities/baifenbingfa/apply/applyModel.cs
index 6be9127..a38a59d 100644
--- a/CoreCms.Net.Model/Entities/baifenbingfa/apply/applyModel.cs
+++ b/CoreCms.Net.Model/Entities/baifenbingfa/apply/applyModel.cs
@@ -15,7 +15,7 @@
/// <summary>
/// 瀹℃壒娴佺▼
/// </summary>
- [SqlCodeFirst]
+ //[SqlCodeFirst]
public class applyModel: BFBaseModel
{
/// <summary>
diff --git a/CoreCms.Net.Model/Entities/baifenbingfa/job/ApplicantProfile.cs b/CoreCms.Net.Model/Entities/baifenbingfa/job/ApplicantProfile.cs
index 2d411d8..29d7e29 100644
--- a/CoreCms.Net.Model/Entities/baifenbingfa/job/ApplicantProfile.cs
+++ b/CoreCms.Net.Model/Entities/baifenbingfa/job/ApplicantProfile.cs
@@ -16,7 +16,7 @@
/// <summary>
/// 涓汉绠�鍘�
/// </summary>
- [SqlCodeFirst]
+ //[SqlCodeFirst]
public partial class Job_ApplicantProfile : BFBaseModel
{
/// <summary>
@@ -221,7 +221,7 @@
/// <summary>
/// 宸ヤ綔缁忓巻
/// </summary>
- [SqlCodeFirst]
+ //[SqlCodeFirst]
public partial class Job_EmploymentRecord
{
/// <summary>
@@ -280,7 +280,7 @@
/// <summary>
/// 瀹跺涵鎴愬憳
/// </summary>
- [SqlCodeFirst]
+ //[SqlCodeFirst]
public class Job_FamilyMember
{
/// <summary>
diff --git a/CoreCms.Net.Model/Entities/baifenbingfa/job/jobSeting.cs b/CoreCms.Net.Model/Entities/baifenbingfa/job/jobSeting.cs
index 4c48400..5af2890 100644
--- a/CoreCms.Net.Model/Entities/baifenbingfa/job/jobSeting.cs
+++ b/CoreCms.Net.Model/Entities/baifenbingfa/job/jobSeting.cs
@@ -12,7 +12,7 @@
/// <summary>
/// jobsetting
/// </summary>
- [SqlCodeFirst]
+ //[SqlCodeFirst]
public partial class Job_jobSeting: BFBaseModel
{
/// <summary>
diff --git a/CoreCms.Net.Model/FromBody/FMCart.cs b/CoreCms.Net.Model/FromBody/FMCart.cs
index 32aa81b..d0f68ff 100644
--- a/CoreCms.Net.Model/FromBody/FMCart.cs
+++ b/CoreCms.Net.Model/FromBody/FMCart.cs
@@ -44,6 +44,10 @@
/// 闈炴櫘閫氳揣鍝侊紝鍏宠仈瀵硅薄搴忓垪
/// </summary>
public int objectId { get; set; } = 0;
+ /// <summary>
+ /// 鏄惁鏄畾鍒�
+ /// </summary>
+ public bool isCustomizable { get; set; } = false;
}
/// <summary>
diff --git a/CoreCms.Net.Model/FromBody/FMDistribution.cs b/CoreCms.Net.Model/FromBody/FMDistribution.cs
index c0d8b1f..6af3485 100644
--- a/CoreCms.Net.Model/FromBody/FMDistribution.cs
+++ b/CoreCms.Net.Model/FromBody/FMDistribution.cs
@@ -55,7 +55,7 @@
/// <summary>
/// 閿�鍞搴�
/// </summary>
- public decimal sales { get; set; }
+ public decimal? sales { get; set; }
/// <summary>
/// 鎵�灞炶涓�
@@ -66,6 +66,14 @@
/// 鍧愭爣
/// </summary>
public string storeCoordinate { get; set; }
+ /// <summary>
+ /// 瀛︽牎鍚嶇О
+ /// </summary>
+ public string schoolName { get; set; }
+ /// <summary>
+ /// 韬唤璇佺敤锛� 鍒嗗壊
+ /// </summary>
+ public string idCradNumber { get; set; }
}
diff --git a/CoreCms.Net.Model/ViewModels/DTO/CartDto.cs b/CoreCms.Net.Model/ViewModels/DTO/CartDto.cs
index 5deba67..056fc2a 100644
--- a/CoreCms.Net.Model/ViewModels/DTO/CartDto.cs
+++ b/CoreCms.Net.Model/ViewModels/DTO/CartDto.cs
@@ -12,6 +12,7 @@
using System.Collections.Generic;
using CoreCms.Net.Model.Entities;
using CoreCms.Net.Model.ViewModels.UI;
+using SqlSugar;
namespace CoreCms.Net.Model.ViewModels.DTO
{
@@ -108,6 +109,15 @@
public CoreCmsProducts products { get; set; } = new();
public CoreCmsGoods good { get; set; }
+ /// <summary>
+ /// 鏄惁瀹氬埗
+ /// </summary>
+ public bool isCustomizable { get; set; } = false;
+
+ /// <summary>
+ /// 瀹氬埗璐圭敤
+ /// </summary>
+ public decimal CustomizableMoney { get; set; } = 0;
}
/// <summary>
diff --git a/CoreCms.Net.Model/ViewModels/DTO/ProductDto.cs b/CoreCms.Net.Model/ViewModels/DTO/ProductDto.cs
index f75c3e6..e4e74bc 100644
--- a/CoreCms.Net.Model/ViewModels/DTO/ProductDto.cs
+++ b/CoreCms.Net.Model/ViewModels/DTO/ProductDto.cs
@@ -109,7 +109,10 @@
/// 鏅�氱粡閿�鍟嗗垎鎴�
/// </summary>
public decimal distributionCutMoney { get; set; }
-
+ /// <summary>
+ /// 鏄惁鏀寔灏侀潰瀹氬埗
+ /// </summary>
+ public bool isCustomizable { get; set; } =false;
/// <summary>
///
/// </summary>
diff --git a/CoreCms.Net.Repository/Distribution/CoreCmsDistributionRepository.cs b/CoreCms.Net.Repository/Distribution/CoreCmsDistributionRepository.cs
index 33daf2f..a86a68e 100644
--- a/CoreCms.Net.Repository/Distribution/CoreCmsDistributionRepository.cs
+++ b/CoreCms.Net.Repository/Distribution/CoreCmsDistributionRepository.cs
@@ -156,6 +156,8 @@
updateTime = p.updateTime,
verifyTime = p.verifyTime,
isDelete = p.isDelete,
+ idCradNumber = p.idCradNumber,
+ schoolName = p.schoolName,
storeCoordinate = p.storeCoordinate,
UserGradeId = SqlFunc.Subqueryable<CoreCmsUser>().Where(o => o.id == p.userId).Select(o => o.grade),
DistributionAchievementTotals = SqlFunc.Subqueryable<DistributionAchievement>()
@@ -205,6 +207,8 @@
profession = p.profession,
sales=p.sales,
storeCoordinate = p.storeCoordinate,
+ idCradNumber = p.idCradNumber,
+ schoolName = p.schoolName,
UserGradeId = SqlFunc.Subqueryable<CoreCmsUser>().Where(o => o.id == p.userId).Select(o => o.grade),
DistributionAchievementTotals= SqlFunc.Subqueryable<DistributionAchievement>()
.Where(da=>da.userID==p.userId&&da.isdelete==false)
diff --git a/CoreCms.Net.Repository/Good/CoreCmsGoodsRepository.cs b/CoreCms.Net.Repository/Good/CoreCmsGoodsRepository.cs
index 708ef60..ecd767a 100644
--- a/CoreCms.Net.Repository/Good/CoreCmsGoodsRepository.cs
+++ b/CoreCms.Net.Repository/Good/CoreCmsGoodsRepository.cs
@@ -203,6 +203,7 @@
obj.distributionCutMoney = p.distributionCutMoney;
obj.cutMoney = p.cutMoney;
obj.distributionPrice= p.distributionPrice;
+ obj.isCustomizable = p.isCustomizable;
products.Add(obj);
var pd = new CoreCmsProductsDistribution();
@@ -257,7 +258,7 @@
obj.distributionCutMoney = oldObj.distributionCutMoney;
obj.cutMoney = oldObj.cutMoney;
obj.distributionPrice = oldObj.distributionPrice;
-
+ obj.isCustomizable = oldObj.isCustomizable;
if (string.IsNullOrEmpty(obj.images))
{
obj.images = goods.image;
@@ -551,6 +552,7 @@
p.distributionPrice = child.distributionPrice;
p.cutMoney = child.cutMoney;
p.distributionCutMoney = child.distributionCutMoney;
+ p.isCustomizable= child.isCustomizable;
}
});
@@ -637,6 +639,7 @@
obj.distributionPrice = p.distributionPrice;
obj.cutMoney = p.cutMoney;
obj.distributionCutMoney = p.distributionCutMoney;
+ obj.isCustomizable =p.isCustomizable;
if (string.IsNullOrEmpty(p.images))
{
obj.images = oldModel.image;
@@ -697,6 +700,7 @@
obj.distributionPrice = newObj.distributionPrice;
obj.cutMoney = newObj.cutMoney;
obj.distributionCutMoney = newObj.distributionCutMoney;
+ obj.isCustomizable = newObj.isCustomizable;
if (string.IsNullOrEmpty(newObj.images))
{
obj.images = oldModel.image;
@@ -732,6 +736,7 @@
obj.distributionPrice = newObj.distributionPrice;
obj.cutMoney = newObj.cutMoney;
obj.distributionCutMoney = newObj.distributionCutMoney;
+ obj.isCustomizable = newObj.isCustomizable;
if (string.IsNullOrEmpty(newObj.images))
{
obj.images = oldModel.image;
diff --git a/CoreCms.Net.Repository/Order/CoreCmsOrderRepository.cs b/CoreCms.Net.Repository/Order/CoreCmsOrderRepository.cs
index 3075428..8d0fc92 100644
--- a/CoreCms.Net.Repository/Order/CoreCmsOrderRepository.cs
+++ b/CoreCms.Net.Repository/Order/CoreCmsOrderRepository.cs
@@ -322,12 +322,14 @@
isdel = sOrder.isdel,
createTime = sOrder.createTime,
updateTime = sOrder.updateTime,
- userNickName = sUser.nickName
+ userNickName = sUser.nickName,
+
+
})
.With(SqlWith.NoLock)
.MergeTable()
.Mapper(sOrder => sOrder.aftersalesItem, sOrder => sOrder.aftersalesItem.First().orderId)
- .Mapper(sOrder => sOrder.items, sOrder => sOrder.items.First().orderId)
+ .Mapper(sOrder => sOrder.items, sOrder => sOrder.items.First().orderId)
.OrderByIF(orderByExpression != null, orderByExpression, orderByType)
.WhereIF(predicate != null, predicate)
.ToPageListAsync(pageIndex, pageSize, totalCount);
diff --git a/CoreCms.Net.Repository/baifenbingfa/CoreCmsProductsRepository.cs b/CoreCms.Net.Repository/baifenbingfa/CoreCmsProductsRepository.cs
index 929e7c8..09e2829 100644
--- a/CoreCms.Net.Repository/baifenbingfa/CoreCmsProductsRepository.cs
+++ b/CoreCms.Net.Repository/baifenbingfa/CoreCmsProductsRepository.cs
@@ -90,6 +90,7 @@
oldModel.distributionPrice = entity.distributionPrice;
oldModel.cutMoney = entity.cutMoney;
oldModel.distributionCutMoney = entity.distributionCutMoney;
+ oldModel.isCustomizable=entity.isCustomizable;
//浜嬬墿澶勭悊杩囩▼缁撴潫
var bl = await DbClient.Updateable(oldModel).ExecuteCommandHasChangeAsync();
@@ -295,6 +296,7 @@
distributionPrice = product.distributionPrice,
cutMoney = product.cutMoney,
distributionCutMoney = product.distributionCutMoney,
+ isCustomizable=product.isCustomizable,
CategoryID = Category.id,
Category = (SqlFunc.Subqueryable<CoreCmsGoodsCategory>().Where(x => x.id == Category.parentId).Select(x => x.name) + "-" + Category.name) ?? Category.name,
}).With(SqlWith.NoLock)
@@ -339,6 +341,7 @@
cutMoney = product.cutMoney,
distributionCutMoney = product.distributionCutMoney,
CategoryID = Category.id,
+ isCustomizable = product.isCustomizable,
Category = (SqlFunc.Subqueryable<CoreCmsGoodsCategory>().Where(x => x.id == Category.parentId).Select(x => x.name) + "-" + Category.name) ?? Category.name,
})
.MergeTable()
@@ -400,6 +403,7 @@
cutMoney = product.cutMoney,
distributionCutMoney = product.distributionCutMoney,
CategoryID = Category.id,
+ isCustomizable = product.isCustomizable,
Category = (SqlFunc.Subqueryable<CoreCmsGoodsCategory>().Where(x => x.id == Category.parentId).Select(x => x.name) + "-" + Category.name) ?? Category.name,
}).With(SqlWith.NoLock)
.MergeTable()
@@ -443,6 +447,7 @@
cutMoney = product.cutMoney,
distributionCutMoney = product.distributionCutMoney,
CategoryID = Category.id,
+ isCustomizable = product.isCustomizable,
Category = (SqlFunc.Subqueryable<CoreCmsGoodsCategory>().Where(x => x.id == Category.parentId).Select(x => x.name) + "-" + Category.name) ?? Category.name,
})
.MergeTable()
diff --git a/CoreCms.Net.Services/Cart/CoreCmsCartServices.cs b/CoreCms.Net.Services/Cart/CoreCmsCartServices.cs
index fd19fc0..706bf9e 100644
--- a/CoreCms.Net.Services/Cart/CoreCmsCartServices.cs
+++ b/CoreCms.Net.Services/Cart/CoreCmsCartServices.cs
@@ -120,6 +120,7 @@
/// <param name="userId"></param>
/// <param name="numType"></param>
/// <param name="type"></param>
+ /// <param name="isCustomizable"></param>
/// <returns></returns>
public async Task<WebApiCallBack> SetCartNum(int id, int nums, int userId, int numType, int type = 1)
{
@@ -145,7 +146,7 @@
jm.msg = "鑾峰彇璐墿杞︽暟鎹け璐�";
return jm;
}
- var outData = await Add(userId, cartModel.productId, nums, numType, type);
+ var outData = await Add(userId, cartModel.productId, nums, numType, type,isCustomizable:cartModel.isCustomizable);
jm.status = outData.status;
jm.msg = jm.status ? GlobalConstVars.SetDataSuccess : GlobalConstVars.SetDataFailure;
jm.otherData = outData;
@@ -195,8 +196,9 @@
/// <param name="numType">鏁伴噺绫诲瀷/1鏄洿鎺ュ鍔�/2鏄祴鍊�</param>
/// <param name="cartTypes">1鏅�氳喘鐗╄繕鏄�2鍥㈣喘绉掓潃3鍥㈣喘妯″紡4绉掓潃妯″紡6鐮嶄环妯″紡7璧犲搧</param>
/// <param name="objectId">鍏宠仈瀵硅薄绫诲瀷</param>
+ /// <param name="isCustomizable">鍏宠仈瀵硅薄绫诲瀷</param>
/// <returns></returns>
- public async Task<WebApiCallBack> Add(int userId, int productId, int nums, int numType, int cartTypes = 1, int objectId = 0)
+ public async Task<WebApiCallBack> Add(int userId, int productId, int nums, int numType, int cartTypes = 1, int objectId = 0,bool isCustomizable = false)
{
var jm = new WebApiCallBack();
@@ -222,6 +224,11 @@
if (products == null)
{
jm.msg = "鑾峰彇璐у搧淇℃伅澶辫触";
+ return jm;
+ }
+ if(isCustomizable==true&&products.isCustomizable!=true)
+ {
+ jm.msg = "璇ヨ揣鐗╀笉鏀寔瀹氬埗";
return jm;
}
//鍒ゆ柇鏄惁涓嬫灦
@@ -314,7 +321,9 @@
productId = productId,
nums = nums,
type = cartTypes,
- objectId = objectId
+ objectId = objectId,
+ //鏀寔瀹氬埗
+ isCustomizable= isCustomizable,
};
var outId = await _dal.InsertAsync(catInfo);
jm.status = outId > 0;
@@ -354,6 +363,7 @@
/// <param name="userId">鐢ㄦ埛搴忓垪</param>
/// <param name="nums">鍔犲叆璐墿杞︽暟閲�</param>
/// <param name="ruleId">瑙勫垯搴忓垪</param>
+ /// <param name="ruleId">璐у搧鏄惁瀹氬埗</param>
public async Task<WebApiCallBack> AddCartHavePinTuan(int productId, int userId = 0, int nums = 1, int ruleId = 0)
{
var jm = new WebApiCallBack();
@@ -512,6 +522,7 @@
cartProducts.type = item.type;
cartProducts.weight = goodsWeight;
cartProducts.products = productInfo;
+ cartProducts.isCustomizable = item.isCustomizable;
//濡傛灉浼犺繃鏉ヤ簡璐墿杞︽暟鎹紝灏辩畻鎸囧畾鐨勮喘鐗╄溅鐨勬暟鎹紝鍚﹀垯锛屽氨绠楀叏閮ㄨ喘鐗╄溅鐨勬暟鎹�
if (ids != null && ids.Any() && ids.Contains(item.id))
{
@@ -631,6 +642,13 @@
}
//鍗曟潯鍟嗗搧鎬讳环
item.products.amount = Math.Round(item.nums * (decimal)item.products.price, 2);
+ //瀹氬埗鍟嗗搧娣诲姞瀹氬埗浠锋牸
+ if (item.isCustomizable)
+ //鏄畾鍒跺晢鍝�
+ {
+ item.products.amount += _bfbfComAPIService.CommandCustomizable(item.nums);
+ item.CustomizableMoney = _bfbfComAPIService.CommandCustomizable(item.nums);
+ }
if (item.isSelect)
{
diff --git a/CoreCms.Net.Services/Good/CoreCmsGoodsServices.cs b/CoreCms.Net.Services/Good/CoreCmsGoodsServices.cs
index 3841395..b8fb661 100644
--- a/CoreCms.Net.Services/Good/CoreCmsGoodsServices.cs
+++ b/CoreCms.Net.Services/Good/CoreCmsGoodsServices.cs
@@ -552,6 +552,9 @@
if (product == null) return null;
good.skuList = await GetCoreCmsProductsView(good, products, userId, isPromotion, type, groupId);
+ var coutiscut = products.Where(x => x.isCustomizable == true).Count();
+ if (coutiscut > 0)
+ good.isCustomizable = true;
}
else
{
@@ -836,6 +839,7 @@
item.distributionCutMoney = o.distributionCutMoney;
item.mktPrice = o.mktprice;
item.selPrice = o.price;
+ item.isCustomizable = o.isCustomizable;
if (type == GlobalEnumVars.OrderType.PinTuan.ToString().ToLowerInvariant())
{
if (isMaxPinTuanGoodsNums)
@@ -892,6 +896,7 @@
item.distributionCutMoney = o.distributionCutMoney;
item.mktPrice = o.mktprice;
item.selPrice = o.price;
+ item.isCustomizable = o.isCustomizable;
if (type == GlobalEnumVars.OrderType.PinTuan.ToString().ToLowerInvariant())
{
if (isMaxPinTuanGoodsNums)
diff --git a/CoreCms.Net.Services/Order/CoreCmsOrderServices.cs b/CoreCms.Net.Services/Order/CoreCmsOrderServices.cs
index 5a02e7e..c31eadd 100644
--- a/CoreCms.Net.Services/Order/CoreCmsOrderServices.cs
+++ b/CoreCms.Net.Services/Order/CoreCmsOrderServices.cs
@@ -809,7 +809,10 @@
weight = Math.Round(item.weight * item.nums, 2),
sendNums = 0,
addon = item.products.spesDesc,
- createTime = DateTime.Now
+ createTime = DateTime.Now,
+ CustomizableMoney= item.CustomizableMoney,
+ IsCustomizable = item.isCustomizable,
+
};
if (item.products.promotionList.Count > 0)
{
diff --git a/CoreCms.Net.Services/baifenbingfa/BfbfComAPIService.cs b/CoreCms.Net.Services/baifenbingfa/BfbfComAPIService.cs
index 60c787d..0b5c19e 100644
--- a/CoreCms.Net.Services/baifenbingfa/BfbfComAPIService.cs
+++ b/CoreCms.Net.Services/baifenbingfa/BfbfComAPIService.cs
@@ -63,5 +63,13 @@
{
return await _unitOfWork.GetDbClient().Queryable<CoreCmsGoodsCategory>().Where(x=>x.isShow==true).WithCache(10).ToTreeAsync(x=>x.children, x=>x.parentId,0);
}
+
+
+ public decimal CommandCustomizable(int count)
+ {
+ if (count > 9999)
+ return 0;
+ return count * 1;
+ }
}
}
diff --git a/CoreCms.Net.Services/baifenbingfa/CoreCmsProductsServices.cs b/CoreCms.Net.Services/baifenbingfa/CoreCmsProductsServices.cs
index 5df0ea1..6596e2a 100644
--- a/CoreCms.Net.Services/baifenbingfa/CoreCmsProductsServices.cs
+++ b/CoreCms.Net.Services/baifenbingfa/CoreCmsProductsServices.cs
@@ -184,7 +184,8 @@
unit = good.unit,
distributionPrice = product.distributionPrice,
cutMoney = product.cutMoney,
- distributionCutMoney = product.distributionCutMoney,
+ distributionCutMoney = product.distributionCutMoney,
+ isCustomizable=product.isCustomizable,
}).With(SqlWith.NoLock)
.FirstAsync();
diff --git a/CoreCms.Net.Web.Admin/Controllers/baifenbingfa/CoreCmsProductsController.cs b/CoreCms.Net.Web.Admin/Controllers/baifenbingfa/CoreCmsProductsController.cs
index 1b97ef6..c12cfe2 100644
--- a/CoreCms.Net.Web.Admin/Controllers/baifenbingfa/CoreCmsProductsController.cs
+++ b/CoreCms.Net.Web.Admin/Controllers/baifenbingfa/CoreCmsProductsController.cs
@@ -245,6 +245,17 @@
{
where = where.And(p => p.distributionCutMoney == distributionCutMoney);
}
+
+ //鏄惁鍒犻櫎 bit
+ var isCustomizable = Request.Form["isCustomizable"].FirstOrDefault();
+ if (!string.IsNullOrEmpty(isCustomizable) && isCustomizable.ToLowerInvariant() == "true")
+ {
+ where = where.And(p => p.isCustomizable == true);
+ }
+ else if (!string.IsNullOrEmpty(isCustomizable) && isCustomizable.ToLowerInvariant() == "false")
+ {
+ where = where.And(p => p.isCustomizable == false);
+ }
//鑾峰彇鏁版嵁
var list = await _CoreCmsProductsServices.QueryDetailPageAsync(where, orderEx, orderBy, pageCurrent, pageSize, true);
//杩斿洖鏁版嵁
@@ -344,6 +355,8 @@
[Description("缂栬緫鎻愪氦")]
public async Task<AdminUiCallBack> DoEdit([FromBody]CoreCmsProducts entity)
{
+
+
var jm = await _CoreCmsProductsServices.UpdateAsync(entity);
return jm;
}
diff --git a/CoreCms.Net.Web.Admin/wwwroot/views/baifenbingfa/corecmsproducts/edit.html b/CoreCms.Net.Web.Admin/wwwroot/views/baifenbingfa/corecmsproducts/edit.html
index df722be..00d2066 100644
--- a/CoreCms.Net.Web.Admin/wwwroot/views/baifenbingfa/corecmsproducts/edit.html
+++ b/CoreCms.Net.Web.Admin/wwwroot/views/baifenbingfa/corecmsproducts/edit.html
@@ -116,13 +116,8 @@
<img class="coreshop-upload-img" id="viewImgBoximages" src="{{d.params.data.images || layui.setter.noImagePicUrl }}">
</div>
</div> -->
-<!--
- <div class="layui-form-item" pane>
- <label for="isDel" class="layui-form-label layui-form-required">鏄惁鍒犻櫎</label>
- <div class="layui-input-block">
- <input type="checkbox" lay-filter="switch" name="isDel" {{ d.params.data.isDel ? 'checked' : '' }} lay-skin="switch" lay-text="寮�鍚瘄鍏抽棴">
- </div>
- </div> -->
+
+
<div class="layui-form-item">
<label for="distributionCutMoney" class="layui-form-label layui-form-required" style="width: 180px;">鎺ㄥ箍缁忛攢鍟嗛噰璐繑鐜�(鍏�)</label>
@@ -137,7 +132,12 @@
</div>
</div>
-
+ <div class="layui-form-item" pane>
+ <label for="isCustomizable" class="layui-form-label layui-form-required">鏄惁鏀寔瀹氬埗</label>
+ <div class="layui-input-block">
+ <input type="checkbox" lay-filter="switch" name="isCustomizable" {{ d.params.data.isCustomizable ? 'checked' : '' }} lay-skin="switch" lay-text="鏀寔|涓嶆敮鎸�">
+ </div>
+ </div>
<div class="layui-form-item text-right core-hidden">
<input type="button" class="layui-btn" lay-submit lay-filter="LAY-app-CoreCmsbaifenProducts-editForm-submit" id="LAY-app-CoreCmsbaifenProducts-editForm-submit" value="纭缂栬緫">
diff --git a/CoreCms.Net.Web.Admin/wwwroot/views/baifenbingfa/corecmsproducts/index.html b/CoreCms.Net.Web.Admin/wwwroot/views/baifenbingfa/corecmsproducts/index.html
index 46a408c..a1cdb74 100644
--- a/CoreCms.Net.Web.Admin/wwwroot/views/baifenbingfa/corecmsproducts/index.html
+++ b/CoreCms.Net.Web.Admin/wwwroot/views/baifenbingfa/corecmsproducts/index.html
@@ -29,9 +29,8 @@
</div>
<div class="layui-inline">
<label class="layui-form-label" for="category">鍟嗗搧鍒嗙被</label>
- <div class="layui-input-inline">
-
- <div id="sel_category_ptindes555" class="ew-xmselect-tree" lay-reqText="璇烽�夋嫨鍟嗗搧鍒嗙被"></div>
+ <div class="layui-input-inline" style="width: 200px;">
+ <div id="sel_category_ptindes555" class="ew-xmselect-tree" lay-reqText="璇烽�夋嫨鍟嗗搧鍒嗙被"></div>
</div>
</div>
<div class="layui-inline">
@@ -80,6 +79,9 @@
</select>
</div>
</div>
+
+
+
<!-- <div class="layui-inline">
<label class="layui-form-label" for="pointsDeduction">绉垎鍙姷鎵ｉ噾棰�</label>
<div class="layui-input-inline">
@@ -161,6 +163,16 @@
</div>
</div> -->
<div class="layui-inline">
+ <label class="layui-form-label" for="isCustomizable">鏄惁鏀寔瀹氬埗</label>
+ <div class="layui-input-inline">
+ <select name="isCustomizable">
+ <option value="">璇烽�夋嫨</option>
+ <option value="True">鏄�</option>
+ <option value="False">鍚�</option>
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
<button class="layui-btn layui-btn-sm" lay-submit lay-filter="LAY-app-CoreCmsbaifenProducts-search"><i class="layui-icon layui-icon-search"></i>绛涢��</button>
</div>
</div>
@@ -187,7 +199,7 @@
<i class="layui-icon layui-icon-help"></i>
纭畾瑕佸垹闄ゅ悧锛�
</div>
- <div class="dropdown-popconfirm-btn">
+ <div class="dropdown-popconfirm-btn" >
<a class="layui-btn layui-btn-primary cursor" btn-cancel>鍙栨秷</a>
<a class="layui-btn layui-btn-normal cursor" lay-event="del">纭畾</a>
</div>
@@ -279,7 +291,15 @@
// { field: 'isDefalut', title: '鏄惁榛樿璐у搧', width: 95, templet: '#switch_isDefalut', sort: false , unresize: true},
// { field: 'isDel', title: '鏄惁鍒犻櫎', width: 95, templet: '#switch_isDel', sort: false , unresize: true},
-
+ { field: 'isCustomizable', title: '鏄惁鏀寔瀹氬埗', width: 100, sort: false,
+ templet: function (d) {
+ if (d.isCustomizable==true) {
+ return '<span style="color: red;">鏄�</span>';
+ } else {
+ return '<span>鍚�</span>';
+ }
+ }
+ },
{ width: 162, align: 'center', title:'鎿嶄綔', fixed: 'right', toolbar: '#LAY-app-CoreCmsbaifenProducts-tableBox-bar' }
]
]
@@ -412,9 +432,17 @@
function(data) {
var field = data.field; //鑾峰彇鎻愪氦鐨勫瓧娈�
- field.marketable = field.marketable == 'on';
- field.isDefalut = field.isDefalut == 'on';
- field.isDel = field.isDel == 'on';
+ // field.marketable = field.marketable == 'on';
+ // field.isDefalut = field.isDefalut == 'on';
+ // field.isDel = field.isDel == 'on';
+ if(field.isCustomizable=='on')
+ {
+ field.isCustomizable=true
+ }
+ else
+ {
+ field.isCustomizable=false
+ }
if (debug) { console.log(field); } //寮�鍚皟璇曡繑鍥炴暟鎹�
//鎻愪氦 Ajax 鎴愬姛鍚庯紝鍏抽棴褰撳墠寮瑰眰骞堕噸杞借〃鏍�
diff --git a/CoreCms.Net.Web.Admin/wwwroot/views/distribution/distributor/achievement.html b/CoreCms.Net.Web.Admin/wwwroot/views/distribution/distributor/achievement.html
index ad6ee04..fbb21a5 100644
--- a/CoreCms.Net.Web.Admin/wwwroot/views/distribution/distributor/achievement.html
+++ b/CoreCms.Net.Web.Admin/wwwroot/views/distribution/distributor/achievement.html
@@ -7,16 +7,16 @@
<tbody>
<tr>
<td style="width:30%;">
- 开始时间
+ 寮�濮嬫椂闂�
</td>
<td style="width:30%;">
- 结束时间
+ 缁撴潫鏃堕棿
</td>
<td style="width:20%;">
- 绩效总额
+ 缁╂晥鎬婚
</td>
<td style="width:20%;">
- 推广费用
+ 鎺ㄥ箍璐圭敤
</td>
</tr>
@@ -44,7 +44,7 @@
<script>
var debug = layui.setter.debug;
layui.data.done = function (d) {
- //开启调试情况下获取接口赋值数据
+ //锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷禄锟饺★拷涌诟锟街碉拷锟斤拷锟�
if (debug) { console.log(d.params.data); }
layui.use(['admin', 'form', 'coreHelper'], function () {
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 995ed9f..7010892 100644
--- a/CoreCms.Net.Web.Admin/wwwroot/views/distribution/distributor/create.html
+++ b/CoreCms.Net.Web.Admin/wwwroot/views/distribution/distributor/create.html
@@ -23,6 +23,11 @@
<input name="mobile" lay-verify="required|phone" class="layui-input" placeholder="璇疯緭鍏ユ墜鏈哄彿" lay-reqText="璇疯緭鍏ユ墜鏈哄彿" />
</div>
</div>
+ <div class="layui-form-item">
+ <label for="schoolName" class="layui-form-label ">瀛︽牎鍚嶇О</label>
+ <div class="layui-input-inline">
+ <input name="schoolName" class="layui-input" id="CreatschoolName" placeholder="瀛︽牎鍚嶇О" lay-reqText="瀛︽牎鍚嶇О" value="" />
+ </div>
<div class="layui-form-item">
<label for="profession" class="layui-form-label layui-form-required">鎵�灞炶涓�</label>
<div class="layui-input-inline">
@@ -111,7 +116,7 @@
id: 103,
},
{
- title: "寰晢",
+ title: "鐢靛晢锛堝井鍟嗭級",
id: 104,
},
{
@@ -121,6 +126,13 @@
{
title: "鏁欏笀",
id: 106,
+ }, {
+ title: "鏁欒偛璧勬簮鍟�",
+ id: 107,
+ }
+ , {
+ title: "鏍″洯浠ｇ悊",
+ id: 108,
},
],
click: function (obj) {
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 e90bcf1..9f617ca 100644
--- a/CoreCms.Net.Web.Admin/wwwroot/views/distribution/distributor/details.html
+++ b/CoreCms.Net.Web.Admin/wwwroot/views/distribution/distributor/details.html
@@ -86,7 +86,32 @@
<img src=" {{ d.params.data.model.storeBanner ? d.params.data.model.storeBanner:'/static/images/common/empty-banner.png' }}" />
</td>
</tr>
+ <tr>
+ <td>
+ <label for="schoolName">瀛︽牎鍚嶇О</label>
+ </td>
+ <td>
+ {{ d.params.data.model.schoolName || '' }}
+ </td>
+ <td>
+ <label for="idCradNumber">韬唤璇�</label>
+ </td>
+ <td>
+ {{#if(d.params.data.model.idCradNumber){}}
+
+
+ <a href="javascript:;" class="preview-image" data-url="{{d.params.data.lisimg1}}">
+ <img src="{{d.params.data.lisimg1}}" alt="鍥剧墖棰勮" style="max-width:30px;max-height:30px; margin-left: 5px;">
+ </a>
+ <!-- <a href="javascript:void(0);" onclick=""><img style="max-width:30px;max-height:30px; margin-left: 5px;" src="{{d.params.data.lisimg1}}" /></a>
+ <a href="javascript:void(0);" onclick=""><img style="max-width:30px;max-height:30px; margin-left: 5px;" src="{{d.params.data.lisimg1}}" /></a> -->
+ {{# }else{}}
+
+ <img src=" /static/images/common/empty-banner.png" />
+ {{# }}}
+ </td>
+ </tr>
<tr>
<td>
<label for="storeDesc">搴楅摵绠�浠�</label>
@@ -140,13 +165,35 @@
//寮�鍚皟璇曟儏鍐典笅鑾峰彇鎺ュ彛璧嬪�兼暟鎹�
if (debug) { console.log(d.params.data); }
- layui.use(['admin', 'form', 'coreHelper'], function () {
+
+ layui.use(['admin', 'form', 'coreHelper','photos'], function () {
var $ = layui.$
, setter = layui.setter
, admin = layui.admin
, coreHelper = layui.coreHelper
+ ,photos=layui.photos
, form = layui.form;
+
form.render(null, 'LAY-app-CoreCmsDistribution-detailsForm');
});
+
+ // 鐩戝惉鍥剧墖閾炬帴鐨勭偣鍑讳簨浠�
+ $('.preview-image').on('click', function () {
+ var index = $(this).data('index');
+ var imgSrc = $(this).attr('href');
+
+ // 浣跨敤layer鐨勫浘鐗囬瑙堝姛鑳�
+ layer.photos({
+ photos: '.image-links' // 杩欓噷鎸囧畾浜嗗浘鐗囨墍鍦ㄧ殑鐖跺鍣�
+ , anim: 5 // 鍥剧墖鍒囨崲鍔ㄧ敾锛岄粯璁ゆ槸0锛屽彲浠ヨ缃�0-6鐨勬暟瀛楋紝浠ｈ〃涓嶅悓鐨勫姩鐢绘晥鏋�
+ , success: function (layero, index) {
+ // 褰撳墠棰勮鐨勫浘鐗囩储寮�
+ console.log('褰撳墠棰勮鐨勫浘鐗囩储寮�:', index);
+ // 濡傛灉闇�瑕侊紝浣犲彲浠ュ湪杩欓噷娣诲姞鏇村鐨勬搷浣滐紝姣斿鍏抽棴鏃剁殑鍥炶皟
+ }
+ });
+
+ return false; // 闃绘榛樿鐨勯摼鎺ヨ涓�
+ });
};
</script>
\ No newline at end of file
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 bb3b0c1..e6a2d91 100644
--- a/CoreCms.Net.Web.Admin/wwwroot/views/distribution/distributor/edit.html
+++ b/CoreCms.Net.Web.Admin/wwwroot/views/distribution/distributor/edit.html
@@ -3,7 +3,7 @@
* @Author: 灏忛渚�
* @Date: 2024-02-28 13:48:49
* @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-04-16 15:08:49
+ * @LastEditTime: 2024-05-23 08:17:53
* Copyright: 2024 MinTinge CO.,LTD. All Rights Reserved.
* @Descripttion: 鍐欏叆浣犵殑鎻忚堪
-->
@@ -109,7 +109,7 @@
id: 103,
},
{
- title: "寰晢",
+ title: "鐢靛晢锛堝井鍟嗭級",
id: 104,
},
{
@@ -120,6 +120,14 @@
title: "鏁欏笀",
id: 106,
},
+ {
+ title: "鏁欒偛璧勬簮鍟�",
+ id: 107,
+ },
+ {
+ title: "鏍″洯浠ｇ悊",
+ id: 108,
+ },
],
click: function (obj) {
this.elem.val(obj.title);
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 0ae8851..a1cd7ce 100644
--- a/CoreCms.Net.Web.Admin/wwwroot/views/distribution/distributor/index.html
+++ b/CoreCms.Net.Web.Admin/wwwroot/views/distribution/distributor/index.html
@@ -202,6 +202,26 @@
// }
// }
// },
+ { field: 'schoolName', title: '瀛︽牎鍚嶇О', sort: false,width: 133 },
+ {
+ field: 'idCradNumber', title: '韬唤璇�', width: 120, sort: false,
+ templet: function (d) {
+ if (d.idCradNumber) {
+
+ var listimg= d.idCradNumber.split(",")
+ var str="";
+ listimg.forEach((value,index)=>
+ {
+ str+= '<a href="javascript:void(0);" onclick=layui.coreHelper.viewImage("' + value + '")><image style="max-width:30px;max-height:30px; margin-left: 5px;" src="' + value + '" /></a>'
+
+ })
+
+ return str;
+ } else {
+ return '<a href="javascript:void(0);" onclick=layui.coreHelper.viewImage("' + setter.noImagePicUrl + '")><image style="max-width:30px;max-height:30px; margin-left: 5px;" src="' + setter.noImagePicUrl + '" /></a>';
+ }
+ }
+ },
{
field: 'storeBanner', title: '闂ㄥご鍥剧墖', sort: false, width: 100, templet: function (d) {
if (d.storeBanner) {
@@ -373,6 +393,15 @@
function doDetails(obj) {
coreHelper.Post("Api/CoreCmsDistribution/GetDetails", { id: obj.data.id }, function (e) {
if (e.code === 0) {
+ debugger
+ if(e.data.model.idCradNumber)
+ {
+
+ lisimg=e.data.model.idCradNumber.split(',');
+ e.data.lisimg1=lisimg[0];
+
+ e.data.lisimg2=lisimg[1];
+ }
admin.popup({
shadeClose: false,
title: '鏌ョ湅璇︽儏',
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 0505773..ded9a9f 100644
--- a/CoreCms.Net.Web.Admin/wwwroot/views/good/goods/create.html
+++ b/CoreCms.Net.Web.Admin/wwwroot/views/good/goods/create.html
@@ -467,6 +467,7 @@
<th style="width: 60px;">鎺ㄥ箍缁忛攢鍟嗛噰璐繑鐜�</th>
<th>鎺ㄥ箍鐢ㄦ埛璐拱杩旂幇</th>
+ <th style="width: 80px;">鏄惁鏀寔瀹氬埗</th>
<!-- <th>浜岀骇杩旂幇</th>
<!-- <th>涓夌骇杩旂幇</th> --> -->
<th>鎿嶄綔</th>
@@ -536,6 +537,10 @@
</td>
<td>
<input type="text" name="product[cutMoney][]" value="{{item.cutMoney||'0'}}" placeholder="鏅�氱敤鎴疯喘涔拌繑鐜�" class="layui-input layui-inline-1">
+ </td>
+ <td>
+ <!-- <input type="checkbox" name="product[isCustomizable][]" value="{{item.isCustomizable||'false'}}" placeholder="鏅�氱敤鎴疯喘涔拌繑鐜�" class="layui-input layui-inline-1"> -->
+ <input type="checkbox" name="product[isCustomizable][]" title="鏀寔|涓嶆敮鎸�" lay-skin="switch" value="{{item.distributionCutMoney||'false'}}" lay-filter="isCustomizable" class="isCustomizable">
</td>
<!-- <td>
<input type="text" name="product[levelTwo][]" value="{{item.levelTwo}}" placeholder="浜岀骇杩旂幇" class="layui-input layui-inline-1">
@@ -1463,7 +1468,13 @@
}
form.render();
});
-
+
+ // 鐩戝惉寮�鍏冲垏鎹簨浠�
+ form.on('switch(isCustomizable)', function(data){
+ var elem = data.elem; // 褰撳墠寮�鍏冲厓绱�
+ elem.value=true;
+
+ });
function openSpecBox(is_open) {
if (is_open == '0') {
$("input[name=openSpec]").val("1");
@@ -1861,7 +1872,7 @@
//澶氬弬鏁颁骇鍝佸簱鐢熸垚鍒楄〃闆嗗悎
var products = [];
var productsCount = parseInt(field['productsCount']);
- debugger
+
for (var i = 0; i < productsCount; i++) {
var productModel = {};
productModel.costprice = field['product[costprice][' + i + ']'];
@@ -1882,7 +1893,10 @@
productModel.levelThree = field['product[levelThree][' + i + ']'];
productModel.pointsDeduction = field['product[pointsDeduction][' + i + ']'];
productModel.points = field['product[points][' + i + ']'];
+ debugger
//鐧惧垎鍏垫硶娣诲姞
+ productModel.isCustomizable = field['product[isCustomizable][' + i + ']'];
+ productModel.points = field['product[points][' + i + ']'];
productModel.distributionPrice = field['product[distributionPrice][' + i + ']'];
productModel.distributionCutMoney = field['product[distributionCutMoney][' + i + ']'];
productModel.cutMoney = field['product[cutMoney][' + i + ']'];
diff --git a/CoreCms.Net.Web.Admin/wwwroot/views/good/goods/details.html b/CoreCms.Net.Web.Admin/wwwroot/views/good/goods/details.html
index e28905c..105ac2c 100644
--- a/CoreCms.Net.Web.Admin/wwwroot/views/good/goods/details.html
+++ b/CoreCms.Net.Web.Admin/wwwroot/views/good/goods/details.html
@@ -216,6 +216,7 @@
<th style="width: 60px;">鎺ㄥ箍缁忛攢鍟嗛噰璐繑鐜�</th>
<th>鎺ㄥ箍鐢ㄦ埛璐拱杩旂幇</th>
+ <th style="width: 80px;">鏀寔瀹氬埗</th>
<!-- <th>浜岀骇杩旂幇</th>
<!-- <th>涓夌骇杩旂幇</th> --> -->
</tr>
@@ -275,6 +276,11 @@
<td>
{{item.cutMoney}}
</td>
+ {{#if (item.isCustomizable == true){}}
+ <td style="color: red;" >鏄�</td>
+ {{#}else{}}
+ <td >鍚�</td>
+ {{#}}}
<!-- <td>
{{item.levelOne}}
</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 47a6359..8a920fd 100644
--- a/CoreCms.Net.Web.Admin/wwwroot/views/good/goods/edit.html
+++ b/CoreCms.Net.Web.Admin/wwwroot/views/good/goods/edit.html
@@ -323,6 +323,7 @@
<th style="width: 60px;">鎺ㄥ箍缁忛攢鍟嗛噰璐繑鐜�</th>
<th>鎺ㄥ箍鐢ㄦ埛璐拱杩旂幇</th>
+ <th style="width: 80px;">鏄惁鏀寔瀹氬埗</th>
<!-- <th>浜岀骇杩旂幇</th>
<!-- <th>涓夌骇杩旂幇</th> --> -->
@@ -397,6 +398,9 @@
</td>
<td>
<input type="text" name="product[cutMoney][]" value="{{item.cutMoney||'0'}}" placeholder="鎺ㄥ箍鏅�氱敤鎴疯喘涔拌繑鐜�" class="layui-input layui-inline-1">
+ </td>
+ <td>
+ <input type="checkbox" name="product[isCustomizable][]" {{item.isCustomizable==true? 'checked':""}} value="{{item.isCustomizable||'false'}}" title="鏀寔|涓嶆敮鎸�" lay-skin="switch" lay-filter="isCustomizable" >
</td>
<!-- <td>
<input type="text" name="product[levelTwo][]" value="{{item.levelTwo}}" placeholder="浜岀骇杩旂幇" class="layui-input layui-inline-1">
@@ -1077,7 +1081,12 @@
});
}
});
-
+ // 鐩戝惉寮�鍏冲垏鎹簨浠�
+ form.on('switch(isCustomizable)', function(data){
+ var elem = data.elem; // 褰撳墠寮�鍏冲厓绱�
+ elem.value=true;
+
+ });
//鍥鹃泦涓婁紶
$('#upBtnimageIds').click(function () {
cropperImg.cropImg({
@@ -1995,6 +2004,7 @@
productModel.pointsDeduction = field['product[pointsDeduction][' + i + ']'];
productModel.points = field['product[points][' + i + ']'];
//娣诲姞 鐧惧垎鍏垫硶
+ productModel.isCustomizable = field['product[isCustomizable][' + i + ']'];
productModel.distributionPrice = field['product[distributionPrice][' + i + ']'];
productModel.distributionCutMoney = field['product[distributionCutMoney][' + i + ']'];
productModel.cutMoney = field['product[cutMoney][' + i + ']'];
diff --git a/CoreCms.Net.Web.Admin/wwwroot/views/order/orders/details.html b/CoreCms.Net.Web.Admin/wwwroot/views/order/orders/details.html
index 8de0075..aa85068 100644
--- a/CoreCms.Net.Web.Admin/wwwroot/views/order/orders/details.html
+++ b/CoreCms.Net.Web.Admin/wwwroot/views/order/orders/details.html
@@ -213,6 +213,7 @@
<th>鍟嗗搧鍚嶇О</th>
<th width="30">鍟嗗搧<br />鍗曚环</th>
<th width="30">璐拱<br />鏁伴噺</th>
+ <th width="50">鏄惁瀹氬埗</th>
<th width="30">淇冮攢<br />閲戦</th>
<th width="40">鍟嗗搧<br />鎬讳环</th>
<th width="110">淇冮攢鍚嶇О</th>
@@ -229,6 +230,11 @@
<td>{{item.name}} - {{item.addon}}</td>
<td>{{item.price}}</td>
<td>{{item.nums}}</td>
+ {{#if (item.isCustomizable == true){}}
+ <td style="color: red;" >鏄�</td>
+ {{#}else{}}
+ <td >鍚�</td>
+ {{#}}}
<td>{{item.promotionAmount}}</td>
<td>{{item.amount}}</td>
<td>
diff --git a/CoreCms.Net.Web.Admin/wwwroot/views/order/orders/index.html b/CoreCms.Net.Web.Admin/wwwroot/views/order/orders/index.html
index a9fff6e..f676c6b 100644
--- a/CoreCms.Net.Web.Admin/wwwroot/views/order/orders/index.html
+++ b/CoreCms.Net.Web.Admin/wwwroot/views/order/orders/index.html
@@ -1317,10 +1317,11 @@
<tr>
<th colspan="1" style="width: 400px;">鍟嗗搧鍚嶇О</th>
<th colspan="2" style="width: 300px;">璐у搧</th>
- <th style="width: 40px;">鏁伴噺</th>
- <th style="width: 40px;">鍗曚环</th>
- <th style="width: 40px;">浼樻儬</th>
- <th style="width: 40px;">鍚堣</th>
+ <th style="width: 60px;">鏁伴噺</th>
+ <th style="width: 60px;">鍗曚环</th>
+ <th style="width: 60px;">鏄惁瀹氬埗</th>
+ <th style="width: 60px;">浼樻儬</th>
+ <th style="width: 80px;">鍚堣</th>
</tr>
</thead>
<tbody>
@@ -1338,6 +1339,11 @@
</td>
<td>{{item.nums}}</td>
<td>{{item.price}}</td>
+ {{#if (item.isCustomizable == true){}}
+ <td style="color: red;" >鏄�</td>
+ {{#}else{}}
+ <td >鍚�</td>
+ {{#}}}
<td>{{item.promotionAmount}}</td>
<td>{{item.amount}}</td>
</tr>
diff --git a/CoreCms.Net.Web.Admin/wwwroot/views/order/orders/ship.html b/CoreCms.Net.Web.Admin/wwwroot/views/order/orders/ship.html
index 6178db8..8ae2d17 100644
--- a/CoreCms.Net.Web.Admin/wwwroot/views/order/orders/ship.html
+++ b/CoreCms.Net.Web.Admin/wwwroot/views/order/orders/ship.html
@@ -81,6 +81,7 @@
<th>鍟嗗搧缂栫爜</th>
<th>璐у搧缂栫爜</th>
<th>璐拱鏁伴噺</th>
+ <th>鏄惁瀹氬埗</th>
<th>宸查��鏁伴噺</th>
<th>宸插彂鏁伴噺</th>
<th>鍙戣揣鏁伴噺</th>
@@ -92,6 +93,11 @@
<td>{{item.bn}}</td>
<td>{{item.sn}}</td>
<td>{{item.nums}}</td>
+ {{#if (item.isCustomizable == true){}}
+ <td style="color: red;" >鏄�</td>
+ {{#}else{}}
+ <td >鍚�</td>
+ {{#}}}
<td>{{item.reshipNums}}</td>
<td>{{item.sendNums}}</td>
<td>
diff --git a/CoreCms.Net.Web.WebApi/Controllers/CartController.cs b/CoreCms.Net.Web.WebApi/Controllers/CartController.cs
index 3f61cfc..ebca83a 100644
--- a/CoreCms.Net.Web.WebApi/Controllers/CartController.cs
+++ b/CoreCms.Net.Web.WebApi/Controllers/CartController.cs
@@ -56,7 +56,7 @@
[Authorize]
public async Task<WebApiCallBack> AddCart([FromBody] FMCartAdd entity)
{
- var jm = await _cartServices.Add(_user.ID, entity.ProductId, entity.Nums, entity.type, entity.cartType, entity.objectId);
+ var jm = await _cartServices.Add(_user.ID, entity.ProductId, entity.Nums, entity.type, entity.cartType, entity.objectId,entity.isCustomizable);
return jm;
}
diff --git a/CoreCms.Net.Web.WebApi/Controllers/DistributionController.cs b/CoreCms.Net.Web.WebApi/Controllers/DistributionController.cs
index a489b77..405790a 100644
--- a/CoreCms.Net.Web.WebApi/Controllers/DistributionController.cs
+++ b/CoreCms.Net.Web.WebApi/Controllers/DistributionController.cs
@@ -127,6 +127,8 @@
iData.sales=entity.sales;
iData.storeName = entity.storeName;
iData.storeCoordinate =entity.storeCoordinate;
+ iData.schoolName = entity.schoolName;
+ iData.idCradNumber = entity.idCradNumber;
jm = await _distributionServices.AddData(iData, _user.ID);
return jm;
--
Gitblit v1.9.1