Skip to content

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

新增Fat咨询

parent d95e23cf
Hide whitespace changes
Inline Side-by-side
Showing with 357 additions and 51 deletions
Mall.Model/Entity/TradePavilion/RB_Commerce_Ask.cs 0 → 100644
View file @ bb696e8c
using Mall.Common.Enum;
using System;
using System.Collections.Generic;
using System.Text;
using VT.FW.DB;
namespace Mall.Model.Entity.TradePavilion
{
/// <summary>
/// FAT咨询实体类
/// </summary>
[Serializable]
[DB(ConnectionName = "DefaultConnection")]
public class RB_Commerce_Ask
{
/// <summary>
/// 主键编号
/// </summary>
public int Id { get; set; }
/// <summary>
/// 公司名称
/// </summary>
public string CompanyName { get; set; }
/// <summary>
/// 联系人(责任人)
/// </summary>
public string Principal { get; set; }
/// <summary>
/// 联系电话
/// </summary>
public string Mobile { get; set; }
/// <summary>
/// 邮箱
/// </summary>
public string EMail { get; set; }
/// <summary>
/// Fat海关编码
/// </summary>
public string FatCode { get; set; }
/// <summary>
/// 咨询标题
/// </summary>
public string FatTitle { get; set; }
/// <summary>
/// 咨询问题
/// </summary>
public string FatQuestion { get; set; }
/// <summary>
/// 咨询回复
/// </summary>
public string FatContent { get; set; }
/// <summary>
/// 商户号id
/// </summary>
public int TenantId { get; set; }
/// <summary>
/// 小程序id
/// </summary>
public int MallBaseId { get; set; }
/// <summary>
/// 创建人
/// </summary>
public int CreateBy { get; set; }
/// <summary>
/// 创建时间
/// </summary>
public DateTime CreateDate { get; set; }
/// <summary>
/// 修改人
/// </summary>
public int UpdateBy { get; set; }
/// <summary>
/// 修改时间
/// </summary>
public DateTime UpdateDate { get; set; }
/// <summary>
/// 删除状态
/// </summary>
public DateStateEnum Status { get; set; }
}
}
Mall.Model/Extend/TradePavilion/RB_Commerce_Ask_Extend.cs 0 → 100644
View file @ bb696e8c
using Mall.Model.Entity.TradePavilion;
using System;
using System.Collections.Generic;
using System.Text;
namespace Mall.Model.Extend.TradePavilion
{
/// <summary>
/// FAT咨询扩展实体类
/// </summary>
public class RB_Commerce_Ask_Extend : RB_Commerce_Ask
{
}
}
Mall.Module.TradePavilion/CommerceAskModule.cs 0 → 100644
View file @ bb696e8c
using Mall.Model.Extend.TradePavilion;
using Mall.Repository.TradePavilion;
using System;
using System.Collections.Generic;
using System.Text;
using VT.FW.DB;
namespace Mall.Module.TradePavilion
{
/// <summary>
/// Fat咨询处理类
/// </summary>
public class CommerceAskModule
{
/// <summary>
/// Fat咨询仓储层对象
/// </summary>
private readonly RB_Commerce_AskRepository askRepository = new RB_Commerce_AskRepository();
/// <summary>
/// 获取FAT咨询分页列表
/// </summary>
/// <param name="pageIndex"></param>
/// <param name="pageSize"></param>
/// <param name="rowsCount"></param>
/// <param name="query"></param>
/// <returns></returns>
public List<RB_Commerce_Ask_Extend> GetCommerceAskPageListModule(int pageIndex, int pageSize, out long rowsCount, RB_Commerce_Ask_Extend query)
{
return askRepository.GetCommerceAskPageListRepository(pageIndex, pageSize, out rowsCount, query);
}
/// <summary>
/// 新增修改Fat咨询
/// </summary>
/// <param name="model"></param>
/// <returns></returns>
public bool SetCommerceAskModule(RB_Commerce_Ask_Extend model)
{
bool flag = false;
if (model.Id > 0)
{
Dictionary<string, object> fileds = new Dictionary<string, object>()
{
{nameof(RB_Commerce_Ask_Extend.CompanyName),model.CompanyName },
{nameof(RB_Commerce_Ask_Extend.Principal),model.Principal },
{nameof(RB_Commerce_Ask_Extend.Mobile),model.Mobile },
{nameof(RB_Commerce_Ask_Extend.EMail),model.EMail },
{nameof(RB_Commerce_Ask_Extend.FatCode),model.FatCode },
{nameof(RB_Commerce_Ask_Extend.FatTitle),model.FatTitle },
{nameof(RB_Commerce_Ask_Extend.FatQuestion),model.FatQuestion },
{nameof(RB_Commerce_Ask_Extend.FatContent),model.FatContent },
};
flag = askRepository.Update(fileds, new WhereHelper(nameof(RB_Commerce_Ask_Extend.Id),model.Id));
}
else
{
var newId = askRepository.Insert(model);
model.Id = newId;
flag = newId > 0;
}
return flag;
}
/// <summary>
/// 获取Fat咨询详情
/// </summary>
/// <param name="Id"></param>
/// <returns></returns>
public RB_Commerce_Ask_Extend GetCommerceAskModule(object Id)
{
return askRepository.GetEntity<RB_Commerce_Ask_Extend>(Id);
}
/// <summary>
/// 更新咨询状态
/// </summary>
/// <param name="Id"></param>
/// <param name="Status"></param>
/// <returns></returns>
public bool RemoveCommerceAskModule(int Id, int Status)
{
Dictionary<string, object> fileds = new Dictionary<string, object>()
{
{nameof(RB_Commerce_Ask_Extend.Status),Status },
};
bool flag = askRepository.Update(fileds, new WhereHelper(nameof(RB_Commerce_Ask_Extend.Id), Id));
return flag;
}
}
}
\ No newline at end of file
Mall.Repository/TradePavilion/RB_Commerce_AskRepository.cs 0 → 100644
View file @ bb696e8c
using Mall.Common.Enum;
using Mall.Model.Entity.TradePavilion;
using Mall.Model.Extend.TradePavilion;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using VT.FW.DB.Dapper;
namespace Mall.Repository.TradePavilion
{
/// <summary>
/// FAT咨询仓储层
/// </summary>
public class RB_Commerce_AskRepository:BaseRepository<RB_Commerce_Ask>
{
/// <summary>
/// 获取FAT咨询分页列表
/// </summary>
/// <param name="pageIndex"></param>
/// <param name="pageSize"></param>
/// <param name="rowsCount"></param>
/// <param name="query"></param>
/// <returns></returns>
public List<RB_Commerce_Ask_Extend> GetCommerceAskPageListRepository(int pageIndex, int pageSize, out long rowsCount, RB_Commerce_Ask_Extend query)
{
rowsCount = 0;
DynamicParameters parameters = new DynamicParameters();
StringBuilder builder = new StringBuilder();
builder.AppendFormat(@"
SELECT A.*,
FROM RB_Commerce_Ask AS A
WHERE 1=1
");
builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Commerce_Ask_Extend.Status), (int)DateStateEnum.Normal);
if (query == null)
{
return new List<RB_Commerce_Ask_Extend>();
}
else
{
if (query.TenantId > 0)
{
builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Commerce_Ask_Extend.TenantId), query.TenantId);
}
if (query.MallBaseId > 0)
{
builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Commerce_Ask_Extend.MallBaseId), query.MallBaseId);
}
if (!string.IsNullOrEmpty(query.FatTitle))
{
builder.AppendFormat(" AND A.{0} LIKE @Name ", nameof(RB_Commerce_Ask_Extend.FatTitle));
parameters.Add("Name", "%" + query.FatTitle.Trim() + "%");
}
}
return GetPage<RB_Commerce_Ask_Extend>(pageIndex, pageSize, out rowsCount, builder.ToString(), parameters).ToList();
}
}
}
Mall.WebApi/Controllers/TradePavilion/AppletTradeController.cs
View file @ bb696e8c
...@@ -53,6 +53,11 @@ namespace Mall.WebApi.Controllers.TradePavilion ...@@ -53,6 +53,11 @@ namespace Mall.WebApi.Controllers.TradePavilion
/// </summary> /// </summary>
private readonly CommerceNewsModule commerceNewsModule = new CommerceNewsModule(); private readonly CommerceNewsModule commerceNewsModule = new CommerceNewsModule();
/// <summary>
/// Fat资料处理类对象
/// </summary>
private readonly CommerceAskModule askModule = new CommerceAskModule();
/// <summary> /// <summary>
/// 新增修改公司信息 /// 新增修改公司信息
/// </summary> /// </summary>
...@@ -143,6 +148,53 @@ namespace Mall.WebApi.Controllers.TradePavilion ...@@ -143,6 +148,53 @@ namespace Mall.WebApi.Controllers.TradePavilion
return ApiResult.Success(data: pageModel); return ApiResult.Success(data: pageModel);
} }
/// <summary>
/// 新增修改投资采购
/// </summary>
/// <returns></returns>
public ApiResult SetInvestmentProcurement()
{
JObject parms = JObject.Parse(RequestParm.msg.ToString());
var extModel = new RB_InvestmentProcurement_Extend()
{
Id = parms.GetInt("Id"),
Type = parms.GetInt("Type"),
GoodsCategory = parms.GetStringValue("GoodsCategory"),
Investment = parms.GetStringValue("Investment"),
ImportNum = parms.GetInt("ImportNum"),
Describe = parms.GetStringValue("Describe"),
CompanyName = parms.GetStringValue("CompanyName"),
CompanyEnName = parms.GetStringValue("CompanyEnName"),
Mobile = parms.GetStringValue("Mobile"),
EMail = parms.GetStringValue("EMail"),
LegalPerson = parms.GetStringValue("LegalPerson"),
Principal = parms.GetStringValue("Principal"),
WechatNo = parms.GetStringValue("WechatNo"),
DomainUrl = parms.GetStringValue("DomainUrl"),
Industry = parms.GetStringValue("Industry"),
FoundingTime = parms.GetDateTime("FoundingTime"),
EmployeeNum = parms.GetInt("EmployeeNum"),
AnnualSales = parms.GetDecimal("AnnualSales"),
Address = parms.GetStringValue("Address"),
EnAddress = parms.GetStringValue("EnAddress"),
AnnualImport = parms.GetDecimal("AnnualImport"),
ImportCategory = parms.GetStringValue("ImportCategory"),
ImportCountry = parms.GetStringValue("ImportCountry"),
ExportCountry = parms.GetStringValue("ExportCountry"),
CompanyIntro = parms.GetStringValue("CompanyIntro"),
OtherInfo = parms.GetStringValue("OtherInfo"),
};
extModel.Status = Common.Enum.DateStateEnum.Normal;
var userInfo = AppletUserInfo;
extModel.MallBaseId = RequestParm.MallBaseId;
extModel.TenantId = userInfo?.TenantId ?? 0;
extModel.CreateBy = userInfo?.UserId??0;
extModel.CreateDate = DateTime.Now;
extModel.UpdateBy = userInfo?.UserId ?? 0; ;
extModel.UpdateDate = DateTime.Now;
var flag = procurementModule.SetInvestmentProcurementModule(extModel);
return flag ? ApiResult.Success() : ApiResult.Failed();
}
/// <summary> /// <summary>
/// 获取商会活动详情 /// 获取商会活动详情
...@@ -185,14 +237,21 @@ namespace Mall.WebApi.Controllers.TradePavilion ...@@ -185,14 +237,21 @@ namespace Mall.WebApi.Controllers.TradePavilion
/// 获取新闻前几条 /// 获取新闻前几条
/// </summary> /// </summary>
/// <returns></returns> /// <returns></returns>
public ApiResult GetNewsTop() public ApiResult GetNewsPage()
{ {
ResultPageModel pageModel = JsonConvert.DeserializeObject<ResultPageModel>(RequestParm.msg.ToString());
JObject parms = JObject.Parse(RequestParm.msg.ToString());
var query = new RB_Commerce_News_Extend()
{
Title = parms.GetStringValue("Title")
};
var userInfo = AppletUserInfo; var userInfo = AppletUserInfo;
var query = new RB_Commerce_News_Extend();
query.MallBaseId = RequestParm.MallBaseId; query.MallBaseId = RequestParm.MallBaseId;
query.TenantId = userInfo?.TenantId ?? 0; query.TenantId = userInfo?.TenantId ?? 0;
var list = commerceNewsModule.GetCommerceNewsTopListModule(5, query); var list = commerceNewsModule.GetCommerceNewsPageListModule(pageModel.pageIndex, pageModel.pageSize, out long rowsCount, query);
return ApiResult.Success(data: list); pageModel.count = Convert.ToInt32(rowsCount);
pageModel.pageData = list;
return ApiResult.Success(data: pageModel);
} }
/// <summary> /// <summary>
...@@ -240,5 +299,37 @@ namespace Mall.WebApi.Controllers.TradePavilion ...@@ -240,5 +299,37 @@ namespace Mall.WebApi.Controllers.TradePavilion
var extModel = procurementModule.GetInvestmentProcurementModule(Id); var extModel = procurementModule.GetInvestmentProcurementModule(Id);
return ApiResult.Success(data: extModel); return ApiResult.Success(data: extModel);
} }
/// <summary>
/// 新增修改Fat咨询
/// </summary>
/// <returns></returns>
public ApiResult SetCommerceAsk()
{
JObject parms = JObject.Parse(RequestParm.msg.ToString());
var extModel = new RB_Commerce_Ask_Extend()
{
Id = parms.GetInt("Id"),
CompanyName = parms.GetStringValue("CompanyName"),
Principal = parms.GetStringValue("Principal"),
Mobile = parms.GetStringValue("Mobile"),
EMail = parms.GetStringValue("EMail"),
FatCode = parms.GetStringValue("FatCode"),
FatTitle = parms.GetStringValue("FatTitle"),
FatQuestion = parms.GetStringValue("FatQuestion"),
FatContent = parms.GetStringValue("FatContent")
};
var userInfo = AppletUserInfo;
extModel.Status = Common.Enum.DateStateEnum.Normal;
extModel.MallBaseId = userInfo.MallBaseId;
extModel.TenantId = userInfo.TenantId;
Int32.TryParse(userInfo.UserId.ToString(), out int Uid);
extModel.CreateBy = Uid;
extModel.CreateDate = DateTime.Now;
extModel.UpdateBy = Uid;
extModel.UpdateDate = DateTime.Now;
var flag = askModule.SetCommerceAskModule(extModel);
return flag ? ApiResult.Success() : ApiResult.Failed();
}
} }
} }
Mall.WebApi/Controllers/TradePavilion/TradeController.cs
View file @ bb696e8c
...@@ -195,53 +195,7 @@ namespace Mall.WebApi.Controllers.TradePavilion ...@@ -195,53 +195,7 @@ namespace Mall.WebApi.Controllers.TradePavilion
return ApiResult.Success(data: pageModel); return ApiResult.Success(data: pageModel);
} }
/// <summary>
/// 新增修改投资采购
/// </summary>
/// <returns></returns>
public ApiResult SetInvestmentProcurement()
{
JObject parms = JObject.Parse(RequestParm.msg.ToString());
var extModel = new RB_InvestmentProcurement_Extend()
{
Id = parms.GetInt("Id"),
Type = parms.GetInt("Type"),
GoodsCategory = parms.GetStringValue("GoodsCategory"),
Investment = parms.GetStringValue("Investment"),
ImportNum = parms.GetInt("ImportNum"),
Describe = parms.GetStringValue("Describe"),
CompanyName = parms.GetStringValue("CompanyName"),
CompanyEnName = parms.GetStringValue("CompanyEnName"),
Mobile = parms.GetStringValue("Mobile"),
EMail = parms.GetStringValue("EMail"),
LegalPerson = parms.GetStringValue("LegalPerson"),
Principal = parms.GetStringValue("Principal"),
WechatNo = parms.GetStringValue("WechatNo"),
DomainUrl = parms.GetStringValue("DomainUrl"),
Industry = parms.GetStringValue("Industry"),
FoundingTime = parms.GetDateTime("FoundingTime"),
EmployeeNum = parms.GetInt("EmployeeNum"),
AnnualSales = parms.GetDecimal("AnnualSales"),
Address = parms.GetStringValue("Address"),
EnAddress = parms.GetStringValue("EnAddress"),
AnnualImport = parms.GetDecimal("AnnualImport"),
ImportCategory = parms.GetStringValue("ImportCategory"),
ImportCountry = parms.GetStringValue("ImportCountry"),
ExportCountry = parms.GetStringValue("ExportCountry"),
CompanyIntro = parms.GetStringValue("CompanyIntro"),
OtherInfo = parms.GetStringValue("OtherInfo"),
};
extModel.Status = Common.Enum.DateStateEnum.Normal;
extModel.MallBaseId = RequestParm.MallBaseId;
extModel.TenantId = RequestParm.TenantId;
Int32.TryParse(RequestParm.uid, out int Uid);
extModel.CreateBy = Uid;
extModel.CreateDate = DateTime.Now;
extModel.UpdateBy = Uid;
extModel.UpdateDate = DateTime.Now;
var flag = procurementModule.SetInvestmentProcurementModule(extModel);
return flag ? ApiResult.Success() : ApiResult.Failed();
}
/// <summary> /// <summary>
/// 获取投资采购详情 /// 获取投资采购详情
......
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