Skip to content

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

页面修改

parent c9edb1ab
Hide whitespace changes
Inline Side-by-side
Showing with 51 additions and 19 deletions
Mall.Common/Plugin/ConvertHelper.cs
View file @ 4c9ac603
......@@ -86,7 +86,7 @@ namespace Mall.Common
/// <returns></returns>
public static T ConvertTo<T>(object obj)
{
if (obj == null) return default(T);//返回默认值
if (obj == null) return default;//返回默认值
Type tp = typeof(T);
//泛型Nullable判断，取其中的类型
if (tp.IsGenericType)
......@@ -111,11 +111,11 @@ namespace Mall.Common
{
return (T)parameters[1];
}
return default(T);
return default;
}
catch
{
return default(T);
return default;
}
}
......@@ -264,7 +264,7 @@ namespace Mall.Common
}
/// <summary>
/// 格式化时间【yyyy-MM-dd】
/// 格式化时间【yyyy-MM-dd HH:mm】
/// </summary>
/// <param name="time"></param>
/// <returns></returns>
......
Mall.Module.MarketingCenter/SurveyModule.cs
View file @ 4c9ac603
......@@ -5,7 +5,9 @@ using System.Text;
using Mall.Common.Enum.MarketingCenter;
using Mall.Common.Plugin;
using Mall.Model.Entity.MarketingCenter;
using Mall.Model.Extend.Education;
using Mall.Model.Extend.MarketingCenter;
using Mall.Repository.Education;
using Mall.Repository.MarketingCenter;
using VT.FW.DB;
......@@ -30,6 +32,11 @@ namespace Mall.Module.MarketingCenter
public readonly RB_ActivitySurveyRepository activitySurveyRepository = new RB_ActivitySurveyRepository();
/// <summary>
/// 教育系统用户账号信息
/// </summary>
private readonly RB_AccountRepository accountRepository = new RB_AccountRepository();
#region 问卷调查活动管理
/// <summary>
/// 获取列表
......@@ -510,9 +517,31 @@ namespace Mall.Module.MarketingCenter
/// <param name="rowsCount"></param>
/// <param name="where"></param>
/// <returns></returns>
public List<Rb_GuestSurvey_Extend> GetResultPageList(int pageIndex, int pageSize, out long rowsCount, Rb_GuestSurvey_Extend where)
public List<Rb_GuestSurvey_Extend> GetResultPageListModule(int pageIndex, int pageSize, out long rowsCount, Rb_GuestSurvey_Extend where)
{
return guestSurveyRepository.GetResultPageList(pageIndex, pageSize, out rowsCount, where);
var list= guestSurveyRepository.GetResultPageListRepository(pageIndex, pageSize, out rowsCount, where);
if (list != null && list.Count > 0)
{
string stuIds = string.Join(",", list.Where(qitem => qitem.UserType == 2).Select(qitem => qitem.UserId));
List<RB_Account_ViewModel> StuList = new List<RB_Account_ViewModel>();
if (!string.IsNullOrEmpty(stuIds))
{
StuList= accountRepository.GetStudentExt(new RB_Account_ViewModel()
{
QIds = stuIds
});
}
foreach (var item in list)
{
if (item.UserType == 2)
{
var tempModel = StuList?.FirstOrDefault(qitem => qitem.Id == item.UserId);
item.AliasName = tempModel?.AccountName ?? "";
item.Photo = tempModel?.UserIcon ?? "";
}
}
}
return list;
}
#endregion
}
......
Mall.Repository/MarketingCenter/Rb_GuestSurveyRepository.cs
View file @ 4c9ac603
......@@ -7,7 +7,7 @@ using Mall.Model.Extend.MarketingCenter;
namespace Mall.Repository.MarketingCenter
{
public class Rb_GuestSurveyRepository:BaseRepository<Rb_GuestSurvey>
public class Rb_GuestSurveyRepository : BaseRepository<Rb_GuestSurvey>
{
/// <summary>
/// 表名称
......@@ -86,7 +86,7 @@ LEFT JOIN (SELECT GuestSurveyId , SUM(ScoreNum) as ScoreNum,COUNT(GuestSurveyId)
}
/// <summary>
/// 分页列表
......@@ -96,11 +96,14 @@ LEFT JOIN (SELECT GuestSurveyId , SUM(ScoreNum) as ScoreNum,COUNT(GuestSurveyId)
/// <param name="rowsCount"></param>
/// <param name="where"></param>
/// <returns></returns>
public List<Rb_GuestSurvey_Extend> GetResultPageList(int pageIndex, int pageSize, out long rowsCount, Rb_GuestSurvey_Extend where)
public List<Rb_GuestSurvey_Extend> GetResultPageListRepository(int pageIndex, int pageSize, out long rowsCount, Rb_GuestSurvey_Extend where)
{
StringBuilder sb = new StringBuilder();
sb.Append($@"SELECT a.*,b.Name as AliasName,b.Photo,c.Title as ActiveSurveyName from Rb_GuestSurvey as a LEFT JOIN rb_member_user as b on a.UserId=b.Id
LEFT JOIN rb_activitysurvey as c on c.ID=a.ActivitySurveyId where a.state=0");
sb.Append($@"
SELECT a.*,b.Name as AliasName,b.Photo,c.Title as ActiveSurveyName
FROM Rb_GuestSurvey as a LEFT JOIN rb_member_user as b on (a.UserId=b.Id AND A.UserType=1)
LEFT JOIN rb_activitysurvey as c on c.ID=a.ActivitySurveyId
WHERE a.state=0");
if (where != null)
{
if (where.MallBaseId > 0)
......
Mall.Repository/Product/RB_Goods_OrderRepository.cs
View file @ 4c9ac603
......@@ -1027,7 +1027,7 @@ SELECT 0 as Total,0 as MemberNum, 0 as GoodsNum,0 as OrderNum,
//string payMemerNumWhere = $" and (OrderStatus in(2,3,4,6,5) or( {nameof(RB_Goods_Order.OrderStatus)}=7 and {nameof(RB_Goods_Order.PaymentTime)} is not NULL)) ";
string payMemerNumWhere = " and (OrderStatus in(2,3,4,5,6) or (OrderStatus=7 and PaymentTime is not NULL and CancelTime is not NULL and DATE_FORMAT(PaymentTime,'%Y-%m-%d' )<DATE_FORMAT(CancelTime,'%Y-%m-%d' ) ) ) ";
string orderTypeWhere = "";
string sql = "";
string sql;
if (dmodel.TenantId > 0)
{
where += $@" and a.{nameof(RB_Goods_Order.TenantId)}={dmodel.TenantId}";
......@@ -2136,7 +2136,7 @@ GROUP BY od.GoodsId,o.OrderId
/// <returns></returns>
public List<RB_Goods_Order_Extend> GetCanCancelOrderList(int cancelTime, int t, int m)
{
string sql = $@"SELECT OrderId,UserId,OrderNo,OrderSource,CouponsIds FROM rb_goods_order where TenantId ={t} and MallBaseId ={m} and `Status`=0 and OrderStatus =1 and DATE_ADD(CreateDate,INTERVAL {cancelTime} MINUTE) < '{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}'";
string sql = $@"SELECT OrderId,UserId,OrderNo,OrderSource,CouponsIds FROM rb_goods_order where TenantId ={t} and MallBaseId ={m} and `Status`=0 and OrderStatus =1 and DATE_ADD(CreateDate,INTERVAL {cancelTime} MINUTE) < '{Common.ConvertHelper.FormatTime(DateTime.Now)}'";
return Get<RB_Goods_Order_Extend>(sql).ToList();
}
......@@ -2149,7 +2149,7 @@ GROUP BY od.GoodsId,o.OrderId
/// <returns></returns>
public List<RB_Goods_Order_Extend> GetCanReceivingOrderList(int day, int t, int m)
{
string sql = $@"SELECT OrderId,UserId,OrderNo,OrderSource,CouponsIds FROM rb_goods_order where TenantId ={t} and MallBaseId ={m} and `Status`=0 and OrderStatus =3 and OrderClassify=0 and DATE_ADD(DeliveryTime,INTERVAL {day} DAY) < '{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}'";
string sql = $@"SELECT OrderId,UserId,OrderNo,OrderSource,CouponsIds FROM rb_goods_order where TenantId ={t} and MallBaseId ={m} and `Status`=0 and OrderStatus =3 and OrderClassify=0 and DATE_ADD(DeliveryTime,INTERVAL {day} DAY) < '{Common.ConvertHelper.FormatTime(DateTime.Now)}'";
return Get<RB_Goods_Order_Extend>(sql).ToList();
}
#endregion
......@@ -2385,7 +2385,7 @@ where {where} group by o.OrderId order by o.CreateDate desc";
string sql = $@"
SELECT o.* FROM rb_goods_order o
INNER JOIN rb_goods_orderdetail od on o.OrderId = od.OrderId
WHERE o.TenantId={tenantId} AND o.MallBaseId={mallBaseId} AND o.`Status`=0 AND o.Recycled=2 AND o.OrderStatus =4 AND o.OrderClassify =1 AND od.TripETime < '{DateTime.Now.ToString("yyyy-MM-dd")}'
WHERE o.TenantId={tenantId} AND o.MallBaseId={mallBaseId} AND o.`Status`=0 AND o.Recycled=2 AND o.OrderStatus =4 AND o.OrderClassify =1 AND od.TripETime < '{Common.ConvertHelper.FormatDate(DateTime.Now)}'
GROUP BY o.OrderId
";
return Get<RB_Goods_Order_Extend>(sql).ToList();
......@@ -2665,8 +2665,8 @@ WHERE {where} GROUP BY o.OrderId ORDER BY o.CreateDate DESC ";
public List<RB_Goods_Activity_Extend> GetGoodsNumForCategoryOrGoods(RB_Goods_Activity_Extend dmodel, int UserId, int AfterTime)
{
string where = @$"AND o.`Status` =0 AND o.Recycled=2 AND o.OrderStatus =5 and oa.ReOrderId is null
AND o.CreateDate >='{dmodel.StartTime.ToString("yyyy-MM-dd")}' AND o.CreateDate <='{dmodel.EndTime.ToString("yyyy-MM-dd HH:mm:ss")}'
AND o.ReceivingTime <='{DateTime.Now.AddDays(0 - AfterTime).ToString("yyyy-MM-dd HH:mm:ss")}'
AND o.CreateDate >='{Common.ConvertHelper.FormatDate(dmodel.StartTime)}' AND o.CreateDate <='{Common.ConvertHelper.FormatTime(dmodel.EndTime)}'
AND o.ReceivingTime <='{Common.ConvertHelper.FormatTime(DateTime.Now.AddDays(0 - AfterTime))}'
AND IFNULL(o.{(dmodel.ActiveObject == 1 ? "DistributorTree" : "UserTree")},'') <> '' ";
if (UserId > 0)
{
......@@ -2707,7 +2707,7 @@ GROUP BY od.Id ";
public List<RB_Goods_Activity_Extend> GetGoodsNumForCategoryOrGoods_V2(RB_Goods_Activity_Extend dmodel, int UserId, int AfterTime)
{
string where = @$"AND o.`Status` =0 AND o.Recycled=2 AND o.OrderStatus in(2,3,4,5,6) and oa.ReOrderId is null
AND o.CreateDate >='{dmodel.StartTime.ToString("yyyy-MM-dd")}' AND o.CreateDate <='{dmodel.EndTime.ToString("yyyy-MM-dd HH:mm:ss")}'
AND o.CreateDate >='{Common.ConvertHelper.FormatDate(dmodel.StartTime)}' AND o.CreateDate <='{Common.ConvertHelper.FormatTime(dmodel.EndTime)}'
AND IFNULL(o.{(dmodel.ActiveObject == 1 ? "DistributorTree" : "UserTree")},'') <> '' ";
if (UserId > 0)
{
......
Mall.WebApi/Controllers/MarketingCenter/SurveyController.cs
View file @ 4c9ac603
......@@ -406,7 +406,7 @@ namespace Mall.WebApi.Controllers.MarketingCenter
Rb_GuestSurvey_Extend demodel = JsonConvert.DeserializeObject<Rb_GuestSurvey_Extend>(RequestParm.msg.ToString());
demodel.TenantId = UserInfo.TenantId;
demodel.MallBaseId = parms.MallBaseId;
var data = module.GetResultPageList(pagelist.pageIndex, pagelist.pageSize, out long count, demodel);
var data = module.GetResultPageListModule(pagelist.pageIndex, pagelist.pageSize, out long count, demodel);
var list = data.Select(x => new { x.ID, x.ActiveSurveyName, x.AliasName, CreateDateStr = x.CreateDate.HasValue ? x.CreateDate.Value.ToString("yyyy-MM-dd HH:mm:ss") : "", x.Photo }).ToList();
pagelist.count = int.Parse(count.ToString());
pagelist.pageData = 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