Skip to content

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

页面修改

parent 2b858bc0
Show whitespace changes
Inline Side-by-side
Showing with 63 additions and 80 deletions
Mall.Module.Product/ProductModule.cs
View file @ 90b0cf25
...@@ -16,6 +16,7 @@ using Mall.Model.Query; ...@@ -16,6 +16,7 @@ using Mall.Model.Query;
using Mall.Repository; using Mall.Repository;
using Mall.Repository.BaseSetUp; using Mall.Repository.BaseSetUp;
using Mall.Repository.Product; using Mall.Repository.Product;
using Mall.Repository.Reserve;
using Mall.Repository.User; using Mall.Repository.User;
using Newtonsoft.Json; using Newtonsoft.Json;
using Newtonsoft.Json.Linq; using Newtonsoft.Json.Linq;
...@@ -193,7 +194,10 @@ namespace Mall.Module.Product ...@@ -193,7 +194,10 @@ namespace Mall.Module.Product
/// </summary> /// </summary>
private readonly RB_Goods_WK_CourseStudyRepository goods_WK_CourseStudyRepository = new RB_Goods_WK_CourseStudyRepository(); private readonly RB_Goods_WK_CourseStudyRepository goods_WK_CourseStudyRepository = new RB_Goods_WK_CourseStudyRepository();
/// <summary>
/// 服务人员仓储仓储层对象
/// </summary>
private readonly RB_Reserve_ServicePersonalRepository reserve_ServicePersonalRepository = new RB_Reserve_ServicePersonalRepository();
#region 小程序接口 #region 小程序接口
...@@ -2845,27 +2849,12 @@ namespace Mall.Module.Product ...@@ -2845,27 +2849,12 @@ namespace Mall.Module.Product
model.Favorite = false; model.Favorite = false;
if (UserId > 0) if (UserId > 0)
{ {
List<WhereHelper> wheres = new List<WhereHelper>() { List<WhereHelper> wheres = new List<WhereHelper>()
new WhereHelper(){ {
FiledName=nameof(RB_Member_Collection_Extend.UserId), new WhereHelper(nameof(RB_Member_Collection_Extend.UserId),UserId),
FiledValue=UserId, new WhereHelper(nameof(RB_Member_Collection_Extend.GoodsId),goodsId) ,
OperatorEnum=OperatorEnum.Equal new WhereHelper(nameof(RB_Member_Collection_Extend.TenantId),TenantId),
}, new WhereHelper(nameof(RB_Member_Collection_Extend.MallBaseId),MallBaseId),
new WhereHelper(){
FiledName=nameof(RB_Member_Collection_Extend.GoodsId),
FiledValue=goodsId,
OperatorEnum=OperatorEnum.Equal
},
new WhereHelper(){
FiledName=nameof(RB_Member_Collection_Extend.TenantId),
FiledValue=TenantId,
OperatorEnum=OperatorEnum.Equal
},
new WhereHelper(){
FiledName=nameof(RB_Member_Collection_Extend.MallBaseId),
FiledValue=MallBaseId,
OperatorEnum=OperatorEnum.Equal
},
}; };
if (member_CollectionRepository.Exists(wheres)) if (member_CollectionRepository.Exists(wheres))
{ {
...@@ -3031,27 +3020,12 @@ namespace Mall.Module.Product ...@@ -3031,27 +3020,12 @@ namespace Mall.Module.Product
else else
{ {
//判断是否开启和平返佣 //判断是否开启和平返佣
List<WhereHelper> wheres = new List<WhereHelper>() { List<WhereHelper> wheres = new List<WhereHelper>()
new WhereHelper(){ {
FiledName=nameof(RB_Distributor_HPCommission.Status), new WhereHelper(nameof(RB_Distributor_HPCommission.Status),0),
FiledValue=0, new WhereHelper(nameof(RB_Distributor_HPCommission.Enabled),1),
OperatorEnum=OperatorEnum.Equal new WhereHelper(nameof(RB_Distributor_HPCommission.TenantId),TenantId),
}, new WhereHelper(nameof(RB_Distributor_HPCommission.MallBaseId),MallBaseId)
new WhereHelper(){
FiledName=nameof(RB_Distributor_HPCommission.Enabled),
FiledValue=1,
OperatorEnum=OperatorEnum.Equal
},
new WhereHelper(){
FiledName=nameof(RB_Distributor_HPCommission.TenantId),
FiledValue=TenantId,
OperatorEnum=OperatorEnum.Equal
},
new WhereHelper(){
FiledName=nameof(RB_Distributor_HPCommission.MallBaseId),
FiledValue=MallBaseId,
OperatorEnum=OperatorEnum.Equal
}
}; };
if (distributor_HPCommissionRepository.Exists(wheres)) if (distributor_HPCommissionRepository.Exists(wheres))
{ {
...@@ -3095,14 +3069,7 @@ namespace Mall.Module.Product ...@@ -3095,14 +3069,7 @@ namespace Mall.Module.Product
if (model.SeparateDistribution == 1) if (model.SeparateDistribution == 1)
{ {
var dcList = model.DistributionCommissionList.Where(x => x.DistributorGrade == disModel.GradeId).ToList(); var dcList = model.DistributionCommissionList.Where(x => x.DistributorGrade == disModel.GradeId).ToList();
//if ((BasicsModel?.IsCommissionResidue ?? 2) == 1)
//{
// model.MaxShare = dcList.Max(x => (x.OneCommission ?? 0) + (x.TwoCommission ?? 0) + (x.ThreeCommission ?? 0));
//}
//else
//{
model.MaxShare = dcList.Max(x => x.OneCommission ?? 0); model.MaxShare = dcList.Max(x => x.OneCommission ?? 0);
//}
// 这里需注意，可能需要分销 是否提所有返佣控制 // 这里需注意，可能需要分销 是否提所有返佣控制
if (model.SeparateDistributionMoneyType == 1) if (model.SeparateDistributionMoneyType == 1)
{ {
...@@ -3113,15 +3080,7 @@ namespace Mall.Module.Product ...@@ -3113,15 +3080,7 @@ namespace Mall.Module.Product
{ {
if (disModel.GradeId == 0) if (disModel.GradeId == 0)
{ {
//拿分销基础配置
//if ((BasicsModel?.IsCommissionResidue ?? 2) == 1)
//{
// model.MaxShare = (BasicsModel?.OneCommission ?? 0) + (BasicsModel?.TwoCommission ?? 0) + (BasicsModel?.ThreeCommission ?? 0);
//}
//else
//{
model.MaxShare = BasicsModel?.OneCommission ?? 0; model.MaxShare = BasicsModel?.OneCommission ?? 0;
//}
if ((BasicsModel?.DistributorCommissionType ?? 2) == 1) if ((BasicsModel?.DistributorCommissionType ?? 2) == 1)
{ {
model.MaxShare = Math.Round(model.MaxShare * MaxSellMoney / 100, 2, MidpointRounding.AwayFromZero); model.MaxShare = Math.Round(model.MaxShare * MaxSellMoney / 100, 2, MidpointRounding.AwayFromZero);
...@@ -3133,14 +3092,7 @@ namespace Mall.Module.Product ...@@ -3133,14 +3092,7 @@ namespace Mall.Module.Product
var disgradeModel = distributor_GradeRepository.GetEntity(disModel.GradeId); var disgradeModel = distributor_GradeRepository.GetEntity(disModel.GradeId);
if (disgradeModel != null) if (disgradeModel != null)
{ {
//if ((BasicsModel?.IsCommissionResidue ?? 2) == 1)
//{
// model.MaxShare = (disgradeModel?.OneCommission ?? 0) + (disgradeModel?.TwoCommission ?? 0) + (disgradeModel?.ThreeCommission ?? 0);
//}
//else
//{
model.MaxShare = disgradeModel?.OneCommission ?? 0; model.MaxShare = disgradeModel?.OneCommission ?? 0;
//}
if ((disgradeModel?.DistributionCommissionType ?? 2) == 1) if ((disgradeModel?.DistributionCommissionType ?? 2) == 1)
{ {
model.MaxShare = Math.Round(model.MaxShare * MaxSellMoney / 100, 2, MidpointRounding.AwayFromZero); model.MaxShare = Math.Round(model.MaxShare * MaxSellMoney / 100, 2, MidpointRounding.AwayFromZero);
...@@ -3352,6 +3304,8 @@ namespace Mall.Module.Product ...@@ -3352,6 +3304,8 @@ namespace Mall.Module.Product
attr_name = model.DefaultSpecificationName attr_name = model.DefaultSpecificationName
} }, } },
price_member, price_member,
isChooseServicePerson= model.IsChooseServicePerson,
depositMoney= model.DepositMoney,
member_price_list member_price_list
}); });
} }
...@@ -3442,8 +3396,7 @@ namespace Mall.Module.Product ...@@ -3442,8 +3396,7 @@ namespace Mall.Module.Product
} }
price_member_max = Math.Round(price_member_max, 2, MidpointRounding.AwayFromZero); price_member_max = Math.Round(price_member_max, 2, MidpointRounding.AwayFromZero);
price_member_min = Math.Round(price_member_min, 2, MidpointRounding.AwayFromZero); price_member_min = Math.Round(price_member_min, 2, MidpointRounding.AwayFromZero);
//price_min = Math.Round(price_min, 2, MidpointRounding.AwayFromZero);
//price_max = Math.Round(price_max, 2, MidpointRounding.AwayFromZero);//先使用会员的
price_min = price_member_min; price_min = price_member_min;
price_max = price_member_max; price_max = price_member_max;
#endregion #endregion
...@@ -3483,7 +3436,6 @@ namespace Mall.Module.Product ...@@ -3483,7 +3436,6 @@ namespace Mall.Module.Product
{ {
IsAllowShare = 2; IsAllowShare = 2;
} }
if ((model.IsCustomSpecification ?? 2) != 1) if ((model.IsCustomSpecification ?? 2) != 1)
{ {
var VauleL = new List<RB_Goods_SpecificationValue_Extend> var VauleL = new List<RB_Goods_SpecificationValue_Extend>
...@@ -3495,7 +3447,8 @@ namespace Mall.Module.Product ...@@ -3495,7 +3447,8 @@ namespace Mall.Module.Product
ImagePath = "" ImagePath = ""
} }
}; };
model.SpecificationList = new List<RB_Goods_Specification_Extend> { model.SpecificationList = new List<RB_Goods_Specification_Extend>
{
new RB_Goods_Specification_Extend() new RB_Goods_Specification_Extend()
{ {
Sort = 0, Sort = 0,
...@@ -3504,7 +3457,10 @@ namespace Mall.Module.Product ...@@ -3504,7 +3457,10 @@ namespace Mall.Module.Product
} }
}; };
} }
var servicePersionList= reserve_ServicePersonalRepository.GetServicePersonalList(new Model.Extend.Reserve.RB_Reserve_ServicePersonal_Extend()
{
StoreId = storeId,
}).ToList();
return new return new
{ {
goods = new goods = new
...@@ -3512,7 +3468,6 @@ namespace Mall.Module.Product ...@@ -3512,7 +3468,6 @@ namespace Mall.Module.Product
id = model.Id, id = model.Id,
mall_id = model.MallBaseId, mall_id = model.MallBaseId,
mch_id = model.TenantId,//暂 商户id mch_id = model.TenantId,//暂 商户id
//goods_warehouse_id = 0,//
status = model.GoodsStatus, status = model.GoodsStatus,
isAllowShare = IsAllowShare,//是否可以分享 isAllowShare = IsAllowShare,//是否可以分享
advertising = model.Advertising,//广告词 advertising = model.Advertising,//广告词
...@@ -3546,14 +3501,12 @@ namespace Mall.Module.Product ...@@ -3546,14 +3501,12 @@ namespace Mall.Module.Product
is_level = model.EnjoyMember,//是否销售会员价格 is_level = model.EnjoyMember,//是否销售会员价格
is_level_alone = model.SeparateSetMember,//是否单独设置会员价 is_level_alone = model.SeparateSetMember,//是否单独设置会员价
share_type = model.SeparateDistributionMoneyType,//分销佣金类型 share_type = model.SeparateDistributionMoneyType,//分销佣金类型
//sign = "",
app_share_pic = model.CustomShareImagePath, app_share_pic = model.CustomShareImagePath,
app_share_title = model.CustomShareTitles, app_share_title = model.CustomShareTitles,
is_default_services = model.IsDefaultService, is_default_services = model.IsDefaultService,
sort = model.Sort, sort = model.Sort,
created_at = model.CreateDate.HasValue ? model.CreateDate.Value.ToString("yyyy-MM-dd HH:mm:ss") : "", created_at = model.CreateDate.HasValue ? model.CreateDate.Value.ToString("yyyy-MM-dd HH:mm:ss") : "",
updated_at = model.UpdateDate.HasValue ? model.UpdateDate.Value.ToString("yyyy-MM-dd HH:mm:ss") : "", updated_at = model.UpdateDate.HasValue ? model.UpdateDate.Value.ToString("yyyy-MM-dd HH:mm:ss") : "",
//deleted_at = "",
is_delete = model.Status, is_delete = model.Status,
payment_people,//用户数量 payment_people,//用户数量
payment_num,//商品数量 payment_num,//商品数量
...@@ -3577,7 +3530,6 @@ namespace Mall.Module.Product ...@@ -3577,7 +3530,6 @@ namespace Mall.Module.Product
level_show = (userModel?.MemberGrade ?? 0) > 0 ? 1 : 2,//是否显示会员价 level_show = (userModel?.MemberGrade ?? 0) > 0 ? 1 : 2,//是否显示会员价
is_sales = model.GoodsStatus == 1 && model.InventoryNum > 0 ? 1 : 2,//是否可购买 is_sales = model.GoodsStatus == 1 && model.InventoryNum > 0 ? 1 : 2,//是否可购买
attr = priceList, attr = priceList,
//goods_num = model.InventoryNum,
goods_no = model.GoodsNumbers, goods_no = model.GoodsNumbers,
goods_weight = model.GoodsWeight, goods_weight = model.GoodsWeight,
services = model.ServiceList.Select(x => new services = model.ServiceList.Select(x => new
...@@ -3614,7 +3566,6 @@ namespace Mall.Module.Product ...@@ -3614,7 +3566,6 @@ namespace Mall.Module.Product
}, },
PresentFXGradeMsg PresentFXGradeMsg
}, },
//plugin_extra = new List<object>(),
express = model.Express,//快递费用 读取默认收货地址 如果没有为0 如果有 根据商品运费匹配 找出快递费用 express = model.Express,//快递费用 读取默认收货地址 如果没有为0 如果有 根据商品运费匹配 找出快递费用
price_member_max, price_member_max,
price_member_min, price_member_min,
...@@ -3644,6 +3595,16 @@ namespace Mall.Module.Product ...@@ -3644,6 +3595,16 @@ namespace Mall.Module.Product
x.CategoryName x.CategoryName
}), }),
video_type = model.VideoType, video_type = model.VideoType,
isChooseServicePerson=model.IsChooseServicePerson,
depositMoney=model.DepositMoney,
persionList = servicePersionList?.Where(qitem => qitem.ServiceStatus == 1).Select(qitem => new
{
qitem.ServiceLogo,
qitem.Score,
qitem.Name,
qitem.Major,
Gender = qitem.Gender.ToInt()
})
}, },
delivery = "" delivery = ""
}; };
......
Mall.Repository/Reserve/RB_Reserve_ServicePersonalRepository.cs
View file @ 90b0cf25
...@@ -137,12 +137,14 @@ LEFT JOIN (SELECT ServicePersonalId,COUNT(*) as CommentNum from rb_goods_commen ...@@ -137,12 +137,14 @@ LEFT JOIN (SELECT ServicePersonalId,COUNT(*) as CommentNum from rb_goods_commen
{ {
builder.Append($" AND {nameof(RB_Reserve_ServicePersonal_Extend.Name)} like '%{query.Name}%'"); builder.Append($" AND {nameof(RB_Reserve_ServicePersonal_Extend.Name)} like '%{query.Name}%'");
} }
if (query.ServiceStatus > 0) if (query.ServiceStatus > 0)
{ {
builder.Append($" AND {nameof(RB_Reserve_ServicePersonal_Extend.ServiceStatus)}={query.ServiceStatus}"); builder.Append($" AND {nameof(RB_Reserve_ServicePersonal_Extend.ServiceStatus)}={query.ServiceStatus}");
} }
if (query.StoreId > 0)
{
builder.Append($" AND {nameof(RB_Reserve_ServicePersonal_Extend.StoreId)}={query.StoreId}");
}
} }
return Get<RB_Reserve_ServicePersonal_Extend>(builder.ToString()).ToList(); return Get<RB_Reserve_ServicePersonal_Extend>(builder.ToString()).ToList();
} }
......
Mall.WebApi/Controllers/Reserve/AppletStoresController.cs
View file @ 90b0cf25
...@@ -137,6 +137,18 @@ namespace Mall.WebApi.Controllers.Reserve ...@@ -137,6 +137,18 @@ namespace Mall.WebApi.Controllers.Reserve
Id = storeId, Id = storeId,
MallBaseId = parms.MallBaseId MallBaseId = parms.MallBaseId
}, isFirst: true)?.FirstOrDefault(); }, isFirst: true)?.FirstOrDefault();
string serviceTime = "";
if (storeModel != null)
{
if (storeModel.IsAllDay == 1)
{
serviceTime = "全天";
}
else
{
serviceTime = storeModel.StartTime + "-" + storeModel.EndTime;
}
}
object result = new object result = new
{ {
storeInfo = new storeInfo = new
...@@ -148,7 +160,15 @@ namespace Mall.WebApi.Controllers.Reserve ...@@ -148,7 +160,15 @@ namespace Mall.WebApi.Controllers.Reserve
distance = storeModel?.KM, distance = storeModel?.KM,
storeScore = storeModel?.Score, storeScore = storeModel?.Score,
storeCoverImg = storeModel?.CoverImg, storeCoverImg = storeModel?.CoverImg,
storeNavImg = storeModel?.NavImg storeNavImg = storeModel?.NavImg,
storeIntro= storeModel?.Intro,
storeProject= storeModel?.ServiceProject,
storeServiceTime= serviceTime,
consumptionObj = new
{
consumptionStoreId = 0,
consumptionStoreName = "HK门店"
}
}, },
}; };
return ApiResult.Success(data: result); return ApiResult.Success(data: result);
......
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