费用调整

Mall.Model/Entity/Product/RB_Goods_OrderDetail.cs

@@ -171,5 +171,9 @@ namespace Mall.Model.Entity.Product
         /// 是否评论   1是  2否
         /// </summary>
         public int? IsComment { get; set; }
+        /// <summary>
+        /// 运费
+        /// </summary>
+        public decimal? FreightMoney { get; set; }
     }
 }

Mall.Module.Product/OrderModule.cs

@@ -623,7 +623,8 @@ namespace Mall.Module.Product
                 dModel.GoodsName,
                 SpecificationList = JsonConvert.DeserializeObject<List<string>>(dModel.Specification),
                 dModel.Number,
-                dModel.Final_Price
+                dModel.Final_Price,
+                dModel.FreightMoney
             });
         }
 
@@ -1309,6 +1310,7 @@ namespace Mall.Module.Product
                         }
                     }
                     TotalExpress += Express;
+                    item.FreightMoney = Express;
                     item.Unit_Price = gmodel.SellingPrice ?? 0;
                     item.Original_Price = (item.Unit_Price) * (item.Number);
                     if (umodel.MemberGrade > 0)
@@ -1912,7 +1914,8 @@ namespace Mall.Module.Product
                     Unit_Price = item.Unit_Price,
                     TenantId = demodel.TenantId,
                     UpdateDate = DateTime.Now,
-                    IsComment = 2
+                    IsComment = 2,
+                    FreightMoney = item.FreightMoney
                 }, trans);
                 item.Id = detailId;
                 //更新商品数量
@@ -2154,7 +2157,7 @@ namespace Mall.Module.Product
         public bool SetAppletMyOrderAfterSale(RB_Goods_OrderAfterSale_Extend demodel)
         {
             var dModel = goods_OrderDetailRepository.GetEntity(demodel.OrderDetialId);
-            if (demodel.Type==1 && dModel.Final_Price < demodel.Refund) {
+            if (demodel.Type==1 && ((dModel.Final_Price??0)-(dModel.FreightMoney??0)) < demodel.Refund) {
                 return false;
             }
             demodel.Income = dModel.Final_Price;