From 626943b5ba84ce44bc19f4c3b8e8e94638bec733 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期一, 09 九月 2024 14:15:59 +0800
Subject: [PATCH] 查单
---
CoreCms.Net.Web.WebApi/Controllers/OrderController.cs | 141 ++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 138 insertions(+), 3 deletions(-)
diff --git a/CoreCms.Net.Web.WebApi/Controllers/OrderController.cs b/CoreCms.Net.Web.WebApi/Controllers/OrderController.cs
index c5c3f4c..ef08f50 100644
--- a/CoreCms.Net.Web.WebApi/Controllers/OrderController.cs
+++ b/CoreCms.Net.Web.WebApi/Controllers/OrderController.cs
@@ -10,6 +10,7 @@
using System;
+using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using CoreCms.Net.Auth.HttpContextUser;
@@ -22,6 +23,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 +53,9 @@
private readonly ICoreCmsUserServices _userServices;
private readonly ICoreCmsClerkServices _clerkServices;
private readonly ICoreCmsInvoiceServices _invoiceServices;
-
+ private readonly ICoreCmsPlanOrderServices _planOrderServices;
+ private readonly ICoreCmsPlanOrderItemServices _planOrderItemServices;
+ private readonly ICoreCmsOrderItemServices _orderItemServices;
/// <summary>
/// 鏋勯�犲嚱鏁�
@@ -61,7 +65,10 @@
, 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
+ , ICoreCmsOrderItemServices orderItemServices)
{
_user = user;
_orderServices = orderServices;
@@ -76,6 +83,9 @@
_userServices = userServices;
_clerkServices = clerkServices;
_invoiceServices = invoiceServices;
+ _planOrderServices = planOrderServices;
+ _planOrderItemServices = planOrderItemServices;
+ _orderItemServices = orderItemServices;
}
@@ -223,7 +233,7 @@
entity.ushipId, entity.storeId, entity.ladingName, entity.ladingMobile, entity.memo,
entity.point, entity.couponCode, entity.source, entity.scene, entity.taxType, entity.taxName,
entity.taxCode, entity.objectId, entity.teamId, entity.requireOrder, entity.requiredFundType,
- entity.traceId);
+ entity.traceId, entity.planorderId);
}
catch (Exception e)
{
@@ -370,6 +380,131 @@
#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, entity.money);
+ 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);
+ model.keYongAmount = model.keYongAmount - model.huaFeiAmount;
+ var modelItem = await _planOrderItemServices.QueryListByClauseAsync(p => p.orderId == entity.id && p.isOld == false, p => p.specification, OrderByType.Asc);
+
+ var modelItem2 = await _planOrderItemServices.QueryListByClauseAsync(p => p.orderId == entity.id && p.isOld == true, p => p.specification, OrderByType.Asc);
+
+ foreach (var coreCmsPlanOrderItem in modelItem)
+ {
+ var coreCmsPlanOrderItem1 = modelItem2.Where(p => p.name == coreCmsPlanOrderItem.name && p.specification == coreCmsPlanOrderItem.specification).FirstOrDefault();
+ if (coreCmsPlanOrderItem1 != null)
+ {
+ coreCmsPlanOrderItem.idnew = coreCmsPlanOrderItem1.id;
+ coreCmsPlanOrderItem.numsnew = coreCmsPlanOrderItem1.nums; //鍘熻鍗曡鍒掓暟閲�
+ coreCmsPlanOrderItem.amountnew = coreCmsPlanOrderItem1.amount;//鍘熻鍗曡鍒掗噾棰�
+ }
+ }
+ var coreCmsOrderItems = new List<CoreCmsOrderItem>();
+ //鏌ヨ鐢ㄨ鍒掕鍗曠Н鍒嗚喘涔扮殑璁㈠崟
+ var coreCmsOrders = await _orderServices.QueryListByClauseAsync(p => p.planorderId == model.orderId && p.isdel == false);
+ if (coreCmsOrders != null && coreCmsOrders.Count > 0)
+ {
+ var orderids = new List<string>();
+ foreach (var coreCmsOrder in coreCmsOrders)
+ {
+ orderids.Add(coreCmsOrder.orderId);
+ }
+ coreCmsOrderItems = await _orderItemServices.QueryListByClauseAsync(p => orderids.Contains(p.orderId));
+
+ }
+
+ jm.code = 0;
+ jm.status = true;
+ jm.data = new
+ {
+ model,
+ modelItem,
+ coreCmsOrderItems
+ };
+
+ 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