Skip to content

M
mall.oytour.com
Commit e2f36d73 authored by 黄奎's avatar 黄奎
Browse files
Options

页面修改

parent fda203e5
Hide whitespace changes
Inline Side-by-side
Showing with 117 additions and 77 deletions
Mall.Model/Extend/MarketingCenter/RB_Miniprogram_Template_Extend.cs
View file @ e2f36d73
...@@ -3351,7 +3351,9 @@ namespace Mall.Model.Extend.MarketingCenter ...@@ -3351,7 +3351,9 @@ namespace Mall.Model.Extend.MarketingCenter
/// <summary> /// <summary>
/// 购买按钮颜色 /// 购买按钮颜色
/// </summary> /// </summary>
#pragma warning disable IDE1006 // 命名样式
public string buttonColor { get; set; } public string buttonColor { get; set; }
#pragma warning restore IDE1006 // 命名样式
/// <summary> /// <summary>
/// 显示评分 ld 2020-10-13 /// 显示评分 ld 2020-10-13
......
Mall.Module.MarketingCenter/MiniprogramTemplateModule.cs
View file @ e2f36d73
...@@ -776,10 +776,7 @@ namespace Mall.Module.MarketingCenter ...@@ -776,10 +776,7 @@ namespace Mall.Module.MarketingCenter
} }
else if (miaiUserItem.addUserType == 2) else if (miaiUserItem.addUserType == 2)
{ {
var tempGoodsList = miai_BaseInfoRepository.GetFirstBaseInfoPageList(1, miaiUserItem.goodsLength, out long rowCount, new Model.Extend.Miai.RB_MiAi_BaseInfo_Extend
long rowCount = 0;
var tempGoodsList = miai_BaseInfoRepository.GetFirstBaseInfoPageList(1, miaiUserItem.goodsLength, out rowCount, new Model.Extend.Miai.RB_MiAi_BaseInfo_Extend
{ {
TenantId = TenantId, TenantId = TenantId,
MallBaseId = MallBaseId, MallBaseId = MallBaseId,
...@@ -815,14 +812,10 @@ namespace Mall.Module.MarketingCenter ...@@ -815,14 +812,10 @@ namespace Mall.Module.MarketingCenter
} }
} }
miaiUserItem.list = newGoodsList; miaiUserItem.list = newGoodsList;
} }
else if (miaiUserItem.addUserType == 3) else if (miaiUserItem.addUserType == 3)
{ {
var tempGoodsList = miai_BaseInfoRepository.GetFirstBaseInfoPageList(1, miaiUserItem.goodsLength, out long rowCount, new Model.Extend.Miai.RB_MiAi_BaseInfo_Extend
long rowCount = 0;
var tempGoodsList = miai_BaseInfoRepository.GetFirstBaseInfoPageList(1, miaiUserItem.goodsLength, out rowCount, new Model.Extend.Miai.RB_MiAi_BaseInfo_Extend
{ {
TenantId = TenantId, TenantId = TenantId,
MallBaseId = MallBaseId, MallBaseId = MallBaseId,
......
Mall.Module.TradePavilion/CompanyModule.cs
View file @ e2f36d73
...@@ -288,11 +288,12 @@ namespace Mall.Module.TradePavilion ...@@ -288,11 +288,12 @@ namespace Mall.Module.TradePavilion
} }
else else
{ {
model.BrandModel = new RB_BrandApplyFor_Extend(); model.BrandModel = new RB_BrandApplyFor_Extend
model.BrandModel.BannerList = new List<string>(); {
model.BrandModel.CustomerTypeInfo = new List<string>(); BannerList = new List<string>(),
CustomerTypeInfo = new List<string>()
};
} }
} }
else else
{ {
...@@ -346,9 +347,11 @@ namespace Mall.Module.TradePavilion ...@@ -346,9 +347,11 @@ namespace Mall.Module.TradePavilion
} }
else else
{ {
model.BrandModel = new RB_BrandApplyFor_Extend(); model.BrandModel = new RB_BrandApplyFor_Extend
model.BrandModel.BannerList = new List<string>(); {
model.BrandModel.CustomerTypeInfo = new List<string>(); BannerList = new List<string>(),
CustomerTypeInfo = new List<string>()
};
} }
} }
} }
......
Mall.WebApi/Controllers/Mall/MallController.cs
View file @ e2f36d73
...@@ -35,16 +35,10 @@ namespace Mall.WebApi.Controllers.MallBase ...@@ -35,16 +35,10 @@ namespace Mall.WebApi.Controllers.MallBase
public class MallController : BaseController public class MallController : BaseController
{ {
/// <summary>
/// 商户账号处理类
/// </summary>
private readonly Module.User.TenantModule TenantModule = new Module.User.TenantModule();
/// <summary> /// <summary>
/// 商户小程序处理类 /// 商户小程序处理类
/// </summary> /// </summary>
private readonly Module.User.MiniProgramModule programModule = new Module.User.MiniProgramModule(); private readonly MiniProgramModule programModule = new MiniProgramModule();
/// <summary> /// <summary>
/// 自定义页面处理类 /// 自定义页面处理类
...@@ -61,18 +55,15 @@ namespace Mall.WebApi.Controllers.MallBase ...@@ -61,18 +55,15 @@ namespace Mall.WebApi.Controllers.MallBase
/// </summary> /// </summary>
private readonly ProductModule productModule = new ProductModule(); private readonly ProductModule productModule = new ProductModule();
/// <summary> /// <summary>
/// 用户处理类 /// 用户处理类
/// </summary> /// </summary>
private readonly UserModule userModule = new UserModule(); private readonly UserModule userModule = new UserModule();
private readonly Module.MarketingCenter.CouponModule couponModule = new Module.MarketingCenter.CouponModule();
/// <summary> /// <summary>
/// 小程序页面处理类 /// 小程序页面处理类
/// </summary> /// </summary>
private Module.User.MiniProgramPageModule programPageModule = new Module.User.MiniProgramPageModule(); private readonly MiniProgramPageModule programPageModule = new MiniProgramPageModule();
/// <summary> /// <summary>
/// 小程序首页 /// 小程序首页
...@@ -492,7 +483,6 @@ namespace Mall.WebApi.Controllers.MallBase ...@@ -492,7 +483,6 @@ namespace Mall.WebApi.Controllers.MallBase
[AllowAnonymous] [AllowAnonymous]
public ApiResult GetAppConfig() public ApiResult GetAppConfig()
{ {
JObject parms = JObject.Parse(RequestParm.msg.ToString());
string MiniAppId = ""; string MiniAppId = "";
try try
{ {
......
Mall.WebApi/Controllers/Mall/MallHelper.cs
View file @ e2f36d73
...@@ -33,85 +33,85 @@ namespace Mall.WebApi.Controllers ...@@ -33,85 +33,85 @@ namespace Mall.WebApi.Controllers
/// <summary> /// <summary>
/// 产品处理类 /// 产品处理类
/// </summary> /// </summary>
private static ProductModule productModule = new ProductModule(); private static readonly ProductModule productModule = new ProductModule();
/// <summary> /// <summary>
/// 导航图标处理类 /// 导航图标处理类
/// </summary> /// </summary>
private static MiniProgramNaviconModule programNaviconModule = new MiniProgramNaviconModule(); private static readonly MiniProgramNaviconModule programNaviconModule = new MiniProgramNaviconModule();
/// <summary> /// <summary>
/// 内容管理 /// 内容管理
/// </summary> /// </summary>
private static ContentModule contentModule = new ContentModule(); private static readonly ContentModule contentModule = new ContentModule();
/// <summary> /// <summary>
/// 商户小程序处理类 /// 商户小程序处理类
/// </summary> /// </summary>
private static Module.User.MiniProgramModule programModule = new Module.User.MiniProgramModule(); private static readonly MiniProgramModule programModule = new MiniProgramModule();
/// <summary> /// <summary>
/// 小程序基础配置 /// 小程序基础配置
/// </summary> /// </summary>
private static MallBaseModule mallBaseModule = new MallBaseModule(); private static readonly MallBaseModule mallBaseModule = new MallBaseModule();
/// <summary> /// <summary>
/// 用户积分 /// 用户积分
/// </summary> /// </summary>
private static IntegralModule integralModule = new IntegralModule(); private static readonly IntegralModule integralModule = new IntegralModule();
/// <summary> /// <summary>
/// 充值设置 /// 充值设置
/// </summary> /// </summary>
private static RechargeModule rechargeModule = new RechargeModule(); private static readonly RechargeModule rechargeModule = new RechargeModule();
/// <summary> /// <summary>
/// 用户处理类 /// 用户处理类
/// </summary> /// </summary>
private static UserModule userModule = new UserModule(); private static readonly UserModule userModule = new UserModule();
/// <summary> /// <summary>
/// 微店 /// 微店
/// </summary> /// </summary>
private static RB_SmallShops_InfoRepository smallShops_InfoRepository = new RB_SmallShops_InfoRepository(); private static readonly RB_SmallShops_InfoRepository smallShops_InfoRepository = new RB_SmallShops_InfoRepository();
/// <summary> /// <summary>
/// 微店商品价格 /// 微店商品价格
/// </summary> /// </summary>
private static RB_SmallShops_PriceRepository smallShops_PriceRepository = new RB_SmallShops_PriceRepository(); private static readonly RB_SmallShops_PriceRepository smallShops_PriceRepository = new RB_SmallShops_PriceRepository();
/// <summary> /// <summary>
/// 商品规格价格 /// 商品规格价格
/// </summary> /// </summary>
private static RB_Goods_SpecificationPriceRepository goods_SpecificationPriceRepository = new RB_Goods_SpecificationPriceRepository(); private static readonly RB_Goods_SpecificationPriceRepository goods_SpecificationPriceRepository = new RB_Goods_SpecificationPriceRepository();
/// <summary> /// <summary>
/// 产品处理类 /// 产品处理类
/// </summary> /// </summary>
private static Module.Education.EducationModule educationModule = new Module.Education.EducationModule(); private static readonly Module.Education.EducationModule educationModule = new Module.Education.EducationModule();
/// <summary> /// <summary>
/// 线下服务配置处理类 /// 线下服务配置处理类
/// </summary> /// </summary>
private static ReserveModule reserveModule = new ReserveModule(); private static readonly ReserveModule reserveModule = new ReserveModule();
/// <summary> /// <summary>
/// 模板处理类 /// 模板处理类
/// </summary> /// </summary>
private static MiniprogramTemplateModule miniprogramTemplateModule = new MiniprogramTemplateModule(); private static readonly MiniprogramTemplateModule miniprogramTemplateModule = new MiniprogramTemplateModule();
/// <summary> /// <summary>
/// 模板处理类 /// 模板处理类
/// </summary> /// </summary>
private static Module.Miai.MiaiModule miaiModule = new Module.Miai.MiaiModule(); private static readonly Module.Miai.MiaiModule miaiModule = new Module.Miai.MiaiModule();
/// <summary> /// <summary>
/// 商会活动处理类对象 /// 商会活动处理类对象
/// </summary> /// </summary>
private static CommerceActivityModule commerceActivityModule = new CommerceActivityModule(); private static readonly CommerceActivityModule commerceActivityModule = new CommerceActivityModule();
/// <summary> /// <summary>
/// 载体处理类对象 /// 载体处理类对象
/// </summary> /// </summary>
private static CarrierModule carrierModule = new CarrierModule(); private static readonly CarrierModule carrierModule = new CarrierModule();
/// <summary> /// <summary>
/// 解析插件数据为对象 /// 解析插件数据为对象
...@@ -1437,8 +1437,7 @@ namespace Mall.WebApi.Controllers ...@@ -1437,8 +1437,7 @@ namespace Mall.WebApi.Controllers
} }
else if (miAiUserItem.addUserType == 2) else if (miAiUserItem.addUserType == 2)
{ {
long rowCount = 0; var tempGoodsList = miaiModule.GetFirstBaseInfoPageList(1, miAiUserItem.goodsLength, out long rowCount, new RB_MiAi_BaseInfo_Extend
var tempGoodsList = miaiModule.GetFirstBaseInfoPageList(1, miAiUserItem.goodsLength, out rowCount, new Model.Extend.Miai.RB_MiAi_BaseInfo_Extend
{ {
TenantId = TenantId, TenantId = TenantId,
MallBaseId = MallBaseId, MallBaseId = MallBaseId,
...@@ -1472,14 +1471,10 @@ namespace Mall.WebApi.Controllers ...@@ -1472,14 +1471,10 @@ namespace Mall.WebApi.Controllers
} }
} }
miAiUserItem.list = newGoodsList; miAiUserItem.list = newGoodsList;
} }
else if (miAiUserItem.addUserType == 3) else if (miAiUserItem.addUserType == 3)
{ {
var tempGoodsList = miaiModule.GetFirstBaseInfoPageList(1, miAiUserItem.goodsLength, out long rowCount, new Model.Extend.Miai.RB_MiAi_BaseInfo_Extend
long rowCount = 0;
var tempGoodsList = miaiModule.GetFirstBaseInfoPageList(1, miAiUserItem.goodsLength, out rowCount, new Model.Extend.Miai.RB_MiAi_BaseInfo_Extend
{ {
TenantId = TenantId, TenantId = TenantId,
MallBaseId = MallBaseId, MallBaseId = MallBaseId,
...@@ -1491,7 +1486,6 @@ namespace Mall.WebApi.Controllers ...@@ -1491,7 +1486,6 @@ 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();
if (tempGood != null && tempGood.Id > 0) if (tempGood != null && tempGood.Id > 0)
{ {
lastItem.id = tempGood.UserId; lastItem.id = tempGood.UserId;
...@@ -2032,7 +2026,7 @@ namespace Mall.WebApi.Controllers ...@@ -2032,7 +2026,7 @@ namespace Mall.WebApi.Controllers
}; };
var aObj = new var aObj = new
{ {
GroupName = tItem.GroupName, tItem.GroupName,
tItem.DateStr, tItem.DateStr,
DataList = new List<object>() { defatltData } DataList = new List<object>() { defatltData }
}; };
...@@ -2043,7 +2037,7 @@ namespace Mall.WebApi.Controllers ...@@ -2043,7 +2037,7 @@ namespace Mall.WebApi.Controllers
var aList = activityList?.Where(qitem => tItem.NewActivitys.Contains(qitem.Id.ToString()))?.ToList(); var aList = activityList?.Where(qitem => tItem.NewActivitys.Contains(qitem.Id.ToString()))?.ToList();
var aObj = new var aObj = new
{ {
GroupName = tItem.GroupName, tItem.GroupName,
tItem.DateStr, tItem.DateStr,
DataList = aList?.Select(aItem => new { DataList = aList?.Select(aItem => new {
aItem.Id, aItem.Id,
......
Mall.WebApi/Controllers/Product/ProductController.cs
View file @ e2f36d73
...@@ -1395,16 +1395,18 @@ namespace Mall.WebApi.Controllers.MallBase ...@@ -1395,16 +1395,18 @@ namespace Mall.WebApi.Controllers.MallBase
else else
{ {
List<object> objList = new List<object>(); List<object> objList = new List<object>();
List<object> SpecificationValueList = new List<object>(); List<object> SpecificationValueList = new List<object>
SpecificationValueList.Add(new
{ {
Id = 0, new
GoodsId = item.Id, {
SpecificationId = 0, Id = 0,
Name = item.DefaultSpecificationName, GoodsId = item.Id,
Image = "", SpecificationId = 0,
Sort = 0 Name = item.DefaultSpecificationName,
}); Image = "",
Sort = 0
}
};
objList.Add(new objList.Add(new
{ {
Id = 0, Id = 0,
...@@ -1415,17 +1417,19 @@ namespace Mall.WebApi.Controllers.MallBase ...@@ -1415,17 +1417,19 @@ namespace Mall.WebApi.Controllers.MallBase
SpecificationValueList SpecificationValueList
}); });
GGZ = JsonConvert.SerializeObject(objList);//序列化 GGZ = JsonConvert.SerializeObject(objList);//序列化
List<object> SpecificationPriceList = new List<object>(); List<object> SpecificationPriceList = new List<object>
SpecificationPriceList.Add(new
{ {
Id = 0, new
GoodsId = item.Id, {
SpecificationSort = "", Id = 0,
item.SellingPrice, GoodsId = item.Id,
item.InventoryNum, SpecificationSort = "",
item.GoodsWeight, item.SellingPrice,
item.GoodsNumbers item.InventoryNum,
}); item.GoodsWeight,
item.GoodsNumbers
}
};
GGMX = JsonConvert.SerializeObject(SpecificationPriceList);//序列化 GGMX = JsonConvert.SerializeObject(SpecificationPriceList);//序列化
} }
string AreaList = ""; string AreaList = "";
...@@ -3144,7 +3148,7 @@ namespace Mall.WebApi.Controllers.MallBase ...@@ -3144,7 +3148,7 @@ namespace Mall.WebApi.Controllers.MallBase
x.SourceGoodsId, x.SourceGoodsId,
x.RetailStore, x.RetailStore,
x.SupplierName, x.SupplierName,
Isynchro = x.Isynchro x.Isynchro
}); });
return ApiResult.Success("", pagelist); return ApiResult.Success("", pagelist);
} }
......
Mall.WebApi/Controllers/TradePavilion/AppletTradeController.cs
View file @ e2f36d73
...@@ -6,6 +6,7 @@ using Mall.CacheManager.User; ...@@ -6,6 +6,7 @@ using Mall.CacheManager.User;
using Mall.Common; using Mall.Common;
using Mall.Common.API; using Mall.Common.API;
using Mall.Common.Enum.Goods; using Mall.Common.Enum.Goods;
using Mall.Common.Enum.TradePavilion;
using Mall.Common.Enum.User; using Mall.Common.Enum.User;
using Mall.Common.Plugin; using Mall.Common.Plugin;
using Mall.Model.Extend.TradePavilion; using Mall.Model.Extend.TradePavilion;
...@@ -268,7 +269,61 @@ namespace Mall.WebApi.Controllers.TradePavilion ...@@ -268,7 +269,61 @@ namespace Mall.WebApi.Controllers.TradePavilion
public ApiResult SetCarrierApplyFor() public ApiResult SetCarrierApplyFor()
{ {
var userInfo = AppletUserInfo; var userInfo = AppletUserInfo;
RB_CarrierApplyFor_Extend query = JsonConvert.DeserializeObject<RB_CarrierApplyFor_Extend>(RequestParm.msg.ToString()); JObject parms = JObject.Parse(RequestParm.msg.ToString());
RB_CarrierApplyFor_Extend query = new RB_CarrierApplyFor_Extend()
{
ID=parms.GetInt("ID"),
CompanyId=parms.GetInt("CompanyId"),
ExistCarrierId=parms.GetInt("ExistCarrierId"),
CarrierName=parms.GetStringValue("CarrierName"),
Logo=parms.GetStringValue("Logo"),
BannerList=new List<string> (),
VideoUrl=parms.GetStringValue("VideoUrl"),
Address=parms.GetStringValue("Address"),
LatAndLon=parms.GetStringValue("LatAndLon"),
Developers=parms.GetStringValue("Developers"),
OpenTime=parms.GetDateTime("OpenTime"),
ProjectType=(ProjectTypeEnum)parms.GetInt("ProjectType"),
CarrierSize=parms.GetDecimal("CarrierSize"),
LayersNum=parms.GetStringValue("LayersNum"),
CarNum=parms.GetInt("CarNum"),
CarrierPlan=parms.GetStringValue("CarrierPlan"),
CarrierTarget=parms.GetStringValue("CarrierTarget"),
Location=parms.GetStringValue("Location"),
Crowd=parms.GetStringValue("Crowd"),
CarrierMetroList=new List<RB_CarrierMetroApplyFor_Extend> (),
FirstShopNumList=new List<FirstShopNumModel> (),
HonorList=new List<string> (),
Discount=parms.GetStringValue("Discount"),
StartingInfo=parms.GetStringValue("StartingInfo"),
ShopNum=parms.GetInt("ShopNum"),
BuiltUpArea=parms.GetDecimal("BuiltUpArea"),
AreaRequirement=parms.GetDecimal("AreaRequirement"),
YeJi=parms.GetDecimal("YeJi"),
//FirstShow = parms.GetStringValue("FirstShow"),
//FirstExhibition =
};
var bannerList = parms.GetStringValue("BannerList");
if (!string.IsNullOrEmpty(bannerList))
{
query.BannerList = JsonHelper.DeserializeObject<List<string>>(bannerList);
}
var carrierMetroList = parms.GetStringValue("CarrierMetroList");
if (!string.IsNullOrEmpty(carrierMetroList))
{
query.CarrierMetroList = JsonHelper.DeserializeObject<List<RB_CarrierMetroApplyFor_Extend>>(carrierMetroList);
}
var firstShopNumList = parms.GetStringValue("FirstShopNumList");
if (!string.IsNullOrEmpty(firstShopNumList))
{
query.FirstShopNumList = JsonHelper.DeserializeObject<List<FirstShopNumModel>>(firstShopNumList);
}
var honorList = parms.GetStringValue("HonorList");
if (!string.IsNullOrEmpty(honorList))
{
query.HonorList = JsonHelper.DeserializeObject<List<string>>(honorList);
}
if (query.CompanyId <= 0) if (query.CompanyId <= 0)
{ {
return ApiResult.ParamIsNull("请传递认证id"); return ApiResult.ParamIsNull("请传递认证id");
......
Mall.WebApi/Filter/ApiFilterAttribute.cs
View file @ e2f36d73
...@@ -226,7 +226,6 @@ namespace Mall.WebApi.Filter ...@@ -226,7 +226,6 @@ namespace Mall.WebApi.Filter
} }
catch (Exception ex) catch (Exception ex)
{ {
string message = ex.Message;
actionContext.Result = new Microsoft.AspNetCore.Mvc.JsonResult( actionContext.Result = new Microsoft.AspNetCore.Mvc.JsonResult(
HttpStatusCode.OK, HttpStatusCode.OK,
new ApiResult new ApiResult
......
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