Merge branch 'sdzq' of http://gitlab.oytour.com/Kui2/mall.oytour.com into HK

Mall.Model/Extend/MarketingCenter/RB_Miniprogram_Template_Extend.cs

@@ -2708,6 +2708,11 @@ namespace Mall.Model.Extend.MarketingCenter
         /// 课程评分  2020-10-13  ld 
         /// </summary>
         public decimal courseScore { get; set; }
+
+        /// <summary>
+        /// 定金服务商品使用
+        /// </summary>
+        public decimal DepositMoney { get; set; }
     }
 
 

Mall.WebApi/Controllers/Mall/MallHelper.cs

@@ -873,6 +873,7 @@ namespace Mall.WebApi.Controllers
                                                     lastItem.OriginalPrice = Math.Round((tempGood?.OriginalPrice ?? 0), 2);
                                                     lastItem.courseScore = (tempGood.CourseScore ?? 0);
                                                     lastItem.IsChooseServicePerson = tempGood.IsChooseServicePerson;
+                                                    lastItem.DepositMoney = Math.Round((tempGood?.DepositMoney ?? 0), 2);
                                                     newGoodsList.Add(lastItem);
                                                 }
                                             }
@@ -905,7 +906,8 @@ namespace Mall.WebApi.Controllers
                                                     picUrl = Common.Config.GetFileUrl(gItem.CoverImage),
                                                     OriginalPrice = Math.Round((gItem?.OriginalPrice ?? 0), 2),
                                                     courseScore = gItem.CourseScore ?? 0,
-                                                    IsChooseServicePerson = gItem.IsChooseServicePerson
+                                                    IsChooseServicePerson = gItem.IsChooseServicePerson,
+                                                    DepositMoney = gItem.DepositMoney
                                                 });
                                             }
                                         }
@@ -1033,7 +1035,8 @@ namespace Mall.WebApi.Controllers
                                             picUrl = Common.Config.GetFileUrl(gItem.CoverImage),
                                             OriginalPrice = Math.Round((gItem?.OriginalPrice ?? 0), 2),
                                             courseScore = gItem.CourseScore ?? 0,
-                                            IsChooseServicePerson = gItem.IsChooseServicePerson
+                                            IsChooseServicePerson = gItem.IsChooseServicePerson,
+                                            DepositMoney = gItem.DepositMoney,
                                         });
                                     }
                                 }
@@ -1160,6 +1163,7 @@ namespace Mall.WebApi.Controllers
                                             childItem.OriginalPrice = Math.Round((tempGood?.OriginalPrice ?? 0), 2);
                                             childItem.courseScore = (tempGood.CourseScore ?? 0);
                                             childItem.IsChooseServicePerson = tempGood.IsChooseServicePerson;
+                                            childItem.DepositMoney = tempGood.DepositMoney;
                                             newGoodsList.Add(childItem);
                                         }
                                     }