提交订单信息

Mall.Model/Extend/Product/RB_Goods_Order_Extend.cs

@@ -4,6 +4,7 @@ using System.Collections.Generic;
 using System.Text;
 using Mall.Model.Entity.Product;
 using Mall.Common.Enum.Goods;
+using Mall.Model.Entity.User;
 
 namespace Mall.Model.Extend.Product
 {
@@ -114,6 +115,12 @@ namespace Mall.Model.Extend.Product
         /// 订单返佣列表
         /// </summary>
         public List<RB_SmallShops_Commission_Extend> SmallShopsCommissionOrderList { get; set; }
+
+
+        /// <summary>
+        /// 优惠券信息  //2020-08-25 Add By:w
+        /// </summary>
+        public List<User.RB_Member_DiscountCoupon_Extend> MemberDiscountCouponList { get; set; }
         /// <summary>
         /// 是否发放佣金   1是  2否
         /// </summary>
@@ -178,7 +185,7 @@ namespace Mall.Model.Extend.Product
         /// <summary>
         /// 成本价
         /// </summary>
-        public decimal CostMoneyImport { get; set; } 
+        public decimal CostMoneyImport { get; set; }
         /// <summary>
         /// 支付方式
         /// </summary>

Mall.WebApi/Controllers/MarketingCenter/CouponController.cs

@@ -429,6 +429,7 @@ namespace Mall.WebApi.Controllers.MarketingCenter
                             memberCoupon.MallBaseId = oldLogisticsModel.MallBaseId;
                             memberCoupon.Remarks = "";
                             memberCoupon.CouponId = oldLogisticsModel.ID;
+                            memberCoupon.Name = oldLogisticsModel.Name;
                             if (oldLogisticsModel.IndateType == Common.Enum.MarketingCenter.IndateTypeEnum.DayHorizon)
                             {
                                 memberCoupon.StartDate = System.DateTime.Now;

Mall.WebApi/Controllers/Product/OrderController.cs

@@ -93,9 +93,20 @@ namespace Mall.WebApi.Controllers.MallBase
                 DeliveryMethodName = x.DeliveryMethod.GetEnumName(),
                 x.Income,
                 x.FreightMoney,
-                x.CouponMoney,
                 x.PaymentWay,
                 PaymentWayName = x.PaymentWay.GetEnumName(),
+                CouponMoney = x.CouponMoney ?? 0,
+                IntegralMoney = (x.DetailList != null && x.DetailList.Any()) ? (x.DetailList.Sum(x => x.IntegralMoney ?? 0)) : 0,
+                IntegralNumber = (x.DetailList != null && x.DetailList.Any()) ? (x.DetailList.Sum(x => x.IntegralNumber ?? 0)) : 0,
+                MemberDiscountCouponList = x.MemberDiscountCouponList.Select(y => new
+                {
+                    y.Name,
+                    y.MinConsumePrice,
+                    y.MaxDiscountsPrice,
+                    y.UseType,
+                    y.CouponType,
+                    y.DiscountsPrice
+                }),
                 DetailList = x.DetailList.Select(y => new
                 {
                     y.SupplierId,
@@ -120,12 +131,17 @@ namespace Mall.WebApi.Controllers.MallBase
                     y.RealMoney,
                     y.YFMoney,
                     y.PayMoney,
-                    SFinanceList = y.FinanceList.Where(z => z.Type == 1).Select(z => new {
+                    CouponMoney = y.CouponMoney ?? 0,
+                    IntegralMoney = y.IntegralMoney ?? 0,
+                    IntegralNumber = y.IntegralNumber ?? 0,
+                    SFinanceList = y.FinanceList.Where(z => z.Type == 1).Select(z => new
+                    {
                         z.FrID,
                         z.Status,
                         z.Is_Cashier
                     }),
-                    ZFinanceList = y.FinanceList.Where(z => z.Type == 2).Select(z => new {
+                    ZFinanceList = y.FinanceList.Where(z => z.Type == 2).Select(z => new
+                    {
                         z.FrID,
                         z.Status,
                         z.Is_Cashier

Mall.WebApi/Controllers/User/AppletUserController.cs

@@ -1053,6 +1053,7 @@ namespace Mall.WebApi.Controllers.User
                 memberCoupon.MallBaseId = userInfo.MallBaseId;
                 memberCoupon.Remarks = "";
                 memberCoupon.CouponId = oldLogisticsModel.ID;
+                memberCoupon.Name = oldLogisticsModel.Name;
                 if (oldLogisticsModel.IndateType == Common.Enum.MarketingCenter.IndateTypeEnum.DayHorizon)
                 {
                     memberCoupon.StartDate = System.DateTime.Now;