From f8ed0a1ee63cad489c67caaf76e9527a06da2947 Mon Sep 17 00:00:00 2001
From: 移动系统liao <liaoxujun@qq.com>
Date: 星期三, 29 五月 2024 17:01:56 +0800
Subject: [PATCH] no message

---
 CoreCms.Net.Web.WebApi/Controllers/OrderController.cs |   41 +++++++++++++++++++++++++++++++++++++----
 1 files changed, 37 insertions(+), 4 deletions(-)

diff --git a/CoreCms.Net.Web.WebApi/Controllers/OrderController.cs b/CoreCms.Net.Web.WebApi/Controllers/OrderController.cs
index fb89f0c..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;
@@ -54,6 +55,7 @@
         private readonly ICoreCmsInvoiceServices _invoiceServices;
         private readonly ICoreCmsPlanOrderServices _planOrderServices;
         private readonly ICoreCmsPlanOrderItemServices _planOrderItemServices;
+        private readonly ICoreCmsOrderItemServices _orderItemServices;
 
         /// <summary>
         /// 鏋勯�犲嚱鏁�
@@ -65,7 +67,8 @@
         , ICoreCmsAreaServices areaServices
         , ICoreCmsBillReshipServices reshipServices, ICoreCmsShipServices shipServices, ICoreCmsLogisticsServices logisticsServices, ICoreCmsOrderDistributionModelServices orderDistributionModelServices, IRedisOperationRepository redisOperationRepository, ICoreCmsUserServices userServices, ICoreCmsClerkServices clerkServices, ICoreCmsInvoiceServices invoiceServices
           , ICoreCmsPlanOrderServices planOrderServices
-            , ICoreCmsPlanOrderItemServices planOrderItemServices)
+            , ICoreCmsPlanOrderItemServices planOrderItemServices
+               , ICoreCmsOrderItemServices orderItemServices)
         {
             _user = user;
             _orderServices = orderServices;
@@ -82,6 +85,7 @@
             _invoiceServices = invoiceServices;
             _planOrderServices = planOrderServices;
             _planOrderItemServices = planOrderItemServices;
+            _orderItemServices = orderItemServices;
         }
 
 
@@ -229,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)
                 {
@@ -387,7 +391,7 @@
         [Authorize]
         public async Task<WebApiCallBack> GetPlanOrderList([FromBody] GetOrderListPost entity)
         {
-            var jm = await _planOrderServices.GetOrderList(entity.status, _user.ID, entity.page, entity.limit);
+            var jm = await _planOrderServices.GetOrderList(entity.status, _user.ID, entity.page, entity.limit, entity.money);
             return jm;
         }
 
@@ -409,6 +413,7 @@
             var jm = new WebApiCallBack();
 
             var model = await _planOrderServices.QueryByIdAsync(entity.id);
+            
             if (model == null)
             {
                 jm.msg = "涓嶅瓨鍦ㄦ淇℃伅";
@@ -417,7 +422,34 @@
 
             //鑾峰彇鐩稿叧鐘舵�佹弿杩拌鏄庤浆鎹�
             model.statusText = EnumHelper.GetEnumDescriptionByValue<GlobalEnumVars.PlanOrderTiJiao>(model.status);
-            var modelItem = await _planOrderItemServices.QueryListByClauseAsync(p => p.orderId == entity.id, p => p.specification, OrderByType.Asc);
+            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;
@@ -425,6 +457,7 @@
             {
                 model,
                 modelItem,
+                coreCmsOrderItems
             };
 
             return jm;

--
Gitblit v1.9.1