提交代码

Mall.Model/Entity/BaseSetUp/RB_FreeShipping.cs

@@ -51,6 +51,11 @@ namespace Mall.Model.Entity.BaseSetUp
         /// </summary>
         public string Name { get; set; }
 
+        /// <summary>
+        /// 跳转链接
+        /// </summary>
+        public string FreeShippingUrl { get; set; }
+
         /// <summary>
         /// 是否启用全局包邮
         /// </summary>

Mall.Module.Product/ProductModule.cs

@@ -1989,6 +1989,7 @@ namespace Mall.Module.Product
                     freeShippingName = model.FreeShippingModel.Name,
                     fullMoneyPinkage = model.FreeShippingModel.FullMoneyPinkage ?? 0,
                     fullNumPinkage = model.FreeShippingModel.FullNumPinkage ?? 0,
+                    freeShippingUrl = model.FreeShippingModel.FreeShippingUrl,
                     cats = model.CategoryList.Select(x => new
                     {
                         x.CategoryId,

Mall.WebApi/Controllers/MallBase/MallBaseController.cs

@@ -997,7 +997,8 @@ namespace Mall.WebApi.Controllers.MallBase
                 x.FullNumPinkage,
                 x.CategoryList,
                 x.IsEnable,
-                x.Name
+                x.Name,
+                x.FreeShippingUrl
             });
             return ApiResult.Success("", pagelist);
         }

Mall.WebApi/Controllers/Product/AppletOrderController.cs

@@ -67,6 +67,7 @@ namespace Mall.WebApi.Controllers.MallBase
                 FreeShippingName = x.FreeShippingModel.Name,
                 FreeShippingFullMoneyPinkage = x.FreeShippingModel.FullMoneyPinkage ?? 0,
                 FreeShippingFullNumPinkage = x.FreeShippingModel.FullNumPinkage ?? 0,
+                x.FreeShippingModel.FreeShippingUrl,
             });
             List<object> robj = new List<object>() {
                  new {

Mall.WebApi/Controllers/User/SupplierController.cs

@@ -315,14 +315,15 @@ namespace Mall.WebApi.Controllers.User
                             {
                                 FinanceType = 1,
                                 Final_Price = orderGoodsItem.Final_Price,
-                                Number = 1,
+                                Number = orderGoodsItem.Number,
                                 FreightMoney = orderGoodsItem.FreightMoney,
                                 GoodsName = orderGoodsItem.GoodsName,
                                 OrderNo = orderGoodsItem.OrderNo,
-                                Id = orderGoodsItem.Id
+                                Id = orderGoodsItem.Id,
+                                CostMoney = orderGoodsItem.CostMoney,
+                                FreightCostMoney = orderGoodsItem.FreightCostMoney
                             };
                             result.Add(newOrderGoods);
-
                         }
                     }
                     else if (demodel.IsSelectAll == 0 || demodel.IsSelectAll == 2)
@@ -340,7 +341,9 @@ namespace Mall.WebApi.Controllers.User
                                 FreightMoney = orderGoodsItem.FreightMoney,
                                 GoodsName = orderGoodsItem.GoodsName,
                                 OrderNo = orderGoodsItem.OrderNo,
-                                Id = orderGoodsItem.Id
+                                Id = orderGoodsItem.Id,
+                                CostMoney= orderGoodsItem.CostMoney,
+                                FreightCostMoney=orderGoodsItem.FreightCostMoney
                             };
                             result.Add(newOrderGoods);
                         }