Commit e9b95178 authored by 吴春's avatar 吴春
parents 423a1861 6d5079ac
...@@ -18,9 +18,14 @@ namespace Mall.Common.Enum.Goods ...@@ -18,9 +18,14 @@ namespace Mall.Common.Enum.Goods
[EnumField("在线支付")] [EnumField("在线支付")]
OnlinePayment = 1, OnlinePayment = 1,
/// <summary> /// <summary>
/// 线下支付 /// 货到付款
/// </summary> /// </summary>
[EnumField("线下支付")] [EnumField("货到付款")]
OfflinePayment = 2 OfflinePayment = 2,
/// <summary>
/// 余额支付
/// </summary>
[EnumField("余额支付")]
YEPayment = 3
} }
} }
...@@ -175,8 +175,18 @@ namespace Mall.Model.Entity.Product ...@@ -175,8 +175,18 @@ namespace Mall.Model.Entity.Product
/// 运费 /// 运费
/// </summary> /// </summary>
public decimal? FreightMoney { get; set; } public decimal? FreightMoney { get; set; }
/// <summary>
/// 使用积分数量
/// </summary>
public int? IntegralNumber { get; set; }
/// <summary>
/// 积分抵扣金额
/// </summary>
public decimal? IntegralMoney { get; set; }
/// <summary>
/// 优惠券使用金额
/// </summary>
public decimal? CouponMoney { get; set; }
} }
} }
...@@ -744,7 +744,7 @@ namespace Mall.Model.Extend.MarketingCenter ...@@ -744,7 +744,7 @@ namespace Mall.Model.Extend.MarketingCenter
public int catStyle { get; set; } public int catStyle { get; set; }
/// <summary> /// <summary>
/// 商品添加方式 /// 商品添加方式【0-自动添加,1-手动添加】
/// </summary> /// </summary>
public int addGoodsType { get; set; } public int addGoodsType { get; set; }
...@@ -754,7 +754,7 @@ namespace Mall.Model.Extend.MarketingCenter ...@@ -754,7 +754,7 @@ namespace Mall.Model.Extend.MarketingCenter
public int goodsLength { get; set; } public int goodsLength { get; set; }
/// <summary> /// <summary>
/// 列表样式 /// 列表样式[-1-列表模式,0-左右滑动,1-一行一个,2-一行两个3-一行三个]
/// </summary> /// </summary>
public int listStyle { get; set; } public int listStyle { get; set; }
...@@ -850,7 +850,7 @@ namespace Mall.Model.Extend.MarketingCenter ...@@ -850,7 +850,7 @@ namespace Mall.Model.Extend.MarketingCenter
/// <summary> /// <summary>
/// /// 图片位置
/// </summary> /// </summary>
public int mode { get; set; } public int mode { get; set; }
......
...@@ -65,6 +65,8 @@ namespace Mall.Model.Extend.Product ...@@ -65,6 +65,8 @@ namespace Mall.Model.Extend.Product
/// 封面图 /// 封面图
/// </summary> /// </summary>
public string CoverImage { get; set; } public string CoverImage { get; set; }
/// <summary> /// <summary>
/// 自定义分享图片 /// 自定义分享图片
/// </summary> /// </summary>
......
...@@ -95,5 +95,40 @@ namespace Mall.Model.Extend.Product ...@@ -95,5 +95,40 @@ namespace Mall.Model.Extend.Product
/// 区域地址 /// 区域地址
/// </summary> /// </summary>
public string DistrictAddress { get; set; } public string DistrictAddress { get; set; }
/// <summary>
/// 收货地址id
/// </summary>
public int? AddressId { get; set; }
/// <summary>
/// 使用积分
/// </summary>
public int? Use_Integral { get; set; }
/// <summary>
/// 使用优惠卷id
/// </summary>
public int? User_Coupon_Id { get; set; }
}
/// <summary>
/// 订单优惠金额
/// </summary>
public class RB_Goods_CouponModel {
/// <summary>
/// 商品id
/// </summary>
public int GoodsId { get; set; }
/// <summary>
/// key
/// </summary>
public string Key { get; set; }
/// <summary>
/// 商品总价格(包含减积分)
/// </summary>
public decimal TotalMoney { get; set; }
/// <summary>
/// 优惠券金额
/// </summary>
public decimal CouponMoney { get; set; }
} }
} }
...@@ -17,5 +17,19 @@ namespace Mall.Model.Extend.User ...@@ -17,5 +17,19 @@ namespace Mall.Model.Extend.User
/// 区域地址 /// 区域地址
/// </summary> /// </summary>
public string DistrictAddress { get; set; } public string DistrictAddress { get; set; }
/// <summary>
/// 省名称
/// </summary>
public string PName { get; set; }
/// <summary>
/// 市名称
/// </summary>
public string CName { get; set; }
/// <summary>
/// 区名称
/// </summary>
public string DName { get; set; }
} }
} }
This diff is collapsed.
This diff is collapsed.
...@@ -525,14 +525,10 @@ namespace Mall.Module.User ...@@ -525,14 +525,10 @@ namespace Mall.Module.User
/// </summary> /// </summary>
/// <param name="TagId"></param> /// <param name="TagId"></param>
/// <returns></returns> /// <returns></returns>
public bool RemoveMiniProgramMallTagModule(object TagId) public bool RemoveMiniProgramMallTagModule(string TagId)
{ {
var flag = false; var flag = false;
Dictionary<string, object> fileds = new Dictionary<string, object>() flag = bottomnavRepository.DeleteBottomnavRepository(TagId);
{
{ nameof(RB_Miniprogram_Bottomnav_Extend.Status),1},
};
flag = bottomnavRepository.Update(fileds, new WhereHelper(nameof(RB_Miniprogram_Bottomnav_Extend.TagId), TagId));
return flag; return flag;
} }
......
...@@ -3,6 +3,7 @@ using System.Collections.Generic; ...@@ -3,6 +3,7 @@ using System.Collections.Generic;
using System.Text; using System.Text;
using Mall.Model.Extend.User; using Mall.Model.Extend.User;
using Mall.Repository; using Mall.Repository;
using Mall.Repository.MarketingCenter;
using Mall.Repository.User; using Mall.Repository.User;
namespace Mall.Module.User namespace Mall.Module.User
...@@ -22,6 +23,12 @@ namespace Mall.Module.User ...@@ -22,6 +23,12 @@ namespace Mall.Module.User
/// </summary> /// </summary>
private readonly RB_Miniprogram_PageManageRepository miniprogram_PageManageRepository = new RB_Miniprogram_PageManageRepository(); private readonly RB_Miniprogram_PageManageRepository miniprogram_PageManageRepository = new RB_Miniprogram_PageManageRepository();
/// <summary>
/// 自定义页面仓储层
/// </summary>
private readonly RB_Miniprogram_Page_TemplRepository miniprogram_Page_TemplRepository = new RB_Miniprogram_Page_TemplRepository();
/// <summary> /// <summary>
/// 根据查询条件获取小程序列表(单个) /// 根据查询条件获取小程序列表(单个)
/// </summary> /// </summary>
...@@ -180,7 +187,33 @@ namespace Mall.Module.User ...@@ -180,7 +187,33 @@ namespace Mall.Module.User
/// <returns></returns> /// <returns></returns>
public List<RB_Miniprogram_PageManage_Extend> GetMiniprogram_Page_ListExtModule(RB_MiniProgram_Page_Extend query) public List<RB_Miniprogram_PageManage_Extend> GetMiniprogram_Page_ListExtModule(RB_MiniProgram_Page_Extend query)
{ {
return miniprogram_PageManageRepository.GetListExtRepository(query); var list= miniprogram_PageManageRepository.GetListExtRepository(query);
if (list == null)
{
list = new List<RB_Miniprogram_PageManage_Extend>();
}
//DIY页面
var selfPageList = miniprogram_Page_TemplRepository.GetMiniprogramPageTemplListRepository(new Model.Entity.MarketingCenter.RB_Miniprogram_Page_Templ_Extend()
{
MallBaseId=query.MallBaseId,
});
if (selfPageList != null&& selfPageList.Count>0)
{
foreach (var item in selfPageList)
{
list.Add(new RB_Miniprogram_PageManage_Extend()
{
PageId = item.Id,
PageName = item.PageName,
PageUrl = "/pages/index/index?page_id=" + item.Id,
PageType = Common.Enum.MallBase.PageTypeEnum.DiyPage,
IsParameter = 0,
SelfPageName = item.PageName,
ParameterValue = "",
});
}
}
return list;
} }
/// <summary> /// <summary>
...@@ -223,8 +256,8 @@ namespace Mall.Module.User ...@@ -223,8 +256,8 @@ namespace Mall.Module.User
Dictionary<string, object> fileds = new Dictionary<string, object>() Dictionary<string, object> fileds = new Dictionary<string, object>()
{ {
{ nameof(RB_Miniprogram_PageManage_Extend.PageType),extModel.PageType}, { nameof(RB_Miniprogram_PageManage_Extend.PageType),extModel.PageType},
{ nameof(RB_Miniprogram_PageManage_Extend.PageName),extModel.PageName}, { nameof(RB_Miniprogram_PageManage_Extend.PageName),extModel.PageName.Trim()},
{ nameof(RB_Miniprogram_PageManage_Extend.PageUrl),extModel.PageUrl}, { nameof(RB_Miniprogram_PageManage_Extend.PageUrl),extModel.PageUrl.Trim()},
{ nameof(RB_Miniprogram_PageManage_Extend.PageSort),extModel.PageSort}, { nameof(RB_Miniprogram_PageManage_Extend.PageSort),extModel.PageSort},
{ nameof(RB_Miniprogram_PageManage_Extend.IsParameter),extModel.IsParameter}, { nameof(RB_Miniprogram_PageManage_Extend.IsParameter),extModel.IsParameter},
{ nameof(RB_Miniprogram_PageManage_Extend.ParameterValue),extModel.ParameterValue}, { nameof(RB_Miniprogram_PageManage_Extend.ParameterValue),extModel.ParameterValue},
......
...@@ -348,6 +348,17 @@ namespace Mall.Module.User ...@@ -348,6 +348,17 @@ namespace Mall.Module.User
return list; return list;
} }
/// <summary>
/// 获取会员等级列表
/// </summary>
/// <param name="dmodel"></param>
/// <returns></returns>
public List<RB_Member_Grade_Extend> GetMemberGrade(RB_Member_Grade_Extend dmodel)
{
var list = member_GradeRepository.GetGrade(dmodel);
return list;
}
/// <summary> /// <summary>
/// 新增会员等级 /// 新增会员等级
/// </summary> /// </summary>
...@@ -485,6 +496,41 @@ namespace Mall.Module.User ...@@ -485,6 +496,41 @@ namespace Mall.Module.User
} }
} }
/// <summary>
/// 验证会员等级是否存在
/// </summary>
/// <param name="demodel"></param>
/// <returns></returns>
public bool ValidateMemberGrade(RB_Member_Grade_Extend demodel)
{
List<WhereHelper> whereHelpers = new List<WhereHelper>() {
new WhereHelper(){
FiledName=nameof(RB_Member_Grade.Grade),
FiledValue=demodel.Grade,
OperatorEnum=OperatorEnum.Equal
},
new WhereHelper(){
FiledName=nameof(RB_Member_Grade.TenantId),
FiledValue=demodel.TenantId,
OperatorEnum=OperatorEnum.Equal
},
new WhereHelper(){
FiledName=nameof(RB_Member_Grade.MallBaseId),
FiledValue=demodel.MallBaseId,
OperatorEnum=OperatorEnum.Equal
}
};
if (demodel.Id > 0) {
whereHelpers.Add(new WhereHelper()
{
FiledName = nameof(RB_Member_Grade.Id),
FiledValue = demodel.Id,
OperatorEnum = OperatorEnum.NotEqual
});
}
return member_GradeRepository.Exists(whereHelpers);
}
/// <summary> /// <summary>
/// 获取会员等级 /// 获取会员等级
/// </summary> /// </summary>
...@@ -1953,13 +1999,67 @@ namespace Mall.Module.User ...@@ -1953,13 +1999,67 @@ namespace Mall.Module.User
{ {
var model = distributor_InfoRepository.GetList(new RB_Distributor_Info_Extend() { UserId = userId, TenantId = tenantId, MallBaseId = mallBaseId }).FirstOrDefault(); var model = distributor_InfoRepository.GetList(new RB_Distributor_Info_Extend() { UserId = userId, TenantId = tenantId, MallBaseId = mallBaseId }).FirstOrDefault();
if (model == null) if (model == null)
{
var basicsModel = distributor_BasicsRepository.GetList(new RB_Distributor_Basics_Extend() { TenantId = tenantId, MallBaseId = mallBaseId }).FirstOrDefault();
bool flag = true;
if (basicsModel.DistributorCondition == DistributorConditionEnum.GMSP) {
//验证购买商品
List<WhereHelper> whereHelpers = new List<WhereHelper>() {
new WhereHelper(){
FiledName=nameof(RB_Goods_Order_Extend.UserId),
FiledValue=userId,
OperatorEnum=OperatorEnum.Equal
},
new WhereHelper(){
FiledName=nameof(RB_Goods_Order_Extend.TenantId),
FiledValue=tenantId,
OperatorEnum=OperatorEnum.Equal
},
new WhereHelper(){
FiledName=nameof(RB_Goods_Order_Extend.MallBaseId),
FiledValue=mallBaseId,
OperatorEnum=OperatorEnum.Equal
},
new WhereHelper(){
FiledName=nameof(RB_Goods_Order_Extend.Recycled),
FiledValue=2,
OperatorEnum=OperatorEnum.Equal
},
new WhereHelper(){
FiledName=nameof(RB_Goods_Order_Extend.Status),
FiledValue=0,
OperatorEnum=OperatorEnum.Equal
},
new WhereHelper(){
FiledName=nameof(RB_Goods_Order_Extend.OrderStatus),
FiledValue="2,3,4,5,6",
OperatorEnum=OperatorEnum.IN
},
};
flag = goods_OrderRepository.Exists(whereHelpers);
}
else if(basicsModel.DistributorCondition == DistributorConditionEnum.DCXF){
//单次消费 充值也算 (货到付款这种怎么处理)
}
if (flag)
{ {
return new return new
{ {
Status = 1, Status = 1,
Msg = "未申请成为分销商" Msg = "未申请成为分销商",
basicsModel.ApplyFor,
ApplyForName = basicsModel.ApplyFor.GetEnumName()
};
}
else {
return new
{
Status = 0,
Msg = "未满足申请成为分销商条件:" + basicsModel.DistributorCondition.GetEnumName()
}; };
} }
}
if (model.AuditStatus == Common.Enum.User.DistributorAuditStatusEnum.Reject) if (model.AuditStatus == Common.Enum.User.DistributorAuditStatusEnum.Reject)
{ {
return new return new
......
...@@ -23,7 +23,7 @@ namespace Mall.Repository.Product ...@@ -23,7 +23,7 @@ namespace Mall.Repository.Product
/// <returns></returns> /// <returns></returns>
public List<RB_Material_Info_Extend> GetPageList(int pageIndex, int pageSize, out long rowCount, RB_Material_Info_Extend dmodel) public List<RB_Material_Info_Extend> GetPageList(int pageIndex, int pageSize, out long rowCount, RB_Material_Info_Extend dmodel)
{ {
string where = $" 1=1 and {nameof(RB_Material_Info.Status)}=0"; string where = $" 1=1 and Id>100 and {nameof(RB_Material_Info.Status)}=0";
if (dmodel.Id >= 100) if (dmodel.Id >= 100)
{ {
if (dmodel.TenantId > 0) if (dmodel.TenantId > 0)
......
...@@ -44,7 +44,7 @@ namespace Mall.Repository.User ...@@ -44,7 +44,7 @@ namespace Mall.Repository.User
where += $@" and di.{nameof(RB_Distributor_Info.Name)} like '%{dmodel.Name}%'"; where += $@" and di.{nameof(RB_Distributor_Info.Name)} like '%{dmodel.Name}%'";
} }
if (dmodel.Source > 0) { if (dmodel.Source > 0) {
where += $@" and u.{nameof(RB_Member_User.Source)}={dmodel.Source}"; where += $@" and u.{nameof(RB_Member_User.Source)}={(int)dmodel.Source}";
} }
if (!string.IsNullOrEmpty(dmodel.NickName)) if (!string.IsNullOrEmpty(dmodel.NickName))
{ {
......
...@@ -36,6 +36,9 @@ namespace Mall.Repository.User ...@@ -36,6 +36,9 @@ namespace Mall.Repository.User
if (dmodel.AuditStatus > 0) { if (dmodel.AuditStatus > 0) {
where += $@" and r.{nameof(RB_Distributor_Remit.AuditStatus)}={(int)dmodel.AuditStatus}"; where += $@" and r.{nameof(RB_Distributor_Remit.AuditStatus)}={(int)dmodel.AuditStatus}";
} }
if (dmodel.UserId > 0) {
where += $@" and r.{nameof(RB_Distributor_Remit.UserId)}={dmodel.UserId}";
}
string sql = $@"select r.*,u.Name as UserName,u.Photo,u.Source from RB_Distributor_Remit r string sql = $@"select r.*,u.Name as UserName,u.Photo,u.Source from RB_Distributor_Remit r
left join rb_member_user u on r.UserId = u.Id left join rb_member_user u on r.UserId = u.Id
......
...@@ -60,6 +60,9 @@ namespace Mall.Repository.User ...@@ -60,6 +60,9 @@ namespace Mall.Repository.User
{ {
where += $@" and {nameof(RB_Member_Grade.MallBaseId)}={dmodel.MallBaseId}"; where += $@" and {nameof(RB_Member_Grade.MallBaseId)}={dmodel.MallBaseId}";
} }
if (dmodel.Id > 0) {
where += $@" and {nameof(RB_Member_Grade.Id)} ={(int)dmodel.Id}";
}
if (dmodel.Grade > 0) if (dmodel.Grade > 0)
{ {
where += $@" and {nameof(RB_Member_Grade.Grade)} ={(int)dmodel.Grade}"; where += $@" and {nameof(RB_Member_Grade.Grade)} ={(int)dmodel.Grade}";
...@@ -75,5 +78,37 @@ namespace Mall.Repository.User ...@@ -75,5 +78,37 @@ namespace Mall.Repository.User
string sql = $@"select * from RB_Member_Grade where {where} order by Grade asc"; string sql = $@"select * from RB_Member_Grade where {where} order by Grade asc";
return Get<RB_Member_Grade_Extend>(sql).ToList(); return Get<RB_Member_Grade_Extend>(sql).ToList();
} }
/// <summary>
/// 获取列表
/// </summary>
/// <param name="dmodel"></param>
/// <returns></returns>
public List<RB_Member_Grade_Extend> GetGrade(RB_Member_Grade_Extend dmodel)
{
string where = $" 1=1 and {nameof(RB_Member_Grade.Status)}=0 ";
if (dmodel.TenantId > 0)
{
where += $@" and {nameof(RB_Member_Grade.TenantId)}={dmodel.TenantId}";
}
if (dmodel.MallBaseId > 0)
{
where += $@" and {nameof(RB_Member_Grade.MallBaseId)}={dmodel.MallBaseId}";
}
if (dmodel.Grade > 0)
{
where += $@" and {nameof(RB_Member_Grade.Grade)} ={(int)dmodel.Grade}";
}
if (!string.IsNullOrEmpty(dmodel.Name))
{
where += $@" and {nameof(RB_Member_Grade.Name)} like '%{dmodel.Name}%'";
}
if (dmodel.Enabled > 0)
{
where += $@" and {nameof(RB_Member_Grade.Enabled)} ={(int)dmodel.Enabled}";
}
string sql = $@"select Grade from RB_Member_Grade where {where} order by Grade asc";
return Get<RB_Member_Grade_Extend>(sql).ToList();
}
} }
} }
...@@ -26,6 +26,10 @@ namespace Mall.Repository.User ...@@ -26,6 +26,10 @@ namespace Mall.Repository.User
{ {
builder.AppendFormat(" AND MallBaseId={0} ", query.MallBaseId); builder.AppendFormat(" AND MallBaseId={0} ", query.MallBaseId);
} }
if (query.NavIconIsShow != null && query.NavIconIsShow > -1)
{
builder.AppendFormat(" AND NavIconIsShow={0} ", query.NavIconIsShow);
}
} }
builder.Append(" ORDER BY NavIconSort ASC "); builder.Append(" ORDER BY NavIconSort ASC ");
return Get<RB_MiniProgram_Navicon_Extend>(builder.ToString()).ToList(); return Get<RB_MiniProgram_Navicon_Extend>(builder.ToString()).ToList();
......
...@@ -34,5 +34,17 @@ namespace Mall.Repository.User ...@@ -34,5 +34,17 @@ namespace Mall.Repository.User
builder.Append(" ORDER BY TagSort "); builder.Append(" ORDER BY TagSort ");
return Get<RB_Miniprogram_Bottomnav_Extend>(builder.ToString()).ToList(); return Get<RB_Miniprogram_Bottomnav_Extend>(builder.ToString()).ToList();
} }
/// <summary>
/// 删除底部导航
/// </summary>
/// <param name="Ids"></param>
/// <returns></returns>
public bool DeleteBottomnavRepository(string Ids)
{
StringBuilder builder = new StringBuilder();
builder.AppendFormat("DELETE FROM RB_Miniprogram_Bottomnav WHERE 1=1 AND TagId IN({0}) ", Ids);
return base.Execute(builder.ToString()) > 0;
}
} }
} }
...@@ -282,6 +282,38 @@ namespace Mall.WebApi.Controllers.MallBase ...@@ -282,6 +282,38 @@ namespace Mall.WebApi.Controllers.MallBase
return orderModule.GetAppletGoodsSettlementInfo(demodel); return orderModule.GetAppletGoodsSettlementInfo(demodel);
} }
/// <summary>
/// 结算页面详情(赞羊字段)
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult GetAppletGoodsSettlementInfoForZY()
{
var req = RequestParm;
var userInfo = AppletUserInfo;
RB_Goods_Order_Extend demodel = JsonConvert.DeserializeObject<RB_Goods_Order_Extend>(req.msg.ToString());
if (demodel.DetailList == null || !demodel.DetailList.Any())
{
return ApiResult.ParamIsNull("请传递商品信息");
}
foreach (var item in demodel.DetailList)
{
if ((item.GoodsId ?? 0) <= 0)
{
return ApiResult.ParamIsNull("请传递商品id");
}
if ((item.Number ?? 0) <= 0)
{
return ApiResult.ParamIsNull("请传递商品数量");
}
}
demodel.TenantId = userInfo.TenantId;
demodel.MallBaseId = userInfo.MallBaseId;
demodel.UserId = userInfo.UserId;
return orderModule.GetAppletGoodsSettlementInfoForZY(demodel);
}
/// <summary> /// <summary>
/// 结算页面修改快递,获取快递费用 /// 结算页面修改快递,获取快递费用
/// </summary> /// </summary>
......
...@@ -1383,6 +1383,7 @@ namespace Mall.WebApi.Controllers.MallBase ...@@ -1383,6 +1383,7 @@ namespace Mall.WebApi.Controllers.MallBase
List<Model.Extend.User.RB_Member_Grade_Extend> MGradeList = null; List<Model.Extend.User.RB_Member_Grade_Extend> MGradeList = null;
if (demodel.IsCustomSpecification == 1) if (demodel.IsCustomSpecification == 1)
{ {
demodel.InventoryNum = 0;
if (demodel.SpecificationList == null || !demodel.SpecificationList.Any()) { if (demodel.SpecificationList == null || !demodel.SpecificationList.Any()) {
return ApiResult.ParamIsNull("请传递规格列表"); return ApiResult.ParamIsNull("请传递规格列表");
} }
...@@ -1455,7 +1456,8 @@ namespace Mall.WebApi.Controllers.MallBase ...@@ -1455,7 +1456,8 @@ namespace Mall.WebApi.Controllers.MallBase
pricemodel.GoodsWeight ??= 0; pricemodel.GoodsWeight ??= 0;
demodel.InventoryNum += (pricemodel.InventoryNum ?? 0); demodel.InventoryNum += (pricemodel.InventoryNum ?? 0);
} }
//主表价格 如果有自定义规格,直接取最小值
demodel.SellingPrice = demodel.SpecificationPriceList.Min(x => x.SellingPrice ?? 0);
//分销佣金 //分销佣金
if (demodel.SeparateDistribution == 1) { if (demodel.SeparateDistribution == 1) {
if (DGradeList == null) if (DGradeList == null)
...@@ -1527,6 +1529,9 @@ namespace Mall.WebApi.Controllers.MallBase ...@@ -1527,6 +1529,9 @@ namespace Mall.WebApi.Controllers.MallBase
//普通设置 直接根据等级验证数量 //普通设置 直接根据等级验证数量
if (DGradeList.Count() * TotalNum != demodel.DistributionCommissionList.Count()) if (DGradeList.Count() * TotalNum != demodel.DistributionCommissionList.Count())
{ {
LogHelper.Write(DGradeList.Count().ToString() + "|||" + JsonConvert.SerializeObject(DGradeList));
LogHelper.Write("TotalNum:"+ TotalNum.ToString());
LogHelper.Write(JsonConvert.SerializeObject(demodel.DistributionCommissionList));
return ApiResult.ParamIsNull("分销佣金列表数量不正确"); return ApiResult.ParamIsNull("分销佣金列表数量不正确");
} }
foreach (var item in DGradeList) foreach (var item in DGradeList)
......
...@@ -380,7 +380,7 @@ namespace Mall.WebApi.Controllers.User ...@@ -380,7 +380,7 @@ namespace Mall.WebApi.Controllers.User
public ApiResult RemoveMiniProgramMallTag() public ApiResult RemoveMiniProgramMallTag()
{ {
JObject parms = JObject.Parse(RequestParm.msg.ToString()); JObject parms = JObject.Parse(RequestParm.msg.ToString());
var TagId = parms.GetInt("TagId", 0); var TagId = parms.GetStringValue("TagId");
var flag = programModule.RemoveMiniProgramMallTagModule(TagId); var flag = programModule.RemoveMiniProgramMallTagModule(TagId);
return flag ? ApiResult.Success() : ApiResult.Failed(); return flag ? ApiResult.Success() : ApiResult.Failed();
} }
......
...@@ -382,6 +382,22 @@ namespace Mall.WebApi.Controllers.User ...@@ -382,6 +382,22 @@ namespace Mall.WebApi.Controllers.User
})); }));
} }
/// <summary>
/// 获取会员等级
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult GetMemberGrade()
{
var parms = RequestParm;
RB_Member_Grade_Extend demodel = JsonConvert.DeserializeObject<RB_Member_Grade_Extend>(parms.msg.ToString());
demodel.TenantId = Convert.ToInt32(parms.uid);
demodel.MallBaseId = parms.MallBaseId;
var list = userModule.GetMemberGrade(demodel);
return ApiResult.Success("", list.Select(x => x.Grade).ToList());
}
/// <summary> /// <summary>
/// 新增会员等级 /// 新增会员等级
/// </summary> /// </summary>
...@@ -491,6 +507,9 @@ namespace Mall.WebApi.Controllers.User ...@@ -491,6 +507,9 @@ namespace Mall.WebApi.Controllers.User
demodel.Status = 0; demodel.Status = 0;
demodel.TenantId = Convert.ToInt32(parms.uid); demodel.TenantId = Convert.ToInt32(parms.uid);
demodel.MallBaseId = parms.MallBaseId; demodel.MallBaseId = parms.MallBaseId;
if (userModule.ValidateMemberGrade(demodel)) {
return ApiResult.Failed("该等级已存在,请重新选择等级");
}
bool flag = userModule.SetMemberGradeInfo(demodel); bool flag = userModule.SetMemberGradeInfo(demodel);
if (flag) if (flag)
{ {
...@@ -527,7 +546,6 @@ namespace Mall.WebApi.Controllers.User ...@@ -527,7 +546,6 @@ namespace Mall.WebApi.Controllers.User
} }
} }
/// <summary> /// <summary>
/// 获取会用户积分分页列表 /// 获取会用户积分分页列表
/// </summary> /// </summary>
...@@ -1860,15 +1878,15 @@ namespace Mall.WebApi.Controllers.User ...@@ -1860,15 +1878,15 @@ namespace Mall.WebApi.Controllers.User
case 6: case 6:
datarow.ExcelRows.Add(new ExcelColumn(value: item.BankName ?? "") { }); break; datarow.ExcelRows.Add(new ExcelColumn(value: item.BankName ?? "") { }); break;
case 7: case 7:
datarow.ExcelRows.Add(new ExcelColumn(value: item.AccountNumber) { }); break; datarow.ExcelRows.Add(new ExcelColumn(value: item.AccountNumber ?? "") { }); break;
case 8: case 8:
datarow.ExcelRows.Add(new ExcelColumn(value: item.AccountName) { }); break; datarow.ExcelRows.Add(new ExcelColumn(value: item.AccountName ?? "") { }); break;
case 9: case 9:
datarow.ExcelRows.Add(new ExcelColumn(value: item.AuditStatus.GetEnumName()) { }); break; datarow.ExcelRows.Add(new ExcelColumn(value: item.AuditStatus.GetEnumName()) { }); break;
case 10: case 10:
datarow.ExcelRows.Add(new ExcelColumn(value: item.WithdrawalWay.GetEnumName()) { }); break; datarow.ExcelRows.Add(new ExcelColumn(value: item.WithdrawalWay.GetEnumName()) { }); break;
case 11: case 11:
datarow.ExcelRows.Add(new ExcelColumn(value: item.RemitDate.Value.ToString("yyyy-MM-dd HH:mm:ss")) { }); break; datarow.ExcelRows.Add(new ExcelColumn(value: item.RemitDate.HasValue? item.RemitDate.Value.ToString("yyyy-MM-dd HH:mm:ss"):"") { }); break;
} }
} }
slist.Add(datarow); slist.Add(datarow);
......
...@@ -48,7 +48,9 @@ namespace Mall.WebApi ...@@ -48,7 +48,9 @@ namespace Mall.WebApi
"http://localhost:8080", "http://localhost:8080",
"http://localhost:8082", "http://localhost:8082",
"http://127.0.0.1:50512", "http://127.0.0.1:50512",
"http://127.0.0.1:20224" "http://127.0.0.1:20224",
"http://mall.oytour.com",
"http://testmall.oytour.com"
}; };
services.AddCors(options => options.AddPolicy("AllowCors", policy => policy.AllowAnyHeader().AllowAnyMethod().AllowCredentials().WithOrigins(corsArray.ToArray()))); services.AddCors(options => options.AddPolicy("AllowCors", policy => policy.AllowAnyHeader().AllowAnyMethod().AllowCredentials().WithOrigins(corsArray.ToArray())));
} }
......
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