Skip to content

M
mall.oytour.com
Commit ddfdc1bc authored by 吴春's avatar 吴春
Browse files
Options

1

parent 863a3c6a
Hide whitespace changes
Inline Side-by-side
Showing with 129 additions and 16 deletions
Mall.Module.TradePavilion/BuildingCarrierModule_V2.cs
View file @ ddfdc1bc
...@@ -238,8 +238,9 @@ namespace Mall.Module.TradePavilion ...@@ -238,8 +238,9 @@ namespace Mall.Module.TradePavilion
else else
{ {
#region 新增品牌 #region 新增品牌
var inserBModel = BrandModel.RefMapperTo<RB_Brand_Enterprise_Extend>(); var inserBModel = model.RefMapperTo<RB_Brand_Enterprise_Extend>();
inserBModel.ID = 0; inserBModel.ID = 0;
inserBModel.CategoryId = model.BrandClassId;
inserBModel.UserId = cmodel.CreateBy; inserBModel.UserId = cmodel.CreateBy;
brand_EnterpriseRepository.Insert(inserBModel); brand_EnterpriseRepository.Insert(inserBModel);
#endregion #endregion
...@@ -359,7 +360,7 @@ namespace Mall.Module.TradePavilion ...@@ -359,7 +360,7 @@ namespace Mall.Module.TradePavilion
else else
{ {
#region 新增品牌 #region 新增品牌
var inserBModel = BrandModel.RefMapperTo<RB_EnterpriseServices>(); var inserBModel = model.RefMapperTo<RB_EnterpriseServices>();
inserBModel.ServiceId = 0; inserBModel.ServiceId = 0;
inserBModel.UserId = cmodel.CreateBy; inserBModel.UserId = cmodel.CreateBy;
enterpriseServicesRepository.Insert(inserBModel); enterpriseServicesRepository.Insert(inserBModel);
...@@ -491,7 +492,7 @@ namespace Mall.Module.TradePavilion ...@@ -491,7 +492,7 @@ namespace Mall.Module.TradePavilion
else else
{ {
#region 新增楼宇 #region 新增楼宇
var inserBModel = BrandModel.RefMapperTo<RB_Building_Extend>(); var inserBModel = model.RefMapperTo<RB_Building_Extend>();
inserBModel.BuildId = 0; inserBModel.BuildId = 0;
inserBModel.UserId = cmodel.CreateBy; inserBModel.UserId = cmodel.CreateBy;
buildingRepository.Insert(inserBModel); buildingRepository.Insert(inserBModel);
...@@ -681,17 +682,17 @@ namespace Mall.Module.TradePavilion ...@@ -681,17 +682,17 @@ namespace Mall.Module.TradePavilion
{ {
#region 新增载体 #region 新增载体
var inserCModel = CarrierModel.RefMapperTo<RB_Building_Carrier_Extend>(); var inserCModel = model.RefMapperTo<RB_Building_Carrier_Extend>();
inserCModel.ID = 0; inserCModel.ID = 0;
inserCModel.UserId = cmodel.CreateBy; inserCModel.UserId = cmodel.CreateBy;
if (CarrierModel.OpenTime.HasValue) if (model.OpenTime.HasValue)
{ {
if (CarrierModel.OpenTime.Value <= System.DateTime.Now) if (model.OpenTime.Value <= System.DateTime.Now)
{ {
inserCModel.OpeningStatus = 1; inserCModel.OpeningStatus = 1;
} }
} }
if (!string.IsNullOrWhiteSpace(CarrierModel.StartingInfo)) if (!string.IsNullOrWhiteSpace(model.StartingInfo))
{ {
inserCModel.FirstStoreTest = 1; inserCModel.FirstStoreTest = 1;
} }
...@@ -704,8 +705,8 @@ namespace Mall.Module.TradePavilion ...@@ -704,8 +705,8 @@ namespace Mall.Module.TradePavilion
x.ID = 0; x.ID = 0;
x.CarrierId = Id; x.CarrierId = Id;
x.Status = 0; x.Status = 0;
x.TenantId = CarrierModel.TenantId; x.TenantId = model.TenantId;
x.MallBaseId = CarrierModel.MallBaseId; x.MallBaseId = model.MallBaseId;
}); });
carrierEnterpriseMetroApplyForRepository.InsertBatch(mlist); carrierEnterpriseMetroApplyForRepository.InsertBatch(mlist);
} }
...@@ -1389,6 +1390,7 @@ namespace Mall.Module.TradePavilion ...@@ -1389,6 +1390,7 @@ namespace Mall.Module.TradePavilion
#region 新增品牌 #region 新增品牌
var inserBModel = BrandModel.RefMapperTo<RB_Brand_Enterprise_Extend>(); var inserBModel = BrandModel.RefMapperTo<RB_Brand_Enterprise_Extend>();
inserBModel.ID = 0; inserBModel.ID = 0;
inserBModel.CategoryId = BrandModel.BrandClassId;
inserBModel.UserId = cmodel.CreateBy; inserBModel.UserId = cmodel.CreateBy;
brand_EnterpriseRepository.Insert(inserBModel, trans); brand_EnterpriseRepository.Insert(inserBModel, trans);
#endregion #endregion
......
Mall.Module.TradePavilion/CarrierModule.cs
View file @ ddfdc1bc
...@@ -1076,7 +1076,7 @@ namespace Mall.Module.TradePavilion ...@@ -1076,7 +1076,7 @@ namespace Mall.Module.TradePavilion
List<object> resultList = new List<object>(); List<object> resultList = new List<object>();
var rootList = Common.Plugin.EnumHelper.EnumToList(typeof(BrandCategoryEnum)); var rootList = Common.Plugin.EnumHelper.EnumToList(typeof(BrandCategoryEnum));
List<RB_BrandClass_Extend> categoryList = GetBrandClassListModule(new RB_BrandClass_Extend() { TenantId = query.TenantId, MallBaseId = query.MallBaseId }); List<RB_BrandClass_Extend> categoryList = GetBrandClassListModule(new RB_BrandClass_Extend() { TenantId = query.TenantId, MallBaseId = query.MallBaseId });
if (rootList != null && rootList.Count > 0) if (rootList != null && rootList.Count > 0)
{ {
foreach (var firstItem in rootList) foreach (var firstItem in rootList)
...@@ -1085,7 +1085,7 @@ namespace Mall.Module.TradePavilion ...@@ -1085,7 +1085,7 @@ namespace Mall.Module.TradePavilion
List<object> secondResultList = new List<object>(); List<object> secondResultList = new List<object>();
foreach (var secondItem in subList) foreach (var secondItem in subList)
{ {
string secondUrl = "/pages/kotra/CarrierBuildingIndex?cat_id="+ firstItem .Id+ "&CategoryIds=" + secondItem.ID; string secondUrl = "/pages/kotra/CarrierBuildingIndex?cat_id=" + firstItem.Id + "&CategoryIds=" + secondItem.ID;
secondResultList.Add(new secondResultList.Add(new
{ {
PageId = secondItem.ID + 300000, PageId = secondItem.ID + 300000,
...@@ -1292,7 +1292,7 @@ namespace Mall.Module.TradePavilion ...@@ -1292,7 +1292,7 @@ namespace Mall.Module.TradePavilion
#endregion #endregion
...@@ -1381,7 +1381,7 @@ namespace Mall.Module.TradePavilion ...@@ -1381,7 +1381,7 @@ namespace Mall.Module.TradePavilion
fukuanList.Add(new YBConfigItem() { Name = "半年付" }); fukuanList.Add(new YBConfigItem() { Name = "半年付" });
List<YBConfigItem> zichanList = new List<YBConfigItem>(); List<YBConfigItem> zichanList = new List<YBConfigItem>();
zichanList.Add(new YBConfigItem() { Name= "国有资产" }); zichanList.Add(new YBConfigItem() { Name = "国有资产" });
zichanList.Add(new YBConfigItem() { Name = "私企" }); zichanList.Add(new YBConfigItem() { Name = "私企" });
zichanList.Add(new YBConfigItem() { Name = "个人" }); zichanList.Add(new YBConfigItem() { Name = "个人" });
zichanList.Add(new YBConfigItem() { Name = "其它" }); zichanList.Add(new YBConfigItem() { Name = "其它" });
...@@ -1396,12 +1396,17 @@ namespace Mall.Module.TradePavilion ...@@ -1396,12 +1396,17 @@ namespace Mall.Module.TradePavilion
wuyeList.Add(new YBConfigItem() { Name = "排烟量" }); wuyeList.Add(new YBConfigItem() { Name = "排烟量" });
wuyeList.Add(new YBConfigItem() { Name = "空调" }); wuyeList.Add(new YBConfigItem() { Name = "空调" });
wuyeList.Add(new YBConfigItem() { Name = "新风" }); wuyeList.Add(new YBConfigItem() { Name = "新风" });
List<Model.Entity.TradePavilion.RB_Building_Carrier> MallBaselList = new List<Model.Entity.TradePavilion.RB_Building_Carrier>();
MallBaselList.Add(new Model.Entity.TradePavilion.RB_Building_Carrier { MallBaseId = 0, TenantId = 0, CarrierName = "全部" });
MallBaselList.Add(new Model.Entity.TradePavilion.RB_Building_Carrier { MallBaseId = 8, TenantId = 18, CarrierName = "成都" });
MallBaselList.Add(new Model.Entity.TradePavilion.RB_Building_Carrier { MallBaseId = 20, TenantId = 30, CarrierName = "宜宾" });
object obj = new object obj = new
{ {
zhuangXiuList, zhuangXiuList,
fukuanList, fukuanList,
zichanList, zichanList,
wuyeList wuyeList,
mallBaselList = MallBaselList.Select(x => new { x.TenantId, x.MallBaseId, Name = x.CarrierName }),
}; };
return obj; return obj;
} }
......
Mall.WebApi/Controllers/AppletWeChat/WeChatNotifyController.cs
View file @ ddfdc1bc
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.IO;
using System.Linq; using System.Linq;
using System.Threading.Tasks; using System.Threading.Tasks;
using System.Web; using System.Web;
using Google.Protobuf.WellKnownTypes; using Google.Protobuf.WellKnownTypes;
using Mall.Common;
using Mall.Common.API; using Mall.Common.API;
using Mall.Common.Pay.WeChatPat; using Mall.Common.Pay.WeChatPat;
using Mall.Common.Plugin; using Mall.Common.Plugin;
...@@ -525,5 +527,106 @@ namespace Mall.WebApi.Controllers.AppletWeChat ...@@ -525,5 +527,106 @@ namespace Mall.WebApi.Controllers.AppletWeChat
// return ApiResult.Failed("", reqXmlFAIL); // return ApiResult.Failed("", reqXmlFAIL);
} }
} }
/// <summary>
///
/// </summary>
/// <returns></returns>
[HttpPost]
[HttpGet]
public void EventMessageCall(string signature,string echostr,string timestamp,string nonce)
{
try
{
var requestMsg = Request.HttpContext.Items[GlobalKey.UserPostInfo];
var req = new RequestHandler();
LogHelper.WriteInfo("_accessor:" + _accessor);
LogHelper.WriteInfo("requestMsg:" + JsonHelper.Serialize(requestMsg));
var res = new ResponseHandler(_accessor);
#region 先注释
// string timestamp = "";
// string nonce = "";
// string echostr = "";
// string signature = "";
string encrypt_type = "";
string msg_signature = "";
string openid = "";
//try
//{
// signature = res.GetParameter("signature");
//}
//catch (Exception ex)
//{
// signature = "";
// LogHelper.WriteInfo("signature" + JsonHelper.Serialize(ex));
//}
//try
//{
// timestamp = res.GetParameter("timestamp");
//}
//catch (Exception ex)
//{
// LogHelper.WriteInfo("timestamp" + JsonHelper.Serialize(ex));
// timestamp = "";
//}
//try
//{
// nonce = res.GetParameter("nonce");
//}
//catch (Exception ex)
//{
// nonce = "";
// LogHelper.WriteInfo("nonce" + JsonHelper.Serialize(ex));
//}
//try
//{
// encrypt_type = res.GetParameter("encrypt_type");
//}
//catch (Exception ex)
//{
// encrypt_type = "";
// LogHelper.WriteInfo("encrypt_type" + JsonHelper.Serialize(ex));
//}
//try
//{
// msg_signature = res.GetParameter("msg_signature");
//}
//catch (Exception ex)
//{
// msg_signature = "";
// LogHelper.WriteInfo("msg_signature" + JsonHelper.Serialize(ex));
//}
//try
//{
// openid = res.GetParameter("openid");
//}
//catch (Exception ex)
//{
// openid = "";
// LogHelper.WriteInfo("openid" + JsonHelper.Serialize(ex));
//}
#endregion
//var str = new StreamReader(System.Web.HttpContext.Current.Request.InputStream);
//string postStr = str.ReadToEnd();
//lock (_lock)
//{
// WechatMessageHelper.WXOpera(postStr, timestamp, nonce, signature, encrypt_type, msg_signature, openid);
//}
}
catch (Exception ex)
{
LogHelper.Write(ex.ToString());
var response = HttpContext.Response;
response.WriteAsync("echostr is null");
// response.Flush();
//response.BodyWriter("");
}
}
} }
} }
\ No newline at end of file
Mall.WebApi/Controllers/TradePavilion/AppletTradeController.cs
View file @ ddfdc1bc
...@@ -1873,7 +1873,7 @@ namespace Mall.WebApi.Controllers.TradePavilion ...@@ -1873,7 +1873,7 @@ namespace Mall.WebApi.Controllers.TradePavilion
extModel.Address, extModel.Address,
extModel.LatAndLon, extModel.LatAndLon,
extModel.Developers, extModel.Developers,
OpenTime = extModel.OpenTime.HasValue ? extModel.OpenTime.Value.ToString("yyyy-MM-dd HH:mm") : "", OpenTime = extModel.OpenTime.HasValue ? extModel.OpenTime.Value.ToString("yyyy-MM-dd HH:mm") : "",
extModel.ProjectType, extModel.ProjectType,
ProjectTypeName = extModel.ProjectType.GetEnumName(), ProjectTypeName = extModel.ProjectType.GetEnumName(),
extModel.CarrierSize, extModel.CarrierSize,
...@@ -3554,7 +3554,7 @@ namespace Mall.WebApi.Controllers.TradePavilion ...@@ -3554,7 +3554,7 @@ namespace Mall.WebApi.Controllers.TradePavilion
} }
if (query.PropertyDemandList != null && query.PropertyDemandList.Any()) if (query.PropertyDemandList != null && query.PropertyDemandList.Any())
{ {
query.PropertyDemand = string.Join(",", query.PropertyDemandList.Select(x => x)); query.PropertyDemand = JsonConvert.SerializeObject(query.PropertyDemandList); //string.Join(",", query.PropertyDemandList.Select(x => x));
} }
else else
{ {
...@@ -4276,5 +4276,8 @@ namespace Mall.WebApi.Controllers.TradePavilion ...@@ -4276,5 +4276,8 @@ namespace Mall.WebApi.Controllers.TradePavilion
var list = carrierModule.GetYBConfigModule(); var list = carrierModule.GetYBConfigModule();
return ApiResult.Success(data: list); return ApiResult.Success(data: list);
} }
} }
} }
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