Skip to content

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

新人购买并付款领取优惠券

parent 6b456d5a
Hide whitespace changes
Inline Side-by-side
Showing with 104 additions and 21 deletions
Mall.Common/Enum/MarketingCenter/TriggerTypeEnum.cs
View file @ 691b5cd6
......@@ -6,7 +6,7 @@ using System.Text;
namespace Mall.Common.Enum.MarketingCenter
{
/// <summary>
/// 触发事件，1-分享，2-购买并付款，3-新人领券，4-新人购买并付款领券
/// 触发事件，1-分享，2-购买并付款，3-新人领券，4-新人购买并付款
/// </summary>
public enum TriggerTypeEnum
{
......@@ -26,9 +26,9 @@ namespace Mall.Common.Enum.MarketingCenter
[EnumField("新人领券")]
NewMemer = 3,
/// <summary>
/// 新人购买并付款领券
/// 新人购买并付款
/// </summary>
[EnumField("新人购买并付款领券")]
[EnumField("新人购买并付款")]
NewMemerBuyAndPay = 4
}
......
Mall.Module.MarketingCenter/CouponModule.cs
View file @ 691b5cd6
......@@ -911,8 +911,8 @@ namespace Mall.Module.MarketingCenter
Status = 0,
CreateDate = System.DateTime.Now,
UserId = model.UserId,
Description = item.TriggerType == 1 ? "分享自动发放优惠券" : (item.TriggerType == 2 ? "购买并付款自动发放优惠券" : "新人领劵自动发放优惠券"),
Remarks = item.TriggerType == 1 ? "分享" : (item.TriggerType == 2 ? "购买并付款" : "新人领劵"),
Description = item.TriggerType == 1 ? "分享自动发放优惠券" : (item.TriggerType == 2 ? "购买并付款自动发放优惠券" :(item.TriggerType == 3 ? "新人领劵自动发放优惠券": "新人购买并付款自动发放优惠券")),
Remarks = item.TriggerType == 1 ? "分享" : (item.TriggerType == 2 ? "购买并付款" : (item.TriggerType == 3? "新人领劵": "新人购买并付款")),
UseState = 0,
CouponId = item.ID,
StartDate = item.IndateType == Common.Enum.MarketingCenter.IndateTypeEnum.DayHorizon ? System.DateTime.Now : item.StartDate,
......
Mall.Module.Product/GuideCarModule.cs
View file @ 691b5cd6
......@@ -3794,8 +3794,10 @@ namespace Mall.Module.Product
}
//查询订单明细
var dlist = goods_OrderDetailRepository.GetGuideCarOrderDetailList(new RB_Goods_OrderDetail_Extend() { TenantId = tenantId, MallBaseId = mallBaseId, OrderId = orderId });
foreach (var item in dlist)
{
item.CoverImagePath = item.CoverImage;
}
model.DetailList = dlist;
//地址
model.DistrictAddress = (destinationRepository.GetEntity(model.Province)?.Name ?? "") + " " + (destinationRepository.GetEntity(model.City)?.Name ?? "") + " " + (destinationRepository.GetEntity(model.District)?.Name ?? "");
......
Mall.Module.Product/ProductModule.cs
View file @ 691b5cd6
......@@ -6937,5 +6937,17 @@ namespace Mall.Module.Product
return freeShippingRepository.GetFreeShippingListByCategoryIds(query);
}
#endregion
}
#region 根据订单状态获取订单信息
/// <summary>
/// 获取列表
/// </summary>
/// <param name="dmodel"></param>
/// <returns></returns>
public List<RB_Goods_Order_Extend> GetOrderListByOrderStatus(RB_Goods_Order_Extend dmodel)
{
return goods_OrderRepository.GetOrderListByOrderStatus(dmodel);
}
#endregion
}
}
Mall.Repository/MarketingCenter/RB_DiscountCouponRepository.cs
View file @ 691b5cd6
......@@ -227,7 +227,8 @@ SELECT a.ID as MemberCouponId,a.UserId,b.`Name`,b.CouponType,b.UseType,b.MinCons
where += $" AND ( a.{nameof(RB_DiscountCoupon_Extend.SmallShopId)}={query.SmallShopId} or ( a.{nameof(RB_DiscountCoupon_Extend.SmallShopId)}=0 and a.{nameof(RB_DiscountCoupon_Extend.IsZanYangUse)}=0))";
}
else {
else
{
where += $" AND a.{nameof(RB_DiscountCoupon_Extend.SmallShopId)}=0";
}
}
......@@ -317,7 +318,6 @@ on a.CouponId=b.ID {where} ";
{
StringBuilder builder = new StringBuilder();
string userWhere = "";
// builder.Append(@$" SELECT a.*,b.TriggerType,b.GrantNum from rb_coupon_selfmotion as b LEFT JOIN {TableName} as a on a.ID=b.DiscountCouponId WHERE a.{nameof(RB_DiscountCoupon_Extend.Status)}=0 and b.`Status`=0 and (a.IndateType=1 or (a.IndateType=2 and a.StartDate<NOW() and a.EndDate>NOW()))");
if (query != null)
{
......
Mall.Repository/Product/RB_Goods_OrderRepository.cs
View file @ 691b5cd6
......@@ -139,6 +139,50 @@ where {where} group by o.OrderId order by o.CreateDate desc";
return GetPage<RB_Goods_Order_Extend>(pageIndex, pageSize, out count, sql, parameters).ToList();
}
/// <summary>
/// 获取列表
/// </summary>
/// <param name="dmodel"></param>
/// <returns></returns>
public List<RB_Goods_Order_Extend> GetOrderListByOrderStatus(RB_Goods_Order_Extend dmodel)
{
string where = $" 1=1 and o.{nameof(RB_Goods_Order.Status)}=0 and o.{nameof(RB_Goods_Order.OrderStatus)} in(1,2,3,4,5,6)";
if (dmodel.TenantId > 0)
{
where += $@" and o.{nameof(RB_Goods_Order.TenantId)}={dmodel.TenantId}";
}
if (dmodel.MallBaseId > 0)
{
where += $@" and o.{nameof(RB_Goods_Order.MallBaseId)}={dmodel.MallBaseId}";
}
if (dmodel.UserId > 0)
{
where += $@" and o.{nameof(RB_Goods_Order.UserId)}={dmodel.UserId}";
}
if (dmodel.OrderId > 0)
{
where += $@" and o.{nameof(RB_Goods_Order.OrderId)}={dmodel.OrderId}";
}
if (!string.IsNullOrEmpty(dmodel.OrderIds))
{
where += $@" and o.{nameof(RB_Goods_Order.OrderId)} in({dmodel.OrderIds})";
}
if (!string.IsNullOrEmpty(dmodel.orderNos))
{
where += $@" and o.{nameof(RB_Goods_Order.OrderNo)} in({dmodel.orderNos})";
}
string sql = $@"SELECT o.* FROM rb_goods_order o
where {where} group by o.OrderId asc";
return Get<RB_Goods_Order_Extend>(sql).ToList();
}
/// <summary>
/// 获取列表
/// </summary>
......
Mall.WebApi/Controllers/MarketingCenter/CouponController.cs
View file @ 691b5cd6
......@@ -636,8 +636,6 @@ namespace Mall.WebApi.Controllers.MarketingCenter
}
else
{
if (query.ID == 0)
{
query.CreateDate = System.DateTime.Now;
......
Mall.WebApi/Controllers/User/AppletUserController.cs
View file @ 691b5cd6
......@@ -245,7 +245,7 @@ namespace Mall.WebApi.Controllers.User
return ApiResult.Failed();
}
}
/// <summary>
/// 设置地址默认
......@@ -733,7 +733,7 @@ namespace Mall.WebApi.Controllers.User
var req = RequestParm;
JObject parms = JObject.Parse(req.msg.ToString());
//是否直属
int IsDirect= parms.GetInt("IsDirect", 0);
int IsDirect = parms.GetInt("IsDirect", 0);
var obj = userModule.GerUserMyTeamTitelListForFX(userInfo, IsDirect: IsDirect);
return ApiResult.Success("", obj);
}
......@@ -759,10 +759,10 @@ namespace Mall.WebApi.Controllers.User
if (parms.GetInt("NewUserId") > 0)
{
demodel.UserId = parms.GetInt("NewUserId");
NewUserId= parms.GetInt("NewUserId");
NewUserId = parms.GetInt("NewUserId");
}
var list= userModule.GetUserMyTeamPageListForFX(pageModel.pageIndex, pageModel.pageSize, out long count, demodel,NewUserId: NewUserId);
var list = userModule.GetUserMyTeamPageListForFX(pageModel.pageIndex, pageModel.pageSize, out long count, demodel, NewUserId: NewUserId);
pageModel.count = Convert.ToInt32(count);
pageModel.pageData = list;
......@@ -1093,7 +1093,7 @@ namespace Mall.WebApi.Controllers.User
}
if (allMemberInfo.SmallShopId == 0)
{
if (oldLogisticsModel.SmallShopId > 0 )
if (oldLogisticsModel.SmallShopId > 0)
{
return ApiResult.Failed("您不属于当前店铺");
}
......@@ -1237,7 +1237,34 @@ namespace Mall.WebApi.Controllers.User
query.TenantId = userInfo.TenantId;
query.MallBaseId = userInfo.MallBaseId;
query.UserId = userInfo.UserId;
RB_DiscountCoupon_Extend resultModel = couponModule.AutoCoupon(query);
RB_DiscountCoupon_Extend resultModel = new RB_DiscountCoupon_Extend();
if (query.TriggerType == 2)
{
//先判断是否是新人购买并付款
var orderList = productModule.GetOrderListByOrderStatus(new RB_Goods_Order_Extend { TenantId = query.TenantId, MallBaseId = query.MallBaseId, UserId = query.UserId });
if (orderList.Where(x => (int)x.OrderStatus > 1).Count() > 1)
{
query.TriggerType = 2;
resultModel = couponModule.AutoCoupon(query);
}
else
{
if (orderList.Where(x => (int)x.OrderStatus > 1).Count() <= 1)
{
query.TriggerType = 4;
resultModel = couponModule.AutoCoupon(query);
}
if (resultModel == null || resultModel.ID == 0)
{
query.TriggerType = 2;
resultModel = couponModule.AutoCoupon(query);
}
}
}
else
{
resultModel = couponModule.AutoCoupon(query);
}
if (resultModel != null && resultModel.ID > 0)
{
return ApiResult.CouponSuccess(ResultCode.Success, "", resultModel.Name);
......@@ -1770,7 +1797,7 @@ namespace Mall.WebApi.Controllers.User
demodel.UserId = userInfo.UserId;
List<RB_Member_User_Extend> memberList = new List<RB_Member_User_Extend>();
var list = userModule.GetOrderIntroductionPageList(pagelist.pageIndex, pagelist.pageSize, out long count, demodel);
pagelist.count = Convert.ToInt32(count);
pagelist.pageData = list.Select(x => new
{
......@@ -1789,7 +1816,7 @@ namespace Mall.WebApi.Controllers.User
y.Number
}),
x.UserId,
x.UserName,
x.Photo,
x.Mobile,
......
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