Skip to content

M
mall.oytour.com
Commit f3fb9ebe authored by liudong1993's avatar liudong1993
Browse files
Options

调整

parent a7d1e2cb
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 518 additions and 38 deletions
Mall.Module.Product/OrderModule.cs
View file @ f3fb9ebe
This diff is collapsed.
Mall.Module.User/UserModule.cs
View file @ f3fb9ebe
......@@ -524,6 +524,133 @@ namespace Mall.Module.User
}
}
/// <summary>
/// 升级会员
/// </summary>
/// <param name="gradeId"></param>
/// <param name="userInfo"></param>
/// <returns></returns>
public string GetUserMemberCenterInfo(int gradeId, AppletUserInfo userInfo)
{
var umodel = member_UserRepository.GetEntity(userInfo.UserId);
var gradeModel = member_GradeRepository.GetEntity(gradeId);
if (gradeModel == null) {
return "等级不存在";
}
if (gradeModel.IsAutoUpGrade != 1) {
return "无法升级到该等级";
}
//获取用户订单金额
var SaleModel = goods_OrderRepository.GetUserOrderNumAndMoney(userInfo.UserId.ToString(), userInfo.TenantId, userInfo.MallBaseId).FirstOrDefault();
if (gradeModel.UpGradeMoney > (SaleModel?.Income ?? 0)) {
//升级条件不满足
return "需累计完成订单金额：" + gradeModel.UpGradeMoney;
}
Dictionary<string, object> keyValues = new Dictionary<string, object>() {
{ nameof(RB_Member_User.MemberGrade),gradeId},
{ nameof(RB_Member_User.Remark),umodel.Remark +" 客人自行升级会员等级："+gradeModel.Name}
};
List<WhereHelper> wheres = new List<WhereHelper>() {
new WhereHelper(){
FiledName=nameof(RB_Member_User.Id),
FiledValue=umodel.Id,
OperatorEnum=OperatorEnum.Equal
}
};
bool flag = member_UserRepository.Update(keyValues, wheres);
if (flag)
{
return "";
}
else {
return "升级失败，请联系管理员";
}
}
/// <summary>
/// 获取小程序用户会员中心
/// </summary>
/// <param name="userInfo"></param>
/// <returns></returns>
public object GetUserMemberCenterInfo(AppletUserInfo userInfo)
{
var umodel = member_UserRepository.GetEntity(userInfo.UserId);
string GradeName = "普通用户";
string Icon = "";
string BackgroundImage = "";
decimal Discount = 0;
int Grade = 0;
var qlist = new List<RB_Member_Equity_Extend>();
if (umodel.MemberGrade > 0)
{
var gradeModel = member_GradeRepository.GetEntity(umodel.MemberGrade);
GradeName = gradeModel?.Name ?? "暂无等级";
Icon = material_InfoRepository.GetEntity(gradeModel?.Icon ?? 0)?.Path ?? "";
BackgroundImage = material_InfoRepository.GetEntity(gradeModel?.BackgroundImage ?? 0)?.Path ?? "";
Discount = gradeModel?.Discount ?? 0;
Grade = gradeModel.Grade ?? 0;
//获取权益列表
qlist = member_EquityRepository.GetList(new RB_Member_Equity_Extend() { GradeId = umodel.MemberGrade, TenantId = userInfo.TenantId, MallBaseId = userInfo.MallBaseId });
}
//获取可升级的会员信息
var UpGradeModel = member_GradeRepository.GetMemberUpgrade(Grade, userInfo.TenantId, userInfo.MallBaseId);
var UpGradeInfo = new object();
if (UpGradeModel != null && UpGradeModel.IsAutoUpGrade == 1)
{
//获取权益列表
var qlist1 = member_EquityRepository.GetList(new RB_Member_Equity_Extend() { GradeId = UpGradeModel.Id, TenantId = userInfo.TenantId, MallBaseId = userInfo.MallBaseId });
UpGradeInfo = new
{
Status = 1,
Info = new
{
UpGradeModel.Id,
UpGradeModel.Grade,
UpGradeModel.Name,
UpGradeModel.Discount,
UpGradeModel.UpGradeMoney,
UpGradeModel.IsMemberBuy,
UpGradeModel.MemberBuyMoney,
UpGradeModel.MemberSpecification,
QList = qlist1.Select(x => new {
x.Id,
x.Title,
x.ImagePath,
x.Content
}),
}
};
}
else {
UpGradeInfo = new
{
Status = 2,
Msg = "暂无可升级会员等级"
};
}
return new
{
UserId = umodel.Id,
umodel.Name,
umodel.Photo,
GradeName,
umodel.MemberGrade,
umodel.Balance,
Icon,
BackgroundImage,
Discount,
QList = qlist.Select(x=>new {
x.Id,
x.Title,
x.ImagePath,
x.Content
}),
UpGradeInfo
};
}
/// <summary>
/// 验证会员等级是否存在
/// </summary>
......@@ -3194,7 +3321,7 @@ namespace Mall.Module.User
/// <returns></returns>
public int UpdateUserSuperiorForWeiXin(int userId, int count, int tenantId, int mallBaseId)
{
string cookie = "__login_route=%2Fadmin%2Fpassport%2Flogin; __login_role=admin; search={'keyword':'','status':' - 1','sort_prop':'','sort_type':'','cats'[],'date_start':null,'date_end':null}; HJ_SESSION_ID=kmmormovvm2u9qh5drkgsbj1ta; _csrf=7a980bb65eabe0ac3d77199092030044b17ae9779de00eaed628c8095ab2fe0ca%3A2%3A%7Bi%3A0%3Bs%3A5%3A%22_csrf%22%3Bi%3A1%3Bs%3A32%3A%22rsnZWVWkZkpfvVhLBXu8sGG3px0Dgcsx%22%3B%7D";
string cookie = "__login_route=%2Fadmin%2Fpassport%2Flogin; __login_role=admin; HJ_SESSION_ID=lgfv5vck57rj84nh4npn59b4pj; _csrf=1febe37678187521a164220da9a9293f67d6d638a1cc01acebf0d3123757216ea%3A2%3A%7Bi%3A0%3Bs%3A5%3A%22_csrf%22%3Bi%3A1%3Bs%3A32%3A%22e5vd7mYVeGAfqcBMV_m0lkeiJLXFghtc%22%3B%7D";
var list = member_UserRepository.GetPageList(1, count, out long rcount, new RB_Member_User_Extend() { TenantId = tenantId, MallBaseId = mallBaseId, MinUserId = userId, Source = UserSourceEnum.WeiXin });
foreach (var item in list)
{
......@@ -3211,13 +3338,7 @@ namespace Mall.Module.User
foreach (var uitem in UserList) {
uitem.nickname = uitem.nickname.Replace("'", "\"");
uitem.nickname = uitem.nickname.Replace("??", "?");
if (uitem.nickname.Length > 20)
{
uitem.nickname = "'" + uitem.nickname[..20] + "'";
}
else {
uitem.nickname = "'" + uitem.nickname.Replace("'", "") + "\t'";
}
uitem.nickname = "'" + uitem.nickname + "'";
}
string UserNameStr = string.Join(",", UserList.Select(x => x.nickname));
var uList = member_UserRepository.GetList(new RB_Member_User_Extend() { UserNameStr = UserNameStr, TenantId = tenantId, MallBaseId = mallBaseId });
......
Mall.Repository/Product/RB_Goods_OrderRepository.cs
View file @ f3fb9ebe
......@@ -816,6 +816,42 @@ LEFT JOIN (SELECT SUM(Commission) as ALLCommission,OrderId from rb_goods_orderco
GROUP BY b.GoodsId,b.SupplierId,b.OrderId ";
return GetPage<OrderStatistics_Query>(pageIndex, pageSize, out count, sql).ToList();
}
/// <summary>
/// 获取用户 订单下的商品数量
/// </summary>
/// <param name="userId"></param>
/// <param name="limitGoodsIds"></param>
/// <returns></returns>
public List<RB_Goods_Order_Extend> GetUserOrderGoodsNum(int userId, string limitGoodsIds,int tenantId, int mallBaseId)
{
string sql = $@"SELECT od.GoodsId,SUM(od.Number) as GoodsTotalNum FROM rb_goods_orderdetail od
INNER JOIN rb_goods_order o on od.OrderId=o.OrderId
WHERE od.TenantId={tenantId} and od.MallBaseId={mallBaseId} and o.`Status`=0 and o.OrderStatus in (1,2,3,4,5,6) and o.Recycled=2 AND o.UserId={userId} and od.GoodsId in ({limitGoodsIds})
GROUP BY od.GoodsId";
return Get<RB_Goods_Order_Extend>(sql).ToList();
}
/// <summary>
/// 获取用户 商品订单得数量
/// </summary>
/// <param name="userId"></param>
/// <param name="limitGoodsIds"></param>
/// <param name="tenantId"></param>
/// <param name="mallBaseId"></param>
/// <returns></returns>
public List<RB_Goods_Order_Extend> GetUserOrderNum(int userId, string limitGoodsIds, int tenantId, int mallBaseId)
{
string sql = $@"SELECT t.GoodsId,COUNT(0) as OrderNum FROM(
SELECT od.GoodsId,o.* FROM rb_goods_orderdetail od
INNER JOIN rb_goods_order o on od.OrderId=o.OrderId
WHERE od.TenantId={tenantId} and od.MallBaseId={mallBaseId} and o.`Status`=0 and o.OrderStatus in (1,2,3,4,5,6) and o.Recycled=2 AND o.UserId={userId} and od.GoodsId in ({limitGoodsIds})
GROUP BY od.GoodsId,o.OrderId
)t GROUP BY t.GoodsId";
return Get<RB_Goods_Order_Extend>(sql).ToList();
}
#endregion
}
}
Mall.Repository/User/RB_Member_GradeRepository.cs
View file @ f3fb9ebe
......@@ -110,5 +110,26 @@ namespace Mall.Repository.User
string sql = $@"select Grade from RB_Member_Grade where {where} order by Grade asc";
return Get<RB_Member_Grade_Extend>(sql).ToList();
}
/// <summary>
/// 获取下一等级
/// </summary>
/// <param name="grade"></param>
/// <param name="tenantId"></param>
/// <param name="mallBaseId"></param>
/// <returns></returns>
public RB_Member_Grade_Extend GetMemberUpgrade(int? grade, int tenantId, int mallBaseId)
{
string where = $@" 1=1 and {nameof(RB_Member_Grade.Status)}=0";
where += $@" and {nameof(RB_Member_Grade.TenantId)}={tenantId}";
where += $@" and {nameof(RB_Member_Grade.MallBaseId)}={mallBaseId}";
where += $@" and {nameof(RB_Member_Grade.Grade)}>{grade}";
where += $@" and {nameof(RB_Member_Grade.Enabled)}=1";
string sql = $@"select * from RB_Member_Grade where {where} order by Grade asc limit 1";
return Get<RB_Member_Grade_Extend>(sql).FirstOrDefault();
}
}
}
Mall.WebApi/Controllers/Product/AppletOrderController.cs
View file @ f3fb9ebe
......@@ -16,6 +16,7 @@ using Newtonsoft.Json.Linq;
using Mall.Common;
using Mall.Module.Product;
using Mall.Model.Extend.User;
using Mall.Model.Entity.BaseSetUp;
namespace Mall.WebApi.Controllers.MallBase
{
......@@ -432,6 +433,34 @@ namespace Mall.WebApi.Controllers.MallBase
return orderModule.SetAppletGoodsOrderInfo(demodel);
}
/// <summary>
/// 设置订单其他付款
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult SetAppletGoodsOrderOtherPay() {
var req = RequestParm;
var userInfo = AppletUserInfo;
JObject parms = JObject.Parse(req.msg.ToString());
int OrderId = parms.GetInt("OrderId", 0);
int Type = parms.GetInt("Type", 1);//1 货到付款 2 余额付款
if (OrderId <= 0) {
return ApiResult.ParamIsNull("请传递订单id");
}
if (Type != 1 && Type != 2) {
return ApiResult.ParamIsNull("类型不正确");
}
string msg = orderModule.SetAppletGoodsOrderOtherPay(OrderId, Type, userInfo);
if (msg == "")
{
return ApiResult.Success();
}
else {
return ApiResult.Failed(msg);
}
}
/// <summary>
/// 未付款取消订单/已付款申请取消订单
/// </summary>
......@@ -643,6 +672,25 @@ namespace Mall.WebApi.Controllers.MallBase
return ApiResult.Success("", pagelist);
}
#region 获取快递公司信息
public ApiResult GetExpressInfo()
{
var parms = RequestParm;
var userInfo = AppletUserInfo;
var query = new RB_Logistics_Express();
query.TenantId = userInfo.TenantId;
query.MallBaseId = userInfo.MallBaseId;
var list = orderModule.GetLogisticsExpressList(query);
var result = list.Select(x => new
{
x.ID,
x.Name,
x.ExpressCode
});
return ApiResult.Success("获取成功", result);
}
#endregion
#endregion
#region 订单评价
......
Mall.WebApi/Controllers/User/AppletUserController.cs
View file @ f3fb9ebe
......@@ -627,6 +627,48 @@ namespace Mall.WebApi.Controllers.User
#endregion
#region 会员中心
/// <summary>
/// 获取用户会员中心
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult GetUserMemberCenter()
{
var req = RequestParm;
var userInfo = AppletUserInfo;
var Robj = userModule.GetUserMemberCenterInfo(userInfo);
return ApiResult.Success("", Robj);
}
/// <summary>
/// 用户升级会员信息
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult SetUserUpGradeMemberInfo() {
var req = RequestParm;
var userInfo = AppletUserInfo;
JObject parms = JObject.Parse(req.msg.ToString());
int GradeId = parms.GetInt("GradeId", 0);
if (GradeId <= 0) {
return ApiResult.ParamIsNull();
}
string msg = userModule.GetUserMemberCenterInfo(GradeId, userInfo);
if (msg == "")
{
return ApiResult.Success();
}
else {
return ApiResult.Failed(msg);
}
}
#endregion
#region 我的足迹
/// <summary>
......@@ -728,8 +770,7 @@ namespace Mall.WebApi.Controllers.User
// return userModule.GetAppletUserCenterStatistics(userInfo.UserId, userInfo.TenantId, userInfo.MallBaseId);
//}
#endregion
#endregion
#region 优惠券
......
Mall.WebApi/Controllers/User/UserController.cs
View file @ f3fb9ebe
......@@ -2135,7 +2135,7 @@ namespace Mall.WebApi.Controllers.User
#region 用户转移
/// <summary>
/// 更新微信用户头像
/// 更新微信用户头像 (在控制台)
/// </summary>
/// <returns></returns>
[HttpPost]
......@@ -2166,7 +2166,6 @@ namespace Mall.WebApi.Controllers.User
[HttpPost]
public ApiResult UpdateUserSuperiorForWeiXin()
{
var req = RequestParm;
JObject parms = JObject.Parse(req.msg.ToString());
int Count = parms.GetInt("Count", 1);
......
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