修改计划订单

username@email.com

2024-04-30 d15481638e21ccc610f5e36577497cb6279839b9

 CoreCms.Net.Web.Admin/Controllers/Order/CoreCmsPlanOrderController.cs

@@ -34,6 +34,15 @@
using CoreCms.Net.Model.Entities.Order;
using CoreCms.Net.Services;
using System.Threading;
using MathNet.Numerics.Distributions;
using CoreCms.Net.Model.ViewModels.DTO;
using CoreCms.Net.Auth.HttpContextUser;
using MathNet.Numerics;
using Org.BouncyCastle.Asn1.Cmp;
using static CoreCms.Net.Configuration.GlobalEnumVars;
using static SKIT.FlurlHttpClient.Wechat.Api.Models.CardCreateRequest.Types.MembershipCard.Types.Base.Types;
using static SKIT.FlurlHttpClient.Wechat.Api.Models.CgibinExpressDeliveryOpenMessageGetDeliveryListResponse.Types;
using System.Threading.Channels;

namespace CoreCms.Net.Web.Admin.Controllers
{
@@ -52,6 +61,9 @@
        private readonly ICoreCmsPlanOrderItemServices _planOrderItemServices;
        private readonly ICoreCmsSettingServices _coreCmsSettingServices;
        private readonly SemaphoreSlim _semaphore;
        private readonly IHttpContextUser _user;
        private readonly ICoreCmsPlanOrderServices _planOrderServices;
        private readonly ICoreCmsAreaServices _areaServices;


        /// <summary>
@@ -61,12 +73,18 @@
            ,ICoreCmsPlanOrderServices CoreCmsPlanOrderServices
             , ICoreCmsPlanOrderItemServices planOrderItemServices
            , ICoreCmsSettingServices coreCmsSettingServices
            , IHttpContextUser user
            , ICoreCmsPlanOrderServices planOrderServices
            , ICoreCmsAreaServices areaServices
            )
        {
            _webHostEnvironment = webHostEnvironment;
            _CoreCmsPlanOrderServices = CoreCmsPlanOrderServices;
            _planOrderItemServices = planOrderItemServices;
            _coreCmsSettingServices = coreCmsSettingServices;
            _user = user;
            _planOrderServices = planOrderServices;
            _areaServices = areaServices;
        }

        #region 获取列表============================================================
@@ -108,8 +126,26 @@
            {
                where = where.And(p => p.orderId.Contains(orderId));
            }
         //调整订单金额 decimal
         var orderAmount = Request.Form["orderAmount"].FirstOrDefault().ObjectToDecimal(0);
            //市 varchar
            var shi = Request.Form["shi"].FirstOrDefault().ObjectToInt(0);
            if (shi>0)
            {
                where = where.And(p => p.shiId == shi);
            }
            //区县 varchar
            var quxian = Request.Form["quxian"].FirstOrDefault().ObjectToInt(0); ;
            if (quxian>0)
            {
                where = where.And(p => p.quxianId == quxian);
            }
            //收货地址 varchar
            var shouhuoAddress = Request.Form["shouhuoAddress"].FirstOrDefault();
            if (!string.IsNullOrEmpty(shouhuoAddress))
            {
                where = where.And(p => p.shouhuoAddress.Contains(shouhuoAddress));
            }
            //调整订单金额 decimal
            var orderAmount = Request.Form["orderAmount"].FirstOrDefault().ObjectToDecimal(0);
            if (orderAmount > 0)
            {
                where = where.And(p => p.orderAmount == orderAmount);
@@ -244,10 +280,37 @@
        /// <returns></returns>
        [HttpPost]
        [Description("首页数据")]
        public AdminUiCallBack GetIndex()
        public async Task<AdminUiCallBack> GetIndex()
        {
            //返回数据
            var jm = new AdminUiCallBack { code = 0 };

          var shi = await _areaServices.QueryListByClauseAsync(p=>p.parentId == 510000);

            jm.data = shi;

            return jm;
        }
        #endregion


        #region 选择市============================================================
        // POST: Api/CoreCmsPlanOrder/GetIndex
        /// <summary>
        /// 选择市
        /// </summary>
        /// <returns></returns>
        [Description("选择市")]
        [AllowAnonymous]
        public async Task<AdminUiCallBack> GetAreaId(int cityid = 0)
        {
            //返回数据
            var jm = new AdminUiCallBack { code = 0 };

            var shi = await _areaServices.QueryListByClauseAsync(p => p.parentId == cityid);

            jm.data = shi;

            return jm;
        }
        #endregion
@@ -293,7 +356,7 @@
        /// <returns></returns>
        [HttpPost]
        [Description("编辑数据")]
        public async Task<AdminUiCallBack> GetEdit([FromBody]FMIntId entity)
        public async Task<AdminUiCallBack> GetEdit([FromBody]FMStringId entity)
        {
            var jm = new AdminUiCallBack();

@@ -303,8 +366,22 @@
                jm.msg = "不存在此信息";
                return jm;
            }
            //获取相关状态描述说明转换
            model.statusText = EnumHelper.GetEnumDescriptionByValue<GlobalEnumVars.PlanOrderTiJiao>(model.status);


            var modelItem1 = await _planOrderItemServices.QueryListByClauseAsync(p => p.orderId == entity.id && p.isOld == true, p => p.specification, OrderByType.Asc);

            var modelItem2 = await _planOrderItemServices.QueryListByClauseAsync(p => p.orderId == entity.id && p.isOld == false, p => p.specification, OrderByType.Asc);

            jm.data = new
            {
                model,
                modelItem1,
                modelItem2
            };
            jm.code = 0;
            jm.data = model;
           // jm.data = model;

            return jm;
        }
@@ -319,10 +396,59 @@
        /// <returns></returns>
        [HttpPost]
        [Description("编辑提交")]
        public async Task<AdminUiCallBack> DoEdit([FromBody]CoreCmsPlanOrder entity)
        public async Task<AdminUiCallBack> DoEdit([FromBody] CreateOrder entity)
        {
            var jm = await _CoreCmsPlanOrderServices.UpdateAsync(entity);
            var jm = new AdminUiCallBack();



            try
            {


                if (entity.itemIdarray ==null || entity.itemIdarray.Length==0)
                {
                    jm.data = 10000;
                    jm.msg = GlobalErrorCodeVars.Code10000;
                    return jm;
                }
                string itemIds = string.Join(",", entity.itemIdarray);

                string itemNums = string.Join(",", entity.itemNumarray);

                
                // jm = await _CoreCmsPlanOrderServices.UpdateAsync(new CoreCmsPlanOrder());
                 var jms = await _planOrderServices.ToUpdate(entity.orderId, _user.ID, _user.Name, 2, itemIds, itemNums,"shi");
                if (jms.status)
                {
                    jm.code = 0;
                    jm.data = jms.data;
                    jm.msg = "修改成功";
                }
                else
                {
                    jm.code = 1;
                    jm.data = jms.data;
                    jm.msg = jms.otherData.ToString();
                }
                 
               


                
            }
            catch (Exception e)
            {
                jm.msg = "数据处理异常";
                jm.otherData = e;
            }


            return jm;


           
          
        }
        #endregion

@@ -391,11 +517,15 @@
            model.statusText = EnumHelper.GetEnumDescriptionByValue<GlobalEnumVars.PlanOrderTiJiao>(model.status);


            var modelItem = await _planOrderItemServices.QueryListByClauseAsync(p => p.orderId == entity.id, p => p.specification, OrderByType.Asc);
            var modelItem1 = await _planOrderItemServices.QueryListByClauseAsync(p => p.orderId == entity.id && p.isOld == true, p => p.specification, OrderByType.Asc);

            var modelItem2 = await _planOrderItemServices.QueryListByClauseAsync(p => p.orderId == entity.id && p.isOld == false, p => p.specification, OrderByType.Asc);
          
            jm.data = new
            {
                model,
                modelItem,
                modelItem1,
                modelItem2
            };
            jm.code = 0;
            //jm.data = model;