From 306ab8865840b2637590abb6e670e5614446f24d Mon Sep 17 00:00:00 2001
From: 移动系统liao <liaoxujun@qq.com>
Date: 星期二, 30 七月 2024 13:27:31 +0800
Subject: [PATCH] 增加商品字段，订单字段
---
CoreCms.Net.Model/Entities/Order/CoreCmsOrder.cs | 18 +++++
CoreCms.Net.Model/Entities/baifenbingfa/puhuo/PuhuoShoukuan.cs | 2
CoreCms.Net.Model/Entities/baifenbingfa/DistributionSend/DistributionSendOder.cs | 2
CoreCms.Net.Web.Admin/Properties/launchSettings.json | 2
CoreCms.Net.Model/Entities/baifenbingfa/puhuo/Puhuo.cs | 2
CoreCms.Net.Model/Entities/Good/CoreCmsGoods.cs | 57 +++++++++++++++++++
CoreCms.Net.Web.WebApi/Controllers/baifenbingfa/DistributorGoodsController.cs | 35 +++++++++++
CoreCms.Net.Model/Entities/Good/CoreCmsProducts.cs | 8 +-
CoreCms.Net.Web.WebApi/Controllers/DistributionController.cs | 1
9 files changed, 117 insertions(+), 10 deletions(-)
diff --git a/CoreCms.Net.Model/Entities/Good/CoreCmsGoods.cs b/CoreCms.Net.Model/Entities/Good/CoreCmsGoods.cs
index d8a175d..9c250fc 100644
--- a/CoreCms.Net.Model/Entities/Good/CoreCmsGoods.cs
+++ b/CoreCms.Net.Model/Entities/Good/CoreCmsGoods.cs
@@ -9,7 +9,9 @@
***********************************************************************/
using System;
+using System.ComponentModel;
using System.ComponentModel.DataAnnotations;
+using Chuanyin.Attribute;
using SqlSugar;
namespace CoreCms.Net.Model.Entities
@@ -17,6 +19,7 @@
/// <summary>
/// 鍟嗗搧琛�
/// </summary>
+ [SqlCodeFirst]
public partial class CoreCmsGoods
{
/// <summary>
@@ -256,5 +259,59 @@
/// </summary>
[SugarColumn(ColumnDescription = "鍖哄煙浠ｇ爜")]
public string areaCode { get; set; }
+ /// <summary>
+ /// 鍙戝竷鑰卌msUserID
+ /// </summary>
+ [SugarColumn(ColumnDescription = "鍙戝竷鑰卌msUserID",IsNullable =true)]
+ public int? publisherId { get; set; }
+
+ /// <summary>
+ /// 瀹℃牳鑰呭憳宸YSUserID"
+ /// </summary>
+ [SugarColumn(ColumnDescription = "瀹℃牳鑰呭憳宸YSUserID", IsNullable = true)]
+ public int? approverId { get; set; }
+
+ /// <summary>
+ /// 瀹℃牳鐘舵��
+ /// </summary>
+ [SugarColumn(ColumnDescription = "瀹℃牳鐘舵��", IsNullable = true)]
+ public AuditStatusTypoe? auditStatus { get; set; }
+
+ /// <summary>
+ /// 瀹℃牳鏃堕棿
+ /// </summary>
+ [SugarColumn(ColumnDescription = "瀹℃牳鏃堕棿", IsNullable = true)]
+ public DateTime? auditTime { get; set; }
+ }
+
+ /// <summary>
+ /// 瀹℃牳鐘舵�佹灇涓撅紝鐢ㄤ簬琛ㄧず涓嶅悓涓氬姟娴佺▼涓殑瀹℃牳鐘舵�併��
+ /// </summary>
+ public enum AuditStatusTypoe
+ {
+ /// <summary>
+ /// 寰呭鏍哥姸鎬侊紝琛ㄧず瀹℃牳灏氭湭寮�濮嬨��
+ /// </summary>
+ Pending = 0,
+
+ /// <summary>
+ /// 宸叉壒鍑嗙姸鎬侊紝琛ㄧず瀹℃牳宸查�氳繃銆�
+ /// </summary>
+ Approved = 1,
+
+ /// <summary>
+ /// 宸叉嫆缁濈姸鎬侊紝琛ㄧず瀹℃牳鏈�氳繃銆�
+ /// </summary>
+ Rejected = 2,
+
+ /// <summary>
+ /// 瀹℃牳杩涜涓姸鎬侊紝琛ㄧず瀹℃牳姝ｅ湪澶勭悊涓��
+ /// </summary>
+ InProgress = 3,
+
+ /// <summary>
+ /// 宸插彇娑堢姸鎬侊紝琛ㄧず瀹℃牳宸茶鍙栨秷銆�
+ /// </summary>
+ Cancelled = 4
}
}
\ 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 cf2a0c5..202abec 100644
--- a/CoreCms.Net.Model/Entities/Good/CoreCmsProducts.cs
+++ b/CoreCms.Net.Model/Entities/Good/CoreCmsProducts.cs
@@ -18,7 +18,6 @@
/// <summary>
/// 璐у搧琛�
/// </summary>
-
public partial class CoreCmsProducts
{
/// <summary>
@@ -131,10 +130,7 @@
/// </summary>
[Display(Name = "璐у搧甯傚満浠�")]
- [Required(ErrorMessage = "璇疯緭鍏0}")]
-
-
-
+ [Required(ErrorMessage = "璇疯緭鍏0}")]
public System.Decimal mktprice { get; set; }
@@ -273,5 +269,7 @@
[SugarColumn(IsIgnore = true)]
public System.Int32 nums { get; set; }
+
+
}
}
diff --git a/CoreCms.Net.Model/Entities/Order/CoreCmsOrder.cs b/CoreCms.Net.Model/Entities/Order/CoreCmsOrder.cs
index 5ffc8d4..e0665d8 100644
--- a/CoreCms.Net.Model/Entities/Order/CoreCmsOrder.cs
+++ b/CoreCms.Net.Model/Entities/Order/CoreCmsOrder.cs
@@ -18,7 +18,7 @@
/// <summary>
/// 璁㈠崟琛�
/// </summary>
-
+ [SqlCodeFirst]
public partial class CoreCmsOrder
{
/// <summary>
@@ -563,5 +563,21 @@
public System.String planorderId { get; set; }
+
+
+ /// <summary>
+ /// 鍙戝竷鑰卌msUserID
+ /// </summary>
+ [SugarColumn(ColumnDescription = "鍙戝竷鑰卌msUserID", IsNullable = true)]
+ public int? publisherId { get; set; }
+
+ /// <summary>
+ /// 鍘熻鍗旾D
+ /// </summary>
+ [SugarColumn(ColumnDescription = "鍘熻鍗旾D", IsNullable = true)]
+ public string oldOderId { get; set; }
+
+
+
}
}
diff --git a/CoreCms.Net.Model/Entities/baifenbingfa/DistributionSend/DistributionSendOder.cs b/CoreCms.Net.Model/Entities/baifenbingfa/DistributionSend/DistributionSendOder.cs
index ff12ccb..b9939f3 100644
--- a/CoreCms.Net.Model/Entities/baifenbingfa/DistributionSend/DistributionSendOder.cs
+++ b/CoreCms.Net.Model/Entities/baifenbingfa/DistributionSend/DistributionSendOder.cs
@@ -14,7 +14,7 @@
/// 渚涘簲鍟嗗彂璐ч厤鍙戣褰�
/// </summary>
[SugarTable(TableDescription = "渚涘簲鍟嗗彂璐ч厤鍙戣褰�")]
- [SqlCodeFirst]
+
public partial class DistributionSendOder: BFBaseModel
{
diff --git a/CoreCms.Net.Model/Entities/baifenbingfa/puhuo/Puhuo.cs b/CoreCms.Net.Model/Entities/baifenbingfa/puhuo/Puhuo.cs
index fcc3fa8..1fabe7c 100644
--- a/CoreCms.Net.Model/Entities/baifenbingfa/puhuo/Puhuo.cs
+++ b/CoreCms.Net.Model/Entities/baifenbingfa/puhuo/Puhuo.cs
@@ -14,7 +14,7 @@
/// <summary>
/// 閾鸿揣
/// </summary>
- [SqlCodeFirst]
+
public class Puhuo : BFBaseModel
{
/// <summary>
diff --git a/CoreCms.Net.Model/Entities/baifenbingfa/puhuo/PuhuoShoukuan.cs b/CoreCms.Net.Model/Entities/baifenbingfa/puhuo/PuhuoShoukuan.cs
index 6547bd6..947ead6 100644
--- a/CoreCms.Net.Model/Entities/baifenbingfa/puhuo/PuhuoShoukuan.cs
+++ b/CoreCms.Net.Model/Entities/baifenbingfa/puhuo/PuhuoShoukuan.cs
@@ -15,7 +15,7 @@
/// <summary>
/// 閾鸿揣
/// </summary>
- [SqlCodeFirst]
+
public class PuhuoShoukuan : BFBaseModel
{
diff --git a/CoreCms.Net.Web.Admin/Properties/launchSettings.json b/CoreCms.Net.Web.Admin/Properties/launchSettings.json
index e7e46ae..9ffa165 100644
--- a/CoreCms.Net.Web.Admin/Properties/launchSettings.json
+++ b/CoreCms.Net.Web.Admin/Properties/launchSettings.json
@@ -9,7 +9,7 @@
},
"CoreCms.Net.Web.Admin": {
"commandName": "Project",
- "launchBrowser": false,
+ "launchBrowser": true,
"environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development"
},
diff --git a/CoreCms.Net.Web.WebApi/Controllers/DistributionController.cs b/CoreCms.Net.Web.WebApi/Controllers/DistributionController.cs
index 405790a..3fe0961 100644
--- a/CoreCms.Net.Web.WebApi/Controllers/DistributionController.cs
+++ b/CoreCms.Net.Web.WebApi/Controllers/DistributionController.cs
@@ -129,6 +129,7 @@
iData.storeCoordinate =entity.storeCoordinate;
iData.schoolName = entity.schoolName;
iData.idCradNumber = entity.idCradNumber;
+
jm = await _distributionServices.AddData(iData, _user.ID);
return jm;
diff --git a/CoreCms.Net.Web.WebApi/Controllers/baifenbingfa/DistributorGoodsController.cs b/CoreCms.Net.Web.WebApi/Controllers/baifenbingfa/DistributorGoodsController.cs
new file mode 100644
index 0000000..f46e905
--- /dev/null
+++ b/CoreCms.Net.Web.WebApi/Controllers/baifenbingfa/DistributorGoodsController.cs
@@ -0,0 +1,35 @@
+锘縰sing CoreCms.Net.Model.Entities.baifenbingfa.jon;
+using CoreCms.Net.Model.ViewModels.UI;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc;
+using Swashbuckle.AspNetCore.Annotations;
+using System.Threading.Tasks;
+
+namespace CoreCms.Net.Web.WebApi.Controllers.baifenbingfa
+{
+ /// <summary>
+ /// 缁忛攢鍟嗗垱寤哄晢鍝佹帴鍙�
+ /// </summary>
+ [Route("api/[controller]/[action]")]
+ [ApiController]
+ [Authorize]
+ public class DistributorGoodsController : ControllerBase
+ {
+ /// <summary>
+ ///
+ /// </summary>
+ /// <returns></returns>
+ [HttpPost("GetGoodslist")]
+ [SwaggerResponse(200, "杩斿洖鏁版嵁", typeof(WebApiCallBack))]
+ [SwaggerResponse(201, "Data绫诲瀷", typeof(Job_jobSeting))]
+ public async Task<WebApiCallBack> GetGoodslist()
+ {
+ var jm = new WebApiCallBack();
+
+
+ jm.status = true;
+ return jm;
+
+ }
+ }
+}
--
Gitblit v1.9.1