From d7fec17e093788d71dcd89bb0d94030a9f6ecfae Mon Sep 17 00:00:00 2001
From: 移动系统liao <liaoxujun@qq.com>
Date: 星期一, 13 五月 2024 14:25:38 +0800
Subject: [PATCH] 调整显示顺序
---
CoreCms.Net.Web.WebApi/Controllers/OrderController.cs | 118 +++++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 110 insertions(+), 8 deletions(-)
diff --git a/CoreCms.Net.Web.WebApi/Controllers/OrderController.cs b/CoreCms.Net.Web.WebApi/Controllers/OrderController.cs
index e2c278a..2d20428 100644
--- a/CoreCms.Net.Web.WebApi/Controllers/OrderController.cs
+++ b/CoreCms.Net.Web.WebApi/Controllers/OrderController.cs
@@ -1,10 +1,10 @@
锘�/***********************************************************************
- * Project: CoreCms
- * ProjectName: 鏍稿績鍐呭绠＄悊绯荤粺
- * Web: https://www.corecms.net
- * Author: 澶х伆鐏�
- * Email: jianweie@163.com
- * CreateTime: 2021/1/31 21:45:10
+ * Project: baifenBinfa
+ * ProjectName: 鐧惧垎鍏垫硶绠＄悊绯荤粺
+ * Web: http://chuanyin.com
+ * Author:
+ * Email:
+ * CreateTime: 202403/02
* Description: 鏆傛棤
***********************************************************************/
@@ -22,6 +22,7 @@
using CoreCms.Net.Model.FromBody;
using CoreCms.Net.Model.ViewModels.DTO;
using CoreCms.Net.Model.ViewModels.UI;
+using CoreCms.Net.Services;
using CoreCms.Net.Utility.Extensions;
using CoreCms.Net.Utility.Helper;
using Microsoft.AspNetCore.Authorization;
@@ -51,7 +52,8 @@
private readonly ICoreCmsUserServices _userServices;
private readonly ICoreCmsClerkServices _clerkServices;
private readonly ICoreCmsInvoiceServices _invoiceServices;
-
+ private readonly ICoreCmsPlanOrderServices _planOrderServices;
+ private readonly ICoreCmsPlanOrderItemServices _planOrderItemServices;
/// <summary>
/// 鏋勯�犲嚱鏁�
@@ -61,7 +63,9 @@
, ICoreCmsBillAftersalesServices aftersalesServices
, ICoreCmsSettingServices settingServices
, ICoreCmsAreaServices areaServices
- , ICoreCmsBillReshipServices reshipServices, ICoreCmsShipServices shipServices, ICoreCmsLogisticsServices logisticsServices, ICoreCmsOrderDistributionModelServices orderDistributionModelServices, IRedisOperationRepository redisOperationRepository, ICoreCmsUserServices userServices, ICoreCmsClerkServices clerkServices, ICoreCmsInvoiceServices invoiceServices)
+ , ICoreCmsBillReshipServices reshipServices, ICoreCmsShipServices shipServices, ICoreCmsLogisticsServices logisticsServices, ICoreCmsOrderDistributionModelServices orderDistributionModelServices, IRedisOperationRepository redisOperationRepository, ICoreCmsUserServices userServices, ICoreCmsClerkServices clerkServices, ICoreCmsInvoiceServices invoiceServices
+ , ICoreCmsPlanOrderServices planOrderServices
+ , ICoreCmsPlanOrderItemServices planOrderItemServices)
{
_user = user;
_orderServices = orderServices;
@@ -76,6 +80,8 @@
_userServices = userServices;
_clerkServices = clerkServices;
_invoiceServices = invoiceServices;
+ _planOrderServices = planOrderServices;
+ _planOrderItemServices = planOrderItemServices;
}
@@ -370,6 +376,102 @@
#endregion
+
+ #region 鑾峰彇璁″垝璁㈠崟鍒楄〃寰俊灏忕▼搴�=======================================================
+
+ /// <summary>
+ /// 鑾峰彇璁″垝璁㈠崟鍒楄〃寰俊灏忕▼搴�
+ /// </summary>
+ /// <returns></returns>
+ [HttpPost]
+ [Authorize]
+ public async Task<WebApiCallBack> GetPlanOrderList([FromBody] GetOrderListPost entity)
+ {
+ var jm = await _planOrderServices.GetOrderList(entity.status, _user.ID, entity.page, entity.limit);
+ return jm;
+ }
+
+
+
+ #endregion
+
+
+ #region 鑾峰彇璁″垝璁㈠崟璇︽儏=======================================================
+
+ /// <summary>
+ /// 鑾峰彇璁″垝璁㈠崟璇︽儏
+ /// </summary>
+ /// <returns></returns>
+ [HttpPost]
+ [Authorize]
+ public async Task<WebApiCallBack> GetPlanOrder([FromBody] FMStringId entity)
+ {
+ var jm = new WebApiCallBack();
+
+ var model = await _planOrderServices.QueryByIdAsync(entity.id);
+ if (model == null)
+ {
+ jm.msg = "涓嶅瓨鍦ㄦ淇℃伅";
+ return jm;
+ }
+
+ //鑾峰彇鐩稿叧鐘舵�佹弿杩拌鏄庤浆鎹�
+ model.statusText = EnumHelper.GetEnumDescriptionByValue<GlobalEnumVars.PlanOrderTiJiao>(model.status);
+ var modelItem = await _planOrderItemServices.QueryListByClauseAsync(p => p.orderId == entity.id && p.isOld == false, p => p.specification, OrderByType.Asc);
+
+ jm.code = 0;
+ jm.status = true;
+ jm.data = new
+ {
+ model,
+ modelItem,
+ };
+
+ return jm;
+ }
+
+
+ #region 淇敼璁″垝璁㈠崟==================================================
+ /// <summary>
+ /// 淇敼璁″垝璁㈠崟
+ /// </summary>
+ /// <returns></returns>
+ [HttpPost]
+ [Authorize]
+ public async Task<WebApiCallBack> UpdatePlanOrder([FromBody] CreateOrder entity)
+ {
+ var jm = new WebApiCallBack();
+
+
+
+ try
+ {
+
+
+ if (string.IsNullOrEmpty(entity.itemIds))
+ {
+ jm.data = 10000;
+ jm.msg = GlobalErrorCodeVars.Code10000;
+ return jm;
+ }
+
+ jm = await _planOrderServices.ToUpdate(entity.orderId , _user.ID, _user.Name, entity.status, entity.itemIds, entity.itemNums);
+ }
+ catch (Exception e)
+ {
+ jm.msg = "鏁版嵁澶勭悊寮傚父";
+ jm.otherData = e;
+ }
+
+
+ return jm;
+ }
+ #endregion
+
+
+
+ #endregion
+
#region 鍙栨秷璁㈠崟====================================================
/// <summary>
--
Gitblit v1.9.1