Skip to content

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

Merge branch 'sdzq' of http://gitlab.oytour.com/Kui2/mall.oytour.com into sdzq-ld

parents 140ffd18 a6fc99a8
Hide whitespace changes
Inline Side-by-side
Showing with 276 additions and 64 deletions
Mall.Common/API/AppletUserInfo.cs
View file @ fd95ba06
...@@ -104,5 +104,17 @@ namespace Mall.Common ...@@ -104,5 +104,17 @@ namespace Mall.Common
/// SecretKey /// SecretKey
/// </summary> /// </summary>
public string SecretKey { get; set; } public string SecretKey { get; set; }
/// <summary>
/// 类型
/// </summary>
public Common.Enum.Goods.GoodsPageTypeEnum? UserPageType { get; set; }
/// <summary>
/// 是否开启校园版(1-开启)
/// </summary>
public int IsOpenSchool { get; set; }
} }
} }
\ No newline at end of file
Mall.Common/Enum/Goods/GoodsPageTypeEnum.cs 0 → 100644
View file @ fd95ba06
using Mall.Common.Plugin;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Mall.Common.Enum.Goods
{
/// <summary>
/// 商品上架版面类型枚举
/// </summary>
public enum GoodsPageTypeEnum
{
/// <summary>
/// 全部
/// </summary>
[EnumField("全部")]
All = 0,
/// <summary>
/// 商城
/// </summary>
[EnumField("商城")]
Mall = 1,
/// <summary>
/// 校园
/// </summary>
[EnumField("校园")]
School = 2,
}
}
Mall.Model/Entity/Product/RB_Goods.cs
View file @ fd95ba06
...@@ -383,6 +383,11 @@ namespace Mall.Model.Entity.Product ...@@ -383,6 +383,11 @@ namespace Mall.Model.Entity.Product
/// <summary>
/// 上架版面
/// </summary>
public GoodsPageTypeEnum? GoodsPageType { get; set; }
/// <summary> /// <summary>
/// 供应商id /// 供应商id
/// </summary> /// </summary>
...@@ -535,5 +540,10 @@ namespace Mall.Model.Entity.Product ...@@ -535,5 +540,10 @@ namespace Mall.Model.Entity.Product
get; get;
set; set;
} }
/// <summary>
/// 商品备注
/// </summary>
public string Remark { get; set; }
} }
} }
Mall.Model/Entity/Product/RB_Product_Category.cs
View file @ fd95ba06
...@@ -154,5 +154,10 @@ namespace Mall.Model.Entity.Product ...@@ -154,5 +154,10 @@ namespace Mall.Model.Entity.Product
/// 是否对外分享 1是 2否 /// 是否对外分享 1是 2否
/// </summary> /// </summary>
public int? IsForeignShare { get; set; } public int? IsForeignShare { get; set; }
/// <summary>
/// 上架版面
/// </summary>
public Common.Enum.Goods.GoodsPageTypeEnum? CategoryPageType { get; set; }
} }
} }
Mall.Model/Entity/User/RB_Member_User.cs
View file @ fd95ba06
...@@ -219,5 +219,10 @@ namespace Mall.Model.Entity.User ...@@ -219,5 +219,10 @@ namespace Mall.Model.Entity.User
/// 职位Id,(1-领队导游) /// 职位Id,(1-领队导游)
/// </summary> /// </summary>
public int PostId { get; set; } public int PostId { get; set; }
/// <summary>
/// 类型
/// </summary>
public Common.Enum.Goods.GoodsPageTypeEnum? UserPageType { get; set; }
} }
} }
Mall.Model/Extend/Product/RB_Product_Category_Extend.cs
View file @ fd95ba06
...@@ -49,12 +49,19 @@ namespace Mall.Model.Extend.Product ...@@ -49,12 +49,19 @@ namespace Mall.Model.Extend.Product
/// 上2级名称 /// 上2级名称
/// </summary> /// </summary>
public string Parent2Name { get; set; } public string Parent2Name { get; set; }
/// <summary>
/// 版面类型
/// </summary>
public string CategoryPageTypeStr { get; set; }
} }
/// <summary> /// <summary>
/// 树形结构 /// 树形结构
/// </summary> /// </summary>
public class RB_Product_CategoryTree { public class RB_Product_CategoryTree
{
/// <summary> /// <summary>
/// id /// id
/// </summary> /// </summary>
...@@ -79,7 +86,8 @@ namespace Mall.Model.Extend.Product ...@@ -79,7 +86,8 @@ namespace Mall.Model.Extend.Product
/// <summary> /// <summary>
/// 分类排序 /// 分类排序
/// </summary> /// </summary>
public class RB_Product_CategorySort { public class RB_Product_CategorySort
{
/// <summary> /// <summary>
/// id /// id
/// </summary> /// </summary>
......
Mall.Model/Query/OrderStatistics_Query.cs
View file @ fd95ba06
...@@ -323,5 +323,28 @@ namespace Mall.Model.Query ...@@ -323,5 +323,28 @@ namespace Mall.Model.Query
/// </summary> /// </summary>
public decimal ServiceCharge { get; set; } public decimal ServiceCharge { get; set; }
/// <summary>
/// 保险收入
/// </summary>
public decimal InsuranceMoney { get; set; }
/// <summary>
/// 保险成本
/// </summary>
public decimal InsuranceCostMoney { get; set; }
/// <summary>
/// 出行类型
/// </summary>
public int CarType { get; set; }
/// <summary>
/// 订单类型0-正常订单，1-司导订单
/// </summary>
public int OrderClassify { get; set; }
} }
} }
Mall.Module.Product/ProductModule.cs
View file @ fd95ba06
...@@ -3172,6 +3172,7 @@ namespace Mall.Module.Product ...@@ -3172,6 +3172,7 @@ namespace Mall.Module.Product
item.IconPath = mlist.Where(x => x.Id == item.Icon).FirstOrDefault()?.Path ?? ""; item.IconPath = mlist.Where(x => x.Id == item.Icon).FirstOrDefault()?.Path ?? "";
item.BigIconPath = mlist.Where(x => x.Id == item.BigIcon).FirstOrDefault()?.Path ?? ""; item.BigIconPath = mlist.Where(x => x.Id == item.BigIcon).FirstOrDefault()?.Path ?? "";
item.AdvertisingImagePath = mlist.Where(x => x.Id == item.AdvertisingImage).FirstOrDefault()?.Path ?? ""; item.AdvertisingImagePath = mlist.Where(x => x.Id == item.AdvertisingImage).FirstOrDefault()?.Path ?? "";
item.CategoryPageTypeStr = item.CategoryPageType.GetEnumName();
} }
list = list.OrderBy(x => x.Sort).ThenBy(x => x.Id).ToList(); list = list.OrderBy(x => x.Sort).ThenBy(x => x.Id).ToList();
treeList = GetProductCategoryChildTree(list, 0); treeList = GetProductCategoryChildTree(list, 0);
...@@ -3224,7 +3225,8 @@ namespace Mall.Module.Product ...@@ -3224,7 +3225,8 @@ namespace Mall.Module.Product
{ nameof(RB_Product_Category.Name),demodel.Name}, { nameof(RB_Product_Category.Name),demodel.Name},
{ nameof(RB_Product_Category.Sort),demodel.Sort}, { nameof(RB_Product_Category.Sort),demodel.Sort},
{ nameof(RB_Product_Category.IsForeignShare),demodel.IsForeignShare}, { nameof(RB_Product_Category.IsForeignShare),demodel.IsForeignShare},
{ nameof(RB_Product_Category.UpdateDate),demodel.UpdateDate} { nameof(RB_Product_Category.UpdateDate),demodel.UpdateDate},
{ nameof(RB_Product_Category.CategoryPageType),demodel.CategoryPageType},
}; };
List<WhereHelper> wheres = new List<WhereHelper>() { List<WhereHelper> wheres = new List<WhereHelper>() {
new WhereHelper(){ new WhereHelper(){
...@@ -4719,6 +4721,8 @@ namespace Mall.Module.Product ...@@ -4719,6 +4721,8 @@ namespace Mall.Module.Product
{ nameof(RB_Goods.VideoType),demodel.VideoType }, { nameof(RB_Goods.VideoType),demodel.VideoType },
{ nameof(RB_Goods.IntegralComment),demodel.IntegralComment }, { nameof(RB_Goods.IntegralComment),demodel.IntegralComment },
{ nameof(RB_Goods.IntegralCommentType),demodel.IntegralCommentType }, { nameof(RB_Goods.IntegralCommentType),demodel.IntegralCommentType },
{ nameof(RB_Goods.Remark),demodel.Remark },
{ nameof(RB_Goods.GoodsPageType),demodel.GoodsPageType },
}; };
if (goodsModel.IsProcurement == 1) if (goodsModel.IsProcurement == 1)
{ {
......
Mall.Module.User/SmallShopsModule.cs
View file @ fd95ba06
...@@ -172,7 +172,7 @@ namespace Mall.Module.User ...@@ -172,7 +172,7 @@ namespace Mall.Module.User
/// <param name="ssmodel"></param> /// <param name="ssmodel"></param>
/// <param name="type"></param> /// <param name="type"></param>
/// <returns></returns> /// <returns></returns>
public bool SetSmallShopsAudit(RB_SmallShops_Info_Extend ssmodel, int type) public bool SetSmallShopsAudit(RB_SmallShops_Info_Extend ssmodel, int type, RB_Member_User_Extend memberModel)
{ {
Dictionary<string, object> keyValues = new Dictionary<string, object>() { Dictionary<string, object> keyValues = new Dictionary<string, object>() {
{ nameof(RB_SmallShops_Info.UpdateDate),DateTime.Now} { nameof(RB_SmallShops_Info.UpdateDate),DateTime.Now}
...@@ -206,8 +206,21 @@ namespace Mall.Module.User ...@@ -206,8 +206,21 @@ namespace Mall.Module.User
OperatorEnum=OperatorEnum.Equal OperatorEnum=OperatorEnum.Equal
} }
}; };
bool result = smallShops_InfoRepository.Update(keyValues, wheres);
return smallShops_InfoRepository.Update(keyValues, wheres); if (type == 1 && result && memberModel.SmallShopId > 0)
{
IDictionary<string, object> fileds = new Dictionary<string, object>()
{
{ nameof(RB_Member_User.Remark),memberModel.Remark},
{ nameof(RB_Member_User.SmallShopId),0}
};
IList<WhereHelper> whereHelpers = new List<WhereHelper>()
{
new WhereHelper (){ FiledName=nameof(RB_Member_User.Id),FiledValue=memberModel.Id,OperatorEnum=OperatorEnum.Equal}
};
return member_UserRepository.Update(fileds, whereHelpers);
}
return result;
} }
/// <summary> /// <summary>
...@@ -217,7 +230,7 @@ namespace Mall.Module.User ...@@ -217,7 +230,7 @@ namespace Mall.Module.User
/// <param name="commission"></param> /// <param name="commission"></param>
/// <param name="empId"></param> /// <param name="empId"></param>
/// <returns></returns> /// <returns></returns>
public bool SetSmallShopsCommission(int smallShopsId, decimal commission,int empId) public bool SetSmallShopsCommission(int smallShopsId, decimal commission, int empId)
{ {
var model = smallShops_InfoRepository.GetEntity(smallShopsId); var model = smallShops_InfoRepository.GetEntity(smallShopsId);
if (model == null) { return false; } if (model == null) { return false; }
...@@ -937,7 +950,8 @@ namespace Mall.Module.User ...@@ -937,7 +950,8 @@ namespace Mall.Module.User
{ {
ssPrice += Math.Ceiling(ssPrice * (ssmodel.UpPrice ?? 0) / 100); ssPrice += Math.Ceiling(ssPrice * (ssmodel.UpPrice ?? 0) / 100);
} }
else { else
{
ssPrice += (ssmodel.UpPrice ?? 0); ssPrice += (ssmodel.UpPrice ?? 0);
} }
} }
...@@ -973,7 +987,8 @@ namespace Mall.Module.User ...@@ -973,7 +987,8 @@ namespace Mall.Module.User
{ {
ssPrice += Math.Ceiling(ssPrice * (ssmodel.UpPrice ?? 0) / 100); ssPrice += Math.Ceiling(ssPrice * (ssmodel.UpPrice ?? 0) / 100);
} }
else { else
{
ssPrice += (ssmodel.UpPrice ?? 0); ssPrice += (ssmodel.UpPrice ?? 0);
} }
} }
......
Mall.Module.User/UserModule.cs
View file @ fd95ba06
...@@ -2459,7 +2459,8 @@ namespace Mall.Module.User ...@@ -2459,7 +2459,8 @@ namespace Mall.Module.User
var ocModel = oclist.Where(x => x.OrderDetailId == qitem.Id).FirstOrDefault(); var ocModel = oclist.Where(x => x.OrderDetailId == qitem.Id).FirstOrDefault();
if (ocModel != null) if (ocModel != null)
{ {
if (ocModel.Commission > 0) { if (ocModel.Commission > 0)
{
detailList.Add(new detailList.Add(new
{ {
CostTypeId = item.RemitCostTypeId, CostTypeId = item.RemitCostTypeId,
...@@ -2470,9 +2471,11 @@ namespace Mall.Module.User ...@@ -2470,9 +2471,11 @@ namespace Mall.Module.User
}); });
} }
} }
else { else
{
var vipModel = vipbuycList.Where(x => x.ReOrderId == qitem.OrderId).FirstOrDefault(); var vipModel = vipbuycList.Where(x => x.ReOrderId == qitem.OrderId).FirstOrDefault();
if (vipModel != null && vipModel.Commission > 0) { if (vipModel != null && vipModel.Commission > 0)
{
detailList.Add(new detailList.Add(new
{ {
CostTypeId = item.RemitCostTypeId, CostTypeId = item.RemitCostTypeId,
...@@ -4067,7 +4070,7 @@ namespace Mall.Module.User ...@@ -4067,7 +4070,7 @@ namespace Mall.Module.User
/// <param name="userInfo"></param> /// <param name="userInfo"></param>
/// <param name="IsDirect">默认查询直属下线</param> /// <param name="IsDirect">默认查询直属下线</param>
/// <returns></returns> /// <returns></returns>
public object GerUserMyTeamTitelListForFX(AppletUserInfo userInfo,int IsDirect=1) public object GerUserMyTeamTitelListForFX(AppletUserInfo userInfo, int IsDirect = 1)
{ {
string UserIds = member_UserRepository.GetMemberChildIdStr(userInfo.UserId); string UserIds = member_UserRepository.GetMemberChildIdStr(userInfo.UserId);
var query = new RB_Distributor_Info_Extend() var query = new RB_Distributor_Info_Extend()
...@@ -6437,11 +6440,25 @@ namespace Mall.Module.User ...@@ -6437,11 +6440,25 @@ namespace Mall.Module.User
public bool ApplySmallShopsInfo(RB_SmallShops_Info_Extend model) public bool ApplySmallShopsInfo(RB_SmallShops_Info_Extend model, RB_Member_User_Extend memberModel)
{ {
if (model.Id == 0) if (model.Id == 0)
{ {
return smallShopsInfoRepository.Insert(model) > 0; bool result = smallShopsInfoRepository.Insert(model) > 0;
if (memberModel.SmallShopId > 0&& result)
{
IDictionary<string, object> fileds = new Dictionary<string, object>()
{
{ nameof(RB_Member_User.Remark),memberModel.Remark},
{ nameof(RB_Member_User.SmallShopId),0}
};
IList<WhereHelper> whereHelpers = new List<WhereHelper>()
{
new WhereHelper (){ FiledName=nameof(RB_Member_User.Id),FiledValue=memberModel.Id,OperatorEnum=OperatorEnum.Equal}
};
return member_UserRepository.Update(fileds, whereHelpers);
}
return result;
} }
return false; return false;
} }
......
Mall.Repository/Product/RB_GoodsRepository.cs
View file @ fd95ba06
...@@ -85,7 +85,17 @@ namespace Mall.Repository.Product ...@@ -85,7 +85,17 @@ namespace Mall.Repository.Product
{ {
where += $@" and g.{nameof(RB_Goods_Extend.SupplierId)}={dmodel.SupplierId}"; where += $@" and g.{nameof(RB_Goods_Extend.SupplierId)}={dmodel.SupplierId}";
} }
if (dmodel.GoodsPageType.HasValue)
{
if (dmodel.GoodsPageType == Common.Enum.Goods.GoodsPageTypeEnum.Mall)
{
where += $@" and g.{nameof(RB_Goods_Extend.GoodsPageType)} in(0,1)";
}
else if (dmodel.GoodsPageType == Common.Enum.Goods.GoodsPageTypeEnum.School)
{
where += $@" and g.{nameof(RB_Goods_Extend.GoodsPageType)} in(0,2)";
}
}
string orderBy = " g.CreateDate desc"; string orderBy = " g.CreateDate desc";
if (dmodel.OrderBy == 1) if (dmodel.OrderBy == 1)
{ {
...@@ -557,7 +567,17 @@ WHERE {where} group by g.Id order by g.CreateDate desc"; ...@@ -557,7 +567,17 @@ WHERE {where} group by g.Id order by g.CreateDate desc";
{ {
where += $@" and IFNULL(g.{nameof(RB_Goods_Extend.VideoAddress)},'') <>'' "; where += $@" and IFNULL(g.{nameof(RB_Goods_Extend.VideoAddress)},'') <>'' ";
} }
if (dmodel.GoodsPageType.HasValue)
{
if (dmodel.GoodsPageType == Common.Enum.Goods.GoodsPageTypeEnum.Mall)
{
where += $@" and g.{nameof(RB_Goods_Extend.GoodsPageType)} in(0,1)";
}
else if (dmodel.GoodsPageType == Common.Enum.Goods.GoodsPageTypeEnum.School)
{
where += $@" and g.{nameof(RB_Goods_Extend.GoodsPageType)} in(0,2)";
}
}
//默认综合【升序】 //默认综合【升序】
string orderBy = $" order by g.{nameof(RB_Goods_Extend.Sort)} asc"; string orderBy = $" order by g.{nameof(RB_Goods_Extend.Sort)} asc";
//上架时间【降序】 //上架时间【降序】
......
Mall.Repository/Product/RB_Goods_OrderRepository.cs
View file @ fd95ba06
...@@ -1410,7 +1410,7 @@ GROUP BY od.GoodsId,o.OrderId ...@@ -1410,7 +1410,7 @@ GROUP BY od.GoodsId,o.OrderId
//GROUP BY b.Id order by b.Id desc"; //GROUP BY b.Id order by b.Id desc";
string sql = $@" SELECT a.OrderStatus,B.Id,b.ServiceCharge,SUM(b.PaidCostMoney) as PaidCostMoney,MAX(b.OrderId) as OrderId,MAX( a.OrderNo) as OrderNo,MAX(b.GoodsName) as GoodsName,b.Specification,MAX(b.Unit_Price) as Unit_Price,SUM(b.Number) as Number,f.`Name` as SupplierName, string sql = $@" SELECT a.OrderStatus,sum(b.InsuranceCostMoney) as InsuranceCostMoney,sum(b.InsuranceMoney) as InsuranceMoney,b.CarType,a.OrderClassify,B.Id,b.ServiceCharge,SUM(b.PaidCostMoney) as PaidCostMoney,MAX(b.OrderId) as OrderId,MAX( a.OrderNo) as OrderNo,MAX(b.GoodsName) as GoodsName,b.Specification,MAX(b.Unit_Price) as Unit_Price,SUM(b.Number) as Number,f.`Name` as SupplierName,
SUM(b.Final_Price) as Final_Price,SUM(b.FreightMoney) as FreightMoney,SUM(b.Final_Price+b.FreightMoney) as AllPrice , SUM(b.Final_Price) as Final_Price,SUM(b.FreightMoney) as FreightMoney,SUM(b.Final_Price+b.FreightMoney) as AllPrice ,
SUM(IFNULL(b.CostMoney,0)*b.Number) as CostMoney,0 as PackingMoney, 0 as CostFreight,sum(b.FreightCostMoney) as GoodsFreight, SUM(IFNULL(b.CostMoney,0)*b.Number) as CostMoney,0 as PackingMoney, 0 as CostFreight,sum(b.FreightCostMoney) as GoodsFreight,
0 as OtherPrice,b.LiveCommission,b.LiveFinanceIds,b.LivePeopleNum,0 as Paid,oa.RefundActual,b.CouponMoney,b.CompanyProfitRate,b.CompanyId,muser.`Name` as CompanyName,b.YSMoney,b.RealMoney,b.YFMoney,b.PayMoney 0 as OtherPrice,b.LiveCommission,b.LiveFinanceIds,b.LivePeopleNum,0 as Paid,oa.RefundActual,b.CouponMoney,b.CompanyProfitRate,b.CompanyId,muser.`Name` as CompanyName,b.YSMoney,b.RealMoney,b.YFMoney,b.PayMoney
......
Mall.Repository/Product/RB_Product_CategoryRepository.cs
View file @ fd95ba06
...@@ -103,7 +103,17 @@ namespace Mall.Repository.Product ...@@ -103,7 +103,17 @@ namespace Mall.Repository.Product
{ {
where += $@" and {nameof(RB_Product_Category_Extend.IsShow)}={dmodel.IsShow}"; where += $@" and {nameof(RB_Product_Category_Extend.IsShow)}={dmodel.IsShow}";
} }
if (dmodel.CategoryPageType.HasValue)
{
if (dmodel.CategoryPageType==Common.Enum.Goods.GoodsPageTypeEnum.Mall)
{
where += $@" and {nameof(RB_Product_Category_Extend.CategoryPageType)} in(0,1)";
}
else if (dmodel.CategoryPageType == Common.Enum.Goods.GoodsPageTypeEnum.School)
{
where += $@" and {nameof(RB_Product_Category_Extend.CategoryPageType)} in(0,2)";
}
}
string sql = $@"select * from RB_Product_Category where {where} order by Id asc"; string sql = $@"select * from RB_Product_Category where {where} order by Id asc";
return Get<RB_Product_Category_Extend>(sql).ToList(); return Get<RB_Product_Category_Extend>(sql).ToList();
} }
......
Mall.WebApi/Controllers/AppletWeChat/LiveHouseController.cs
View file @ fd95ba06
...@@ -159,8 +159,8 @@ namespace Mall.WebApi.Controllers.AppletWeChat ...@@ -159,8 +159,8 @@ namespace Mall.WebApi.Controllers.AppletWeChat
item.RemitFXCommission = 0; item.RemitFXCommission = 0;
item.RefundActual = item.RefundActual > 0 ? item.RefundActual : item.AllPrice; item.RefundActual = item.RefundActual > 0 ? item.RefundActual : item.AllPrice;
} }
item.ALLCommission = item.CostMoney + item.GoodsFreight + item.FXCommission + item.LiveCommission + item.RefundActual + item.YFMoney; item.ALLCommission = item.CostMoney + item.GoodsFreight + item.FXCommission + item.LiveCommission + item.RefundActual + item.YFMoney;
// item.ALLCommission = item.CostMoney + item.GoodsFreight + item.FXCommission + item.LiveCommission + item.CouponMoney + item.RefundActual + item.YFMoney; //item.ALLCommission =item.CostMoney + item.GoodsFreight + item.InsuranceCostMoney + item.FXCommission + item.LiveCommission + item.RefundActual + item.YFMoney;
item.NoPaid = item.ALLCommission; item.NoPaid = item.ALLCommission;
item.RemitFXCommission = item.RemitFXCommission + (!string.IsNullOrWhiteSpace(item.LiveFinanceIds) ? item.LiveCommission : 0); item.RemitFXCommission = item.RemitFXCommission + (!string.IsNullOrWhiteSpace(item.LiveFinanceIds) ? item.LiveCommission : 0);
item.Paid = item.RefundActual + item.RemitFXCommission + item.CostMoney + item.GoodsFreight + item.PayMoney; item.Paid = item.RefundActual + item.RemitFXCommission + item.CostMoney + item.GoodsFreight + item.PayMoney;
......
Mall.WebApi/Controllers/Product/ProductController.cs
View file @ fd95ba06
...@@ -93,8 +93,8 @@ namespace Mall.WebApi.Controllers.MallBase ...@@ -93,8 +93,8 @@ namespace Mall.WebApi.Controllers.MallBase
{ {
demodel.Path = Config.GetFilePath(demodel.Path); demodel.Path = Config.GetFilePath(demodel.Path);
demodel.Image = Config.GetFilePath(demodel.Image); demodel.Image = Config.GetFilePath(demodel.Image);
} }
demodel.TenantId = Convert.ToInt32(parms.uid); demodel.TenantId = Convert.ToInt32(parms.uid);
demodel.MallBaseId = parms.MallBaseId; demodel.MallBaseId = parms.MallBaseId;
demodel.CreateDate = DateTime.Now; demodel.CreateDate = DateTime.Now;
...@@ -399,6 +399,7 @@ namespace Mall.WebApi.Controllers.MallBase ...@@ -399,6 +399,7 @@ namespace Mall.WebApi.Controllers.MallBase
x.IsShow, x.IsShow,
x.TenantId, x.TenantId,
x.MallBaseId, x.MallBaseId,
CategoryPageTypeStr= x.CategoryPageType.GetEnumName(),
CreateDate = x.CreateDate.HasValue ? x.CreateDate.Value.ToString("yyyy-MM-dd") : "" CreateDate = x.CreateDate.HasValue ? x.CreateDate.Value.ToString("yyyy-MM-dd") : ""
}); });
return ApiResult.Success("", pagelist); return ApiResult.Success("", pagelist);
...@@ -458,6 +459,7 @@ namespace Mall.WebApi.Controllers.MallBase ...@@ -458,6 +459,7 @@ namespace Mall.WebApi.Controllers.MallBase
model.TenantId, model.TenantId,
model.MallBaseId, model.MallBaseId,
model.IsForeignShare, model.IsForeignShare,
model.CategoryPageType,
CreateDate = model.CreateDate.HasValue ? model.CreateDate.Value.ToString("yyyy-MM-dd") : "" CreateDate = model.CreateDate.HasValue ? model.CreateDate.Value.ToString("yyyy-MM-dd") : ""
}); });
} }
...@@ -668,7 +670,8 @@ namespace Mall.WebApi.Controllers.MallBase ...@@ -668,7 +670,8 @@ namespace Mall.WebApi.Controllers.MallBase
/// </summary> /// </summary>
/// <returns></returns> /// <returns></returns>
[HttpPost] [HttpPost]
public ApiResult SetProductCategoryShow() { public ApiResult SetProductCategoryShow()
{
var req = RequestParm; var req = RequestParm;
JObject parms = JObject.Parse(req.msg.ToString()); JObject parms = JObject.Parse(req.msg.ToString());
int IsShow = parms.GetInt("IsShow", 2);//2 显示 1隐藏 int IsShow = parms.GetInt("IsShow", 2);//2 显示 1隐藏
...@@ -678,7 +681,8 @@ namespace Mall.WebApi.Controllers.MallBase ...@@ -678,7 +681,8 @@ namespace Mall.WebApi.Controllers.MallBase
{ {
return ApiResult.Success(); return ApiResult.Success();
} }
else { else
{
return ApiResult.Failed(); return ApiResult.Failed();
} }
} }
...@@ -1155,14 +1159,14 @@ namespace Mall.WebApi.Controllers.MallBase ...@@ -1155,14 +1159,14 @@ namespace Mall.WebApi.Controllers.MallBase
JObject parameters = JObject.Parse(RequestParm.msg.ToString()); JObject parameters = JObject.Parse(RequestParm.msg.ToString());
RB_Goods_Extend demodel = new RB_Goods_Extend() RB_Goods_Extend demodel = new RB_Goods_Extend()
{ {
Name=parameters.GetStringValue("Name"), Name = parameters.GetStringValue("Name"),
GoodsStatus=parameters.GetInt("GoodsStatus"), GoodsStatus = parameters.GetInt("GoodsStatus"),
IsSelectSellOut=parameters.GetInt("IsSelectSellOut"), IsSelectSellOut = parameters.GetInt("IsSelectSellOut"),
CategoryIds=parameters.GetStringValue("CategoryIds"), CategoryIds = parameters.GetStringValue("CategoryIds"),
Id=parameters.GetInt("Id"), Id = parameters.GetInt("Id"),
StartTime=parameters.GetStringValue("StartTime"), StartTime = parameters.GetStringValue("StartTime"),
EndTime=parameters.GetStringValue("EndTime"), EndTime = parameters.GetStringValue("EndTime"),
OrderBy=parameters.GetInt("OrderBy") OrderBy = parameters.GetInt("OrderBy")
}; };
demodel.TenantId = parms.TenantId; demodel.TenantId = parms.TenantId;
...@@ -1188,7 +1192,9 @@ namespace Mall.WebApi.Controllers.MallBase ...@@ -1188,7 +1192,9 @@ namespace Mall.WebApi.Controllers.MallBase
x.TenantId, x.TenantId,
x.MallBaseId, x.MallBaseId,
x.SendArea, x.SendArea,
CarouselImageList= x.CarouselImageList.Select(qitem=>qitem.Path).ToList(), x.Remark,
GoodsPageTypeStr = x.GoodsPageType.GetEnumName(),
CarouselImageList = x.CarouselImageList.Select(qitem => qitem.Path).ToList(),
CreateDate = x.CreateDate.HasValue ? x.CreateDate.Value.ToString("yyyy-MM-dd HH:mm:ss") : "" CreateDate = x.CreateDate.HasValue ? x.CreateDate.Value.ToString("yyyy-MM-dd HH:mm:ss") : ""
}); });
return ApiResult.Success("", pagelist); return ApiResult.Success("", pagelist);
...@@ -1549,6 +1555,8 @@ namespace Mall.WebApi.Controllers.MallBase ...@@ -1549,6 +1555,8 @@ namespace Mall.WebApi.Controllers.MallBase
model?.Commission, model?.Commission,
model?.IsLiveGoods, model?.IsLiveGoods,
model?.SendArea, model?.SendArea,
model?.Remark,
model?.GoodsPageType,
CategoryList = model?.CategoryList.Select(x => new CategoryList = model?.CategoryList.Select(x => new
{ {
x.Id, x.Id,
...@@ -1783,7 +1791,7 @@ namespace Mall.WebApi.Controllers.MallBase ...@@ -1783,7 +1791,7 @@ namespace Mall.WebApi.Controllers.MallBase
demodel.SellingPrice = SellingPrice; demodel.SellingPrice = SellingPrice;
} }
} }
//分销佣金 //分销佣金
if (demodel.SeparateDistribution == 1) if (demodel.SeparateDistribution == 1)
{ {
...@@ -2109,6 +2117,7 @@ namespace Mall.WebApi.Controllers.MallBase ...@@ -2109,6 +2117,7 @@ namespace Mall.WebApi.Controllers.MallBase
demodel.SubName ??= "";//副标题 demodel.SubName ??= "";//副标题
demodel.IsLiveGoods ??= 2;//是否直播商品 1是 2否 demodel.IsLiveGoods ??= 2;//是否直播商品 1是 2否
demodel.SendArea ??= "";//发货地 demodel.SendArea ??= "";//发货地
demodel.Remark ??= "";//发货地
demodel.GoodsClassify = 0; demodel.GoodsClassify = 0;
demodel.IntegralComment ??= 0;//评论反积分 demodel.IntegralComment ??= 0;//评论反积分
demodel.IntegralCommentType ??= 1; demodel.IntegralCommentType ??= 1;
...@@ -2256,6 +2265,22 @@ namespace Mall.WebApi.Controllers.MallBase ...@@ -2256,6 +2265,22 @@ namespace Mall.WebApi.Controllers.MallBase
} }
} }
/// <summary>
/// 获取商品版面类型枚举
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult GoodsPageTypeEnumList()
{
var list = EnumHelper.GetEnumList(typeof(Common.Enum.Goods.GoodsPageTypeEnum));
return ApiResult.Success("", list.OrderBy(x => Convert.ToInt32(x.Value)).Select(x => new
{
Name = x.Key,
Id = Convert.ToInt32(x.Value)
}));
}
#endregion #endregion
#region 商品代理 #region 商品代理
......
Mall.WebApi/Controllers/User/AppletLoginController.cs
View file @ fd95ba06
...@@ -106,6 +106,14 @@ namespace Mall.WebApi.Controllers.User ...@@ -106,6 +106,14 @@ namespace Mall.WebApi.Controllers.User
demodel.ContactWay ??= ""; demodel.ContactWay ??= "";
demodel.Remark ??= ""; demodel.Remark ??= "";
demodel.TotalConsumption ??= 0; demodel.TotalConsumption ??= 0;
if (!demodel.UserPageType.HasValue)
{
demodel.UserPageType ??= Common.Enum.Goods.GoodsPageTypeEnum.Mall;
}
else if(demodel.UserPageType == Common.Enum.Goods.GoodsPageTypeEnum.All)
{
demodel.UserPageType ??= Common.Enum.Goods.GoodsPageTypeEnum.Mall;
}
#endregion #endregion
var basicsModel = userModule.GetDistributorBasicsInfo(requestParm.TenantId.ToString(), requestParm.MallBaseId); var basicsModel = userModule.GetDistributorBasicsInfo(requestParm.TenantId.ToString(), requestParm.MallBaseId);
if ((basicsModel?.ReferralsCondition ?? DistrbutorReferralsEnum.SCDJ) == DistrbutorReferralsEnum.SCDJ || (basicsModel?.ReferralsCondition ?? DistrbutorReferralsEnum.SCDJ) == DistrbutorReferralsEnum.SC7SF) if ((basicsModel?.ReferralsCondition ?? DistrbutorReferralsEnum.SCDJ) == DistrbutorReferralsEnum.SCDJ || (basicsModel?.ReferralsCondition ?? DistrbutorReferralsEnum.SCDJ) == DistrbutorReferralsEnum.SC7SF)
...@@ -187,7 +195,9 @@ namespace Mall.WebApi.Controllers.User ...@@ -187,7 +195,9 @@ namespace Mall.WebApi.Controllers.User
SuperiorId = demodel.SuperiorId ?? 0, SuperiorId = demodel.SuperiorId ?? 0,
Token = token, Token = token,
SmallShopId = 0, SmallShopId = 0,
UserSmallShopId= demodel.SmallShopId UserSmallShopId = demodel.SmallShopId,
IsOpenSchool = mmodel.IsOpenSchool,
UserPageType = mmodel.IsOpenSchool==1? demodel.UserPageType:Common.Enum.Goods.GoodsPageTypeEnum.All
}; };
UserReidsCache.AppletUserInfoSet(UserModuleCacheKeyConfig.Applet_Login_Info + UserId, appletUserInfo, Config.JwtExpirTime); UserReidsCache.AppletUserInfoSet(UserModuleCacheKeyConfig.Applet_Login_Info + UserId, appletUserInfo, Config.JwtExpirTime);
if (couponResult != null && couponResult.ID > 0) if (couponResult != null && couponResult.ID > 0)
...@@ -255,7 +265,9 @@ namespace Mall.WebApi.Controllers.User ...@@ -255,7 +265,9 @@ namespace Mall.WebApi.Controllers.User
SuperiorId = umodel.SuperiorId ?? 0, SuperiorId = umodel.SuperiorId ?? 0,
Token = token, Token = token,
SmallShopId =(smallShopsInfoModle != null && smallShopsInfoModle.AuditStatus == DistributorAuditStatusEnum.Audited) ? smallShopsInfoModle.Id : 0, SmallShopId =(smallShopsInfoModle != null && smallShopsInfoModle.AuditStatus == DistributorAuditStatusEnum.Audited) ? smallShopsInfoModle.Id : 0,
UserSmallShopId = umodel.SmallShopId UserSmallShopId = umodel.SmallShopId,
IsOpenSchool = mmodel.IsOpenSchool,
UserPageType = mmodel.IsOpenSchool == 1 ? demodel.UserPageType : Common.Enum.Goods.GoodsPageTypeEnum.All
}; };
UserReidsCache.AppletUserInfoSet(UserModuleCacheKeyConfig.Applet_Login_Info + umodel.Id, appletUserInfo, Config.JwtExpirTime); UserReidsCache.AppletUserInfoSet(UserModuleCacheKeyConfig.Applet_Login_Info + umodel.Id, appletUserInfo, Config.JwtExpirTime);
return ApiResult.CouponSuccess(ResultCode.Fail, 1,"", "", appletUserInfo); return ApiResult.CouponSuccess(ResultCode.Fail, 1,"", "", appletUserInfo);
......
Mall.WebApi/Controllers/User/AppletUserController.cs
View file @ fd95ba06
...@@ -245,7 +245,7 @@ namespace Mall.WebApi.Controllers.User ...@@ -245,7 +245,7 @@ namespace Mall.WebApi.Controllers.User
return ApiResult.Failed(); return ApiResult.Failed();
} }
} }
/// <summary> /// <summary>
/// 设置地址默认 /// 设置地址默认
...@@ -732,7 +732,7 @@ namespace Mall.WebApi.Controllers.User ...@@ -732,7 +732,7 @@ namespace Mall.WebApi.Controllers.User
var req = RequestParm; var req = RequestParm;
JObject parms = JObject.Parse(req.msg.ToString()); 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); var obj = userModule.GerUserMyTeamTitelListForFX(userInfo, IsDirect: IsDirect);
return ApiResult.Success("", obj); return ApiResult.Success("", obj);
} }
...@@ -758,10 +758,10 @@ namespace Mall.WebApi.Controllers.User ...@@ -758,10 +758,10 @@ namespace Mall.WebApi.Controllers.User
if (parms.GetInt("NewUserId") > 0) if (parms.GetInt("NewUserId") > 0)
{ {
demodel.UserId = parms.GetInt("NewUserId"); 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.count = Convert.ToInt32(count);
pageModel.pageData = list; pageModel.pageData = list;
...@@ -1109,7 +1109,7 @@ namespace Mall.WebApi.Controllers.User ...@@ -1109,7 +1109,7 @@ namespace Mall.WebApi.Controllers.User
} }
if (allMemberInfo.SmallShopId == 0) if (allMemberInfo.SmallShopId == 0)
{ {
if (oldLogisticsModel.SmallShopId > 0 ) if (oldLogisticsModel.SmallShopId > 0)
{ {
return ApiResult.Failed("您不属于当前店铺"); return ApiResult.Failed("您不属于当前店铺");
} }
...@@ -1271,11 +1271,11 @@ namespace Mall.WebApi.Controllers.User ...@@ -1271,11 +1271,11 @@ namespace Mall.WebApi.Controllers.User
} }
if (resultModel != null && resultModel.ID > 0) if (resultModel != null && resultModel.ID > 0)
{ {
return ApiResult.CouponSuccess(ResultCode.Success,1, "",resultModel.Name); return ApiResult.CouponSuccess(ResultCode.Success, 1, "", resultModel.Name);
} }
else else
{ {
return ApiResult.CouponFailed(ResultCode.Fail,1, "",""); return ApiResult.CouponFailed(ResultCode.Fail, 1, "", "");
} }
//RB_DiscountCoupon_Extend resultModel = couponModule.AutoCoupon(query); //RB_DiscountCoupon_Extend resultModel = couponModule.AutoCoupon(query);
...@@ -1813,7 +1813,7 @@ namespace Mall.WebApi.Controllers.User ...@@ -1813,7 +1813,7 @@ namespace Mall.WebApi.Controllers.User
demodel.UserId = userInfo.UserId; demodel.UserId = userInfo.UserId;
List<RB_Member_User_Extend> memberList = new List<RB_Member_User_Extend>(); List<RB_Member_User_Extend> memberList = new List<RB_Member_User_Extend>();
var list = userModule.GetOrderIntroductionPageList(pagelist.pageIndex, pagelist.pageSize, out long count, demodel); var list = userModule.GetOrderIntroductionPageList(pagelist.pageIndex, pagelist.pageSize, out long count, demodel);
pagelist.count = Convert.ToInt32(count); pagelist.count = Convert.ToInt32(count);
pagelist.pageData = list.Select(x => new pagelist.pageData = list.Select(x => new
{ {
...@@ -1832,7 +1832,7 @@ namespace Mall.WebApi.Controllers.User ...@@ -1832,7 +1832,7 @@ namespace Mall.WebApi.Controllers.User
y.Number y.Number
}), }),
x.UserId, x.UserId,
x.UserName, x.UserName,
x.Photo, x.Photo,
x.Mobile, x.Mobile,
...@@ -1947,10 +1947,10 @@ namespace Mall.WebApi.Controllers.User ...@@ -1947,10 +1947,10 @@ namespace Mall.WebApi.Controllers.User
return ApiResult.Failed("用户信息不存在"); return ApiResult.Failed("用户信息不存在");
} }
if (memberModel.SmallShopId > 0) //if (memberModel.SmallShopId > 0)
{ //{
return ApiResult.Failed("当前不满足申请资格，请联系客服"); // return ApiResult.Failed("当前不满足申请资格，请联系客服");
} //}
//判断是否满足当前申请条件 //判断是否满足当前申请条件
var microShopBasics = MallBaseModule.GetMicroShopBasicsList(new Model.Entity.BaseSetUp.RB_MicroShop_Basics { TenantId = userInfo.TenantId, MallBaseId = userInfo.MallBaseId }).FirstOrDefault(); var microShopBasics = MallBaseModule.GetMicroShopBasicsList(new Model.Entity.BaseSetUp.RB_MicroShop_Basics { TenantId = userInfo.TenantId, MallBaseId = userInfo.MallBaseId }).FirstOrDefault();
...@@ -2027,7 +2027,11 @@ namespace Mall.WebApi.Controllers.User ...@@ -2027,7 +2027,11 @@ namespace Mall.WebApi.Controllers.User
demodel.PriceType = 0; demodel.PriceType = 0;
demodel.Status = 0; demodel.Status = 0;
demodel.AuditStatus = microShopBasics.IsExamine == 1 ? DistributorAuditStatusEnum.Audited : DistributorAuditStatusEnum.Auditing; demodel.AuditStatus = microShopBasics.IsExamine == 1 ? DistributorAuditStatusEnum.Audited : DistributorAuditStatusEnum.Auditing;
bool flag = userModule.ApplySmallShopsInfo(demodel); if (microShopBasics.IsExamine == 1 && memberModel.SmallShopId > 0)
{
memberModel.Remark += "原店铺ID:" + memberModel.SmallShopId;
}
bool flag = userModule.ApplySmallShopsInfo(demodel, memberModel);
if (flag) if (flag)
{ {
return ApiResult.Success(); return ApiResult.Success();
......
Mall.WebApi/Controllers/User/SmallShopsController.cs
View file @ fd95ba06
...@@ -109,15 +109,15 @@ namespace Mall.WebApi.Controllers.User ...@@ -109,15 +109,15 @@ namespace Mall.WebApi.Controllers.User
public ApiResult GetAllSmallShopsList() public ApiResult GetAllSmallShopsList()
{ {
var parms = RequestParm; var parms = RequestParm;
RB_SmallShops_Info_Extend demodel = JsonConvert.DeserializeObject<RB_SmallShops_Info_Extend>(parms.msg.ToString()); RB_SmallShops_Info_Extend demodel = JsonConvert.DeserializeObject<RB_SmallShops_Info_Extend>(parms.msg.ToString());
demodel.TenantId = Convert.ToInt32(parms.uid); demodel.TenantId = Convert.ToInt32(parms.uid);
demodel.MallBaseId = parms.MallBaseId; demodel.MallBaseId = parms.MallBaseId;
demodel.AuditStatus = DistributorAuditStatusEnum.Audited; demodel.AuditStatus = DistributorAuditStatusEnum.Audited;
var list = smallShopsModule.GetSmallShopsInfoList_V2(demodel); var list = smallShopsModule.GetSmallShopsInfoList_V2(demodel);
var result = list.Select(x => new var result = list.Select(x => new
{ {
x.Id, x.Id,
x.Name x.Name
...@@ -125,7 +125,7 @@ namespace Mall.WebApi.Controllers.User ...@@ -125,7 +125,7 @@ namespace Mall.WebApi.Controllers.User
return ApiResult.Success("", result); return ApiResult.Success("", result);
} }
/// <summary> /// <summary>
...@@ -209,7 +209,13 @@ namespace Mall.WebApi.Controllers.User ...@@ -209,7 +209,13 @@ namespace Mall.WebApi.Controllers.User
} }
ssmodel.Remark = Remark; ssmodel.Remark = Remark;
bool flag = smallShopsModule.SetSmallShopsAudit(ssmodel, Type);
var memberUserModel = userModule.GetMemberUserInfo(ssmodel.UserId ?? 0);
if (memberUserModel.SmallShopId > 0)
{
memberUserModel.Remark += "原店铺ID:" + memberUserModel.SmallShopId;
}
bool flag = smallShopsModule.SetSmallShopsAudit(ssmodel, Type, memberUserModel);
if (flag) if (flag)
{ {
return ApiResult.Success(); return ApiResult.Success();
...@@ -263,7 +269,8 @@ namespace Mall.WebApi.Controllers.User ...@@ -263,7 +269,8 @@ namespace Mall.WebApi.Controllers.User
var parms = JObject.Parse(re.msg.ToString()); var parms = JObject.Parse(re.msg.ToString());
int RemitId = parms.GetInt("RemitId", 0); int RemitId = parms.GetInt("RemitId", 0);
int ErpEmpId = parms.GetInt("ErpEmpId", 0);//erp用户id int ErpEmpId = parms.GetInt("ErpEmpId", 0);//erp用户id
if (ErpEmpId <= 0) { if (ErpEmpId <= 0)
{
ErpEmpId = re.ERPEmpId; ErpEmpId = re.ERPEmpId;
} }
int Type = parms.GetInt("Type", 0);//1审核通过 2打款 3驳回 int Type = parms.GetInt("Type", 0);//1审核通过 2打款 3驳回
...@@ -334,7 +341,8 @@ namespace Mall.WebApi.Controllers.User ...@@ -334,7 +341,8 @@ namespace Mall.WebApi.Controllers.User
return ApiResult.Success(); return ApiResult.Success();
} }
} }
else if (model.WithdrawalWay == DistrbutorWithdrawWayEnum.YETX) { else if (model.WithdrawalWay == DistrbutorWithdrawWayEnum.YETX)
{
//余额提现 //余额提现
} }
else else
...@@ -495,7 +503,7 @@ namespace Mall.WebApi.Controllers.User ...@@ -495,7 +503,7 @@ namespace Mall.WebApi.Controllers.User
if (demodel.Id == 0) if (demodel.Id == 0)
{ {
demodel.CreateDate = DateTime.Now; demodel.CreateDate = DateTime.Now;
} }
demodel.TenantId = requestParm.TenantId; demodel.TenantId = requestParm.TenantId;
demodel.MallBaseId = requestParm.MallBaseId; demodel.MallBaseId = requestParm.MallBaseId;
......
Mall.WebApi/Controllers/User/UserController.cs
View file @ fd95ba06
...@@ -89,9 +89,10 @@ namespace Mall.WebApi.Controllers.User ...@@ -89,9 +89,10 @@ namespace Mall.WebApi.Controllers.User
SourceName = x.Source.GetEnumName(), SourceName = x.Source.GetEnumName(),
x.TenantId, x.TenantId,
x.PostId, x.PostId,
PostName=(x?.PostId??0)==1?"领队导游":"", PostName = (x?.PostId ?? 0) == 1 ? "领队导游" : "",
UserPageTypeStr = x.UserPageType.GetEnumName(),
CreateDate = x.CreateDate.HasValue ? x.CreateDate.Value.ToString("yyyy-MM-dd HH:mm:ss") : "" CreateDate = x.CreateDate.HasValue ? x.CreateDate.Value.ToString("yyyy-MM-dd HH:mm:ss") : ""
}); }); ;
return ApiResult.Success("", pagelist); return ApiResult.Success("", pagelist);
} }
...@@ -2147,8 +2148,8 @@ namespace Mall.WebApi.Controllers.User ...@@ -2147,8 +2148,8 @@ namespace Mall.WebApi.Controllers.User
}); });
return ApiResult.Success("", result); return ApiResult.Success("", result);
} }
/// <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