baifenbaishop.git

			@@ -12,11 +12,13 @@
			using System.Collections.Generic;
			using System.Linq;
			using System.Threading.Tasks;
			using CoreCms.Net.Auth.HttpContextUser;
			using CoreCms.Net.Configuration;
			using CoreCms.Net.DTO.ComponentsDTO;
			using CoreCms.Net.IRepository;
			using CoreCms.Net.IRepository.UnitOfWork;
			using CoreCms.Net.IServices;
			using CoreCms.Net.IServices.baifenbingfa;
			using CoreCms.Net.Loging;
			using CoreCms.Net.Model.Entities;
			using CoreCms.Net.Model.Entities.Expression;
			@@ -53,12 +55,25 @@
			private readonly ICoreCmsPinTuanRuleServices _pinTuanRuleServices;
			private readonly ICoreCmsServicesServices _servicesServices;
			private readonly ICoreCmsGoodsCategoryExtendServices _goodsCategoryExtendServices;


			private readonly IHttpContextUser _contextUser;
			private readonly IBfbfComAPIService _bfbfComAPIService;
			private readonly IUnitOfWork _unitOfWork;
			public CoreCmsPagesServices(IUnitOfWork unitOfWork
			, ICoreCmsPagesRepository dal
			, ICoreCmsPagesItemsRepository pagesItemsRepository, ICoreCmsPromotionServices promotionServices, ICoreCmsNoticeServices noticeServices, ICoreCmsGoodsCategoryServices goodsCategoryServices, ICoreCmsSettingServices settingServices, ICoreCmsGoodsServices goodsServices, ICoreCmsArticleServices articleServices, ICoreCmsPromotionConditionServices promotionConditionServices, ICoreCmsPinTuanRuleServices pinTuanRuleServices, ICoreCmsServicesServices servicesServices, ICoreCmsArticleTypeServices articleTypeServices, ICoreCmsGoodsCategoryExtendServices goodsCategoryExtendServices)
			, ICoreCmsPagesItemsRepository pagesItemsRepository,
			ICoreCmsPromotionServices promotionServices,
			ICoreCmsNoticeServices noticeServices,
			ICoreCmsGoodsCategoryServices goodsCategoryServices,
			ICoreCmsSettingServices settingServices,
			ICoreCmsGoodsServices goodsServices,
			ICoreCmsArticleServices articleServices,
			ICoreCmsPromotionConditionServices promotionConditionServices,
			ICoreCmsPinTuanRuleServices pinTuanRuleServices,
			ICoreCmsServicesServices servicesServices,
			ICoreCmsArticleTypeServices articleTypeServices,
			ICoreCmsGoodsCategoryExtendServices goodsCategoryExtendServices,
			IHttpContextUser httpContextUser,
			IBfbfComAPIService bfbfComAPIService)
			{
			this._dal = dal;
			_pagesItemsRepository = pagesItemsRepository;
			@@ -75,6 +90,8 @@
			_goodsCategoryExtendServices = goodsCategoryExtendServices;
			base.BaseDal = dal;
			_unitOfWork = unitOfWork;
			_contextUser= httpContextUser;
			_bfbfComAPIService = bfbfComAPIService;
			}


			@@ -138,6 +155,7 @@
			/// <returns></returns>
			public async Task<WebApiCallBack> GetPageConfig(string code)
			{
			var userID= _contextUser.ID;

			var jm = new WebApiCallBack();

			@@ -265,6 +283,7 @@
			break;
			case "goodTabBar":
			{
			bool isDic = await _bfbfComAPIService.IsDictionary(_contextUser.ID);
			var parameters = (JObject)JsonConvert.DeserializeObject(item.parameters);
			if (parameters != null && parameters.ContainsKey("list"))
			{
			@@ -305,7 +324,17 @@
			limit = limit > 0 ? limit : 10;

			var goods = await _goodsServices.QueryListByComponentsAsync(where, limit, p => p.createTime, OrderByType.Desc, true, true, 60);

			if(goods!=null)
			{
			//百分兵法经销商修改价格
			if(isDic)
			{
			foreach (var gd in goods)
			{
			gd.price = gd.distributionPrice;
			}
			}
			}
			if (goods != null && goods.Any())
			{
			var result = JArray.FromObject(goods);
			@@ -431,6 +460,18 @@
			limit = limit > 0 ? limit : 10;

			var goods = await _goodsServices.QueryListByComponentsAsync(where, limit, " sort asc,id asc ", true, true, 60);
			if (goods != null)
			{
			bool isDic = await _bfbfComAPIService.IsDictionary(_contextUser.ID);
			//百分兵法经销商修改价格
			if (isDic)
			{
			foreach (var gd in goods)
			{
			gd.price = gd.distributionPrice;
			}
			}
			}
			if (goods != null && goods.Any())
			{
			var result = JArray.FromObject(goods);
			@@ -477,6 +518,18 @@
			count = goodids.Count;
			}
			var goods = await _goodsServices.QueryListByComponentsAsync(where, count, orderBy, true, true, 60);
			if (goods != null)
			{
			bool isDic = await _bfbfComAPIService.IsDictionary(_contextUser.ID);
			//百分兵法经销商修改价格
			if (isDic)
			{
			foreach (var gd in goods)
			{
			gd.price = gd.distributionPrice;
			}
			}
			}
			if (goods != null && goods.Any())
			{
			var result = JArray.FromObject(goods);