<develop>:(Web 端)<无> ShopERP 项目 WebAPI 接口代码提交。

CoreCms.Net.Model/Entities/Order/CoreCmsOrder.cs

@@ -485,15 +485,6 @@ namespace CoreCms.Net.Model.Entities
         
         public System.Boolean isdel  { get; set; }
         
-        /// <summary>
-        /// 关联营销类型对象序列
-        /// </summary>
-        [Display(Name = "关联营销类型对象序列")]
-		
-        [Required(ErrorMessage = "请输入{0}")]
-        
-        public System.Int32 objectId  { get; set; }
-        
 
         /// <summary>
         /// 创建时间

CoreCms.Net.Services/Order/CoreCmsOrderServices.cs

@@ -198,8 +198,7 @@ namespace CoreCms.Net.Services
                 orderType = orderType,
                 point = point,
                 coupon = couponCode,
-                receiptType = receiptType,
-                objectId = objectId
+                receiptType = receiptType
             };
 
             //生成收货信息
@@ -628,34 +627,21 @@ namespace CoreCms.Net.Services
         public async Task<WebApiCallBack> GetOrderInfoByOrderId(string id, int userId = 0, int aftersaleLevel = 0)
         {
             var jm = new WebApiCallBack();
-
             var order = new CoreCmsOrder();
-            order = userId > 0
-                ? await _dal.QueryByClauseAsync(p => p.orderId == id && p.userId == userId)
-                : await _dal.QueryByClauseAsync(p => p.orderId == id);
+
+            try
+            {
+                order = await _dal.QueryByClauseAsync(p => p.orderId == id);
+
                 if (order == null)
                 {
                     jm.msg = "获取订单失败";
                     return jm;
                 }
+
                 //订单详情(子货品数据)
                 order.items = await _orderItemServices.QueryListByClauseAsync(p => p.orderId == order.orderId);
 
-            if (order.items.Any())
-            {
-                order.items.ForEach(p =>
-                {
-                    if (!string.IsNullOrEmpty(p.promotionList))
-                    {
-                        var jobj = JObject.Parse(p.promotionList);
-                        if (jobj.Values().Any())
-                        {
-                            p.promotionObj = jobj.Values().FirstOrDefault();
-                        }
-                    }
-                });
-            }
-
                 //获取相关状态描述说明转换
                 order.statusText = EnumHelper.GetEnumDescriptionByValue<GlobalEnumVars.OrderStatus>(order.status);
                 order.payStatusText = EnumHelper.GetEnumDescriptionByValue<GlobalEnumVars.OrderPayStatus>(order.payStatus);
@@ -702,16 +688,6 @@ namespace CoreCms.Net.Services
                         item.logiName = outFirstAsync != null ? outFirstAsync.logiName : item.logiCode;
                     }
                 }
-            //获取提货门店
-            if (order.storeId != 0)
-            {
-                order.store = await _storeServices.QueryByIdAsync(order.storeId);
-                if (order.store != null)
-                {
-                    var areaBack = await _areaServices.GetAreaFullName(order.store.areaId);
-                    order.store.allAddress = areaBack.status ? areaBack.data + order.store.address : order.store.address;
-                }
-            }
                 //获取配送方式
                 if (order.logisticsId > 0)
                 {
@@ -729,11 +705,6 @@ namespace CoreCms.Net.Services
                 //获取支付方式
                 var pm = await _paymentsServices.QueryByClauseAsync(p => p.code == order.paymentCode);
                 order.paymentName = pm != null ? pm.name : "未知支付方式";
-            //优惠券
-            //if (!string.IsNullOrEmpty(order.coupon))
-            //{
-            //    order.couponObj = await _couponServices.QueryWithAboutAsync(p => p.usedId == order.orderId);
-            //}
                 order.couponObj = await _couponServices.QueryWithAboutAsync(p => p.usedId == order.orderId);
 
                 var allConfigs = await _settingServices.GetConfigDictionaries();
@@ -834,6 +805,7 @@ namespace CoreCms.Net.Services
                         item.statusName = EnumHelper.GetEnumDescriptionByValue<GlobalEnumVars.BillReshipStatus>(item.status);
                     }
                 }
+
                 //售后单取当前活动的收货单
                 if (order.aftersalesItem != null && order.aftersalesItem.Any())
                 {
@@ -844,34 +816,19 @@ namespace CoreCms.Net.Services
                         if (item.status == (int)GlobalEnumVars.BillAftersalesStatus.WaitAudit) break;
                     }
                 }
+
                 //把退款金额和退货商品查出来
                 AfterSalesVal(order, aftersaleLevel);
-            //促销信息
-            if (!string.IsNullOrEmpty(order.promotionList))
-            {
-                order.promotionObj = JsonConvert.DeserializeObject(order.promotionList);
-            }
-
-            //发票信息
-            var invoiceModel = await _invoiceServices.GetOrderInvoiceInfo(order.orderId);
-            if (invoiceModel != null && invoiceModel.status)
-            {
-                order.invoice = invoiceModel.data;
-            }
-            else
-            {
-                order.invoice = new
-                {
-                    type = order.taxType,
-                    title = order.taxTitle,
-                    taxNumber = order.taxCode
-                };
-            }
                
                 jm.status = true;
                 jm.data = order;
                 jm.msg = GlobalConstVars.GetDataSuccess;
-
+            }
+            catch (Exception ex)
+            {
+                jm.msg = ex.Message;
+                Console.WriteLine(ex.Message);
+            }
             return jm;
         }
 

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

@@ -53,8 +53,7 @@ namespace CoreCms.Net.Web.Admin.Controllers
 
         private readonly ICoreCmsOrderItemServices _orderItemServices;
 
-
-
+        #region 构造函数
         /// <summary>
         /// 构造函数
         ///</summary>
@@ -83,6 +82,7 @@ namespace CoreCms.Net.Web.Admin.Controllers
             _billDeliveryServices = billDeliveryServices;
             _orderItemServices = orderItemServices;
         } 
+        #endregion
 
         #region 获取列表============================================================
         // POST: Api/CoreCmsOrder/GetPageList

CoreCms.Net.Web.Admin/wwwroot/views/order/orders/details.html

@@ -105,24 +105,6 @@
                         <div class="layui-input-inline layui-inline-3 layui-form-mid">￥{{d.params.data.payedAmount}}元</div>
                     </div>
 
-                    <fieldset class="layui-elem-field layui-field-title" style="margin-top: 20px;">
-                        <legend style="font-size:14px;">发票信息</legend>
-                    </fieldset>
-
-                    <div class="layui-form-item">
-                        <label class="layui-form-label">发票类型</label>
-                        <div class="layui-input-inline  layui-inline-3 layui-form-mid">{{d.params.data.taxTypeText}}</div>
-                        <label class="layui-form-label">发票内容</label>
-                        <div class="layui-input-inline  layui-inline-3 layui-form-mid">
-                            {{# if (d.params.data.invoice.type != 1) { }}商品明细{{# } else{  }}  无 {{# }  }}
-                        </div>
-                        <label class="layui-form-label">税号</label>
-                        <div class="layui-input-inline  layui-inline-3 layui-form-mid">{{d.params.data.invoice.taxNumber||'无'}}</div>
-
-                        <label class="layui-form-label">发票抬头</label>
-                        <div class="layui-input-inline  layui-inline-3 layui-form-mid">{{d.params.data.invoice.title||'无'}}</div>
-                    </div>
-
                     <!--收货人信息-->
                     {{# if (d.params.data.store) { }}
                     <fieldset class="layui-elem-field layui-field-title" style="margin-top: 20px;">
@@ -183,26 +165,7 @@
                         <label class="layui-form-label">买家备注</label>
                         <div class="layui-input-inline layui-form-mid layui-inline-10">{{d.params.data.memo||'无'}}</div>
                     </div>
-                    <!--下单用户-->
-                    <fieldset class="layui-elem-field layui-field-title" style="margin-top: 20px;">
-                        <legend style="font-size:14px;">下单用户</legend>
-                    </fieldset>
-                    <div class="layui-form-item">
-                        <label class="layui-form-label">用户编号</label>
-                        <div class="layui-input-inline layui-inline-3 layui-form-mid">
-                            {{d.params.data.user.id}}
-                        </div>
-                        <label class="layui-form-label">用户手机</label>
-                        <div class="layui-input-inline layui-inline-3 layui-form-mid">
-                            {{d.params.data.user.mobile}}
-                        </div><label class="layui-form-label">用户昵称</label>
-                        <div class="layui-input-inline layui-inline-3 layui-form-mid">
-                            {{d.params.data.user.nickName}}
-                        </div><label class="layui-form-label">微信编号</label>
-                        <div class="layui-input-inline layui-inline-3 layui-form-mid">
-                            {{d.params.data.user.userWx}}
-                        </div>
-                    </div>
+                 
                 </div>
 
                 <!--商品详情-->