username@email.com
2024-05-15 5591c18dc3500bd3e0719bb6b28b26f7f9e7cb58
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);
            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;