Commit 4a19043f authored by 吴春's avatar 吴春

提交代码

parent 4bb16eca
...@@ -77,6 +77,11 @@ namespace Mall.Model.Entity.BaseSetUp ...@@ -77,6 +77,11 @@ namespace Mall.Model.Entity.BaseSetUp
/// </summary> /// </summary>
public int BalanceFun { get; set; } public int BalanceFun { get; set; }
/// <summary>
/// 储值卡功能
/// </summary>
public int DepositFun { get; set; }
/// <summary> /// <summary>
/// 商品面议联系方式 /// 商品面议联系方式
/// </summary> /// </summary>
......
...@@ -106,7 +106,7 @@ namespace Mall.WebApi.Controllers ...@@ -106,7 +106,7 @@ namespace Mall.WebApi.Controllers
/// </summary> /// </summary>
/// <param name="item"></param> /// <param name="item"></param>
/// <returns></returns> /// <returns></returns>
public static object PlusDataToObject(ComponentItem subItem, int TenantId, int MallBaseId, int SmallShopsId, int IsOpenSchool, int StoreId, int UserId = 0) public static object PlusDataToObject(ComponentItem subItem, int TenantId, int MallBaseId, int SmallShopsId, int IsOpenSchool, int StoreId, int UserId = 0)
{ {
var obj = new object(); var obj = new object();
switch (subItem.Id) switch (subItem.Id)
...@@ -1395,7 +1395,7 @@ namespace Mall.WebApi.Controllers ...@@ -1395,7 +1395,7 @@ namespace Mall.WebApi.Controllers
foreach (var tempGood in tempGoodsList) foreach (var tempGood in tempGoodsList)
{ {
var lastItem = new miaiUserDetail(); var lastItem = new miaiUserDetail();
// var tempGood = tempGoodsList?.Where(qitem => qitem.UserId == goodItem.id)?.FirstOrDefault(); // var tempGood = tempGoodsList?.Where(qitem => qitem.UserId == goodItem.id)?.FirstOrDefault();
if (tempGood != null && tempGood.Id > 0) if (tempGood != null && tempGood.Id > 0)
{ {
lastItem.id = tempGood.UserId; lastItem.id = tempGood.UserId;
...@@ -1458,7 +1458,7 @@ namespace Mall.WebApi.Controllers ...@@ -1458,7 +1458,7 @@ namespace Mall.WebApi.Controllers
foreach (var tempGood in tempGoodsList) foreach (var tempGood in tempGoodsList)
{ {
var lastItem = new miaiUserDetail(); var lastItem = new miaiUserDetail();
// var tempGood = tempGoodsList?.Where(qitem => qitem.UserId == goodItem.id)?.FirstOrDefault(); // var tempGood = tempGoodsList?.Where(qitem => qitem.UserId == goodItem.id)?.FirstOrDefault();
if (tempGood != null && tempGood.Id > 0) if (tempGood != null && tempGood.Id > 0)
{ {
lastItem.id = tempGood.UserId; lastItem.id = tempGood.UserId;
...@@ -1521,7 +1521,7 @@ namespace Mall.WebApi.Controllers ...@@ -1521,7 +1521,7 @@ namespace Mall.WebApi.Controllers
foreach (var tempGood in tempGoodsList) foreach (var tempGood in tempGoodsList)
{ {
var lastItem = new miaiUserDetail(); var lastItem = new miaiUserDetail();
// var tempGood = tempGoodsList?.Where(qitem => qitem.UserId == goodItem.id)?.FirstOrDefault(); // var tempGood = tempGoodsList?.Where(qitem => qitem.UserId == goodItem.id)?.FirstOrDefault();
if (tempGood != null && tempGood.Id > 0) if (tempGood != null && tempGood.Id > 0)
{ {
lastItem.id = tempGood.UserId; lastItem.id = tempGood.UserId;
...@@ -2917,6 +2917,7 @@ namespace Mall.WebApi.Controllers ...@@ -2917,6 +2917,7 @@ namespace Mall.WebApi.Controllers
theme_color = "", theme_color = "",
latitude_longitude = mallBaseModel?.LongAndLat, latitude_longitude = mallBaseModel?.LongAndLat,
IsShowRecharge = rechargeModel.IsOpenBtn, IsShowRecharge = rechargeModel.IsOpenBtn,
IsDeposit = mallBaseModel?.DepositFun ?? 0,
IsOpenReserve = (miniProgram?.IsOpenReserve ?? 0), IsOpenReserve = (miniProgram?.IsOpenReserve ?? 0),
}; };
#endregion #endregion
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment