Skip to content

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

提交代码

parent f098eb63
Hide whitespace changes
Inline Side-by-side
Showing with 330 additions and 44 deletions
Mall.Model/Entity/Reserve/RB_Reserve_Coupon.cs
View file @ 0f18fe62
......@@ -50,7 +50,7 @@ namespace Mall.Model.Entity.Reserve
/// <summary>
/// 关联门店
/// </summary>
public int StoreId { get; set; }
public string StoreIds { get; set; }
/// <summary>
/// 是否赞羊使用0-否，1-是
......
Mall.Model/Entity/Reserve/RB_Reserve_MemberCoupon.cs
View file @ 0f18fe62
......@@ -119,6 +119,5 @@ namespace Mall.Model.Entity.Reserve
}
}
Mall.Model/Entity/Reserve/RB_Reserve_ServicePersonal.cs
View file @ 0f18fe62
......@@ -100,5 +100,11 @@ namespace Mall.Model.Entity.Reserve
/// </summary>
public decimal WorkYears { get; set; }
/// <summary>
/// 简介
/// </summary>
public string Introduction { get; set; }
}
}
Mall.Model/Extend/Reserve/RB_Reserve_Coupon_Extend.cs
View file @ 0f18fe62
using Mall.Model.Entity.Education;
using Mall.Model.Entity.Reserve;
using Mall.Model.Entity.User;
using System;
using System.Collections.Generic;
using VT.FW.DB;
......@@ -48,6 +49,13 @@ namespace Mall.Model.Extend.Reserve
public int[] MemberLevelList { get; set; }
/// <summary>
/// 门店列表
/// </summary>
public List<RB_Stores_Extend> StoresList { get; set; }
/// <summary>
/// 订单号
/// </summary>
......@@ -67,7 +75,7 @@ namespace Mall.Model.Extend.Reserve
/// <summary>
/// 已使用核销数
......@@ -100,6 +108,8 @@ namespace Mall.Model.Extend.Reserve
/// </summary>
public string SmallShopName { get; set; }
public int StoreId { get; set; }
public DateTime? RegisterDate { get; set; }
}
}
Mall.Model/Extend/Reserve/RB_Reserve_ServicePersonal_Extend.cs
View file @ 0f18fe62
......@@ -34,6 +34,12 @@ namespace Mall.Model.Extend.Reserve
public int OrderGuestNum { get; set; }
/// <summary>
/// 排名（并列）
/// </summary>
public int Rank { get; set; }
/// <summary>
/// 商品分类id
/// </summary>
......@@ -44,6 +50,8 @@ namespace Mall.Model.Extend.Reserve
/// </summary>
public string StoreName { get; set; }
public string StoreAddress { get; set; }
/// <summary>
/// 日期
/// </summary>
......
Mall.Module.Reserve/OfflineGoodsModule.cs
View file @ 0f18fe62
......@@ -1209,6 +1209,50 @@ namespace Mall.Module.Product
}
/// <summary>
/// 获取服务人员对应的商品信息
/// </summary>
/// <param name="demodel"></param>
/// <returns></returns>
public List<RB_Goods_Extend> GetServicePersonalGoodsList(int pageIndex, int pageSize, out long count,RB_Goods_Extend demodel,int GoodsClassify)
{
var list = goodsRepository.GetPageList(pageIndex, pageSize, out count, demodel);
if (list.Any())
{
RB_SmallShops_Info_Extend smallModel = new RB_SmallShops_Info_Extend();
List<RB_SmallShops_Price_Extend> smallPList = new List<RB_SmallShops_Price_Extend>();
List<RB_Goods_SpecificationPrice_Extend> spriceList = new List<RB_Goods_SpecificationPrice_Extend>();
//商品Id
string ids = string.Join(",", list.Select(x => x.Id));
//if (SmallShopsId > 0)
//{
// smallModel = smallShops_InfoRepository.GetEntity<RB_SmallShops_Info_Extend>(SmallShopsId);
// smallPList = smallShops_PriceRepository.GetList(new RB_SmallShops_Price_Extend() { SmallShopsId = SmallShopsId, GoodsIds = ids });
// spriceList = goods_SpecificationPriceRepository.GetList(new RB_Goods_SpecificationPrice_Extend() { GoodsIds = ids });
//}
var clist = goods_CategoryRepository.GetList(new RB_Goods_Category_Extend() { GoodsIds = ids, TenantId = demodel.TenantId, MallBaseId = demodel.MallBaseId });
var olist = goods_OrderRepository.GetGoodsOrderNum(ids);
foreach (var item in list)
{
item.CategoryList = clist.Where(x => x.GoodsId == item.Id).ToList();
//轮播图
item.CoverImage = "";
if (!string.IsNullOrEmpty(item.CarouselImage) && item.CarouselImage != "[]")
{
List<string> CarouselIdList = JsonConvert.DeserializeObject<List<string>>(item.CarouselImage);
//封面图
item.CoverImage = CarouselIdList[0];
//轮播图
}
item.GoodsBuyNum = olist.Where(x => x.GoodsId == item.Id).FirstOrDefault()?.OrderNum ?? 0;
}
}
return list;
}
#region 评论
/// <summary>
......
Mall.Repository/Product/RB_GoodsRepository.cs
View file @ 0f18fe62
......@@ -51,7 +51,7 @@ namespace Mall.Repository.Product
}
if (!string.IsNullOrEmpty(dmodel.StoresIds))
{
where += $@" and locate('{dmodel.StoresIds}',g.{nameof(RB_Goods_Extend.StoresIds)})";
where += $@" and FIND_IN_SET('{dmodel.StoresIds}',g.{nameof(RB_Goods_Extend.StoresIds)})";
}
if (dmodel.Id > 0)
{
......@@ -571,7 +571,7 @@ where {where} group by g.Id order by {orderBy}";
}
if (!string.IsNullOrEmpty(dmodel.StoresIds))
{
where += $@" and locate(',{dmodel.StoresIds},', CONCAT(',',g.{nameof(RB_Goods_Extend.StoresIds)},',') )";
where += $@" and FIND_IN_SET(',{dmodel.StoresIds},', CONCAT(',',g.{nameof(RB_Goods_Extend.StoresIds)},',') )";
}
if (!string.IsNullOrEmpty(dmodel.Name))
{
......
Mall.Repository/Reserve/RB_Reserve_CouponRepository.cs
View file @ 0f18fe62
......@@ -123,6 +123,14 @@ namespace Mall.Repository.Reserve
{
where += $" AND a.{nameof(RB_Reserve_Coupon_Extend.UserId)}={query.UserId}";
}
if (query.StoreId > 0)
{
where += $" AND ( FIND_IN_SET('{query.StoreId}', a.{nameof(RB_Reserve_Coupon_Extend.StoreIds)}) or FIND_IN_SET('0', a.{nameof(RB_Reserve_Coupon_Extend.StoreIds)} )) ";
}
else
{
where += $" AND FIND_IN_SET('0', a.{nameof(RB_Reserve_Coupon_Extend.StoreIds)})";
}
if (query.ProductList != null && query.ProductList.Any())
{
......@@ -232,14 +240,17 @@ SELECT a.ID as MemberCouponId,a.UserId,a.HeXiao,a.UseHeXiao,b.`Name`,b.UseType,b
{
where += $" AND a.{nameof(RB_Reserve_Coupon_Extend.SmallShopId)}=0";
}
if (query.StoreId > 0)
{
where += $" AND ( a.{nameof(RB_Reserve_Coupon_Extend.StoreId)}={query.StoreId} or a.{nameof(RB_Reserve_Coupon_Extend.StoreId)}=0 )";
where += $" AND ( FIND_IN_SET('{query.StoreId}', a.{nameof(RB_Reserve_Coupon_Extend.StoreIds)}) or FIND_IN_SET('0', a.{nameof(RB_Reserve_Coupon_Extend.StoreIds)} )) ";
//where += $" AND ( a.{nameof(RB_Reserve_Coupon_Extend.StoreId)}={query.StoreId} or a.{nameof(RB_Reserve_Coupon_Extend.StoreId)}=0 )";
}
else
{
where += $" AND a.{nameof(RB_Reserve_Coupon_Extend.StoreId)}=0";
where += $" AND FIND_IN_SET('0', a.{nameof(RB_Reserve_Coupon_Extend.StoreIds)})";
}
}
string sql = @$" SELECT t.*,c.MemberNum from (SELECT a.ID,a.`Name`,a.`Describe`,a.UseType,a.StartDate,a.EndDate,a.CouponIco,a.IndateDay,a.IndateType,a.TotalNum from {TableName} as a
......@@ -343,15 +354,24 @@ on a.CouponId=b.ID {where} ";
{
builder.Append($" AND a.{nameof(RB_Reserve_Coupon_Extend.SmallShopId)}=0");
}
if (query.StoreId > 0)
{
builder.Append($" AND ( a.{nameof(RB_Reserve_Coupon_Extend.StoreId)}={query.StoreId} or (a.{nameof(RB_Reserve_Coupon_Extend.StoreId)}=0 ))");
builder.Append($" AND ( FIND_IN_SET('{query.StoreId}', a.{nameof(RB_Reserve_Coupon_Extend.StoreIds)}) or FIND_IN_SET('0', a.{nameof(RB_Reserve_Coupon_Extend.StoreIds)} )) ");
//where += $" AND ( a.{nameof(RB_Reserve_Coupon_Extend.StoreId)}={query.StoreId} or a.{nameof(RB_Reserve_Coupon_Extend.StoreId)}=0 )";
}
else
{
builder.Append($" AND a.{nameof(RB_Reserve_Coupon_Extend.SmallShopId)}=0");
builder.Append($" AND FIND_IN_SET('0', a.{nameof(RB_Reserve_Coupon_Extend.StoreIds)})");
}
//if (query.StoreId > 0)
//{
// builder.Append($" AND ( a.{nameof(RB_Reserve_Coupon_Extend.StoreId)}={query.StoreId} or (a.{nameof(RB_Reserve_Coupon_Extend.StoreId)}=0 ))");
//}
//else
//{
// builder.Append($" AND a.{nameof(RB_Reserve_Coupon_Extend.SmallShopId)}=0");
//}
}
string sql = @$"SELECT a.*,b.TriggerType,b.GrantNum from rb_Reserve_couponselfmotion as b LEFT JOIN {TableName} as a on a.ID=b.DiscountCouponId
......
Mall.Repository/Reserve/RB_Reserve_ServicePersonalRepository.cs
View file @ 0f18fe62
......@@ -7,7 +7,7 @@ using System.Text;
namespace Mall.Repository.Reserve
{
public class RB_Reserve_ServicePersonalRepository:BaseRepository<RB_Reserve_ServicePersonal>
public class RB_Reserve_ServicePersonalRepository : BaseRepository<RB_Reserve_ServicePersonal>
{
/// <summary>
......@@ -103,6 +103,92 @@ LEFT JOIN (SELECT ServicePersonalId,COUNT(*) as CommentNum from rb_goods_commen
/// <summary>
///小程序端服务人员信息列表 待完善
/// </summary>
/// <param name="pageIndex">页码</param>
/// <param name="pageSize">每页显示条数</param>
/// <param name="rowCount">总条数</param>
/// <param name="query">查询条件</param>
/// <returns></returns>
public List<RB_Reserve_ServicePersonal_Extend> GetServicePersonalDetailList(int pageIndex, int pageSize, out long rowCount, RB_Reserve_ServicePersonal_Extend query)
{
StringBuilder builder = new StringBuilder();
builder.Append(@$" SELECT a.*,b.CommentNum FROM {TableName} as A
LEFT JOIN (SELECT ServicePersonalId,COUNT(*) as CommentNum from rb_goods_comment where Is_Show=1 and Status=0 GROUP by ServicePersonalId) as b on a.ID=b.ServicePersonalId WHERE a.{nameof(RB_Reserve_ServicePersonal_Extend.Status)}=0");
if (query != null)
{
if (query.TenantId > 0)
{
builder.Append($" AND a.{nameof(RB_Reserve_ServicePersonal_Extend.TenantId)}={query.TenantId}");
}
if (query.TenantId > 0)
{
builder.Append($" AND a.{nameof(RB_Reserve_ServicePersonal_Extend.MallBaseId)}={query.MallBaseId}");
}
if (query.ServiceStatus > 0)
{
builder.Append($" AND a.{nameof(RB_Reserve_ServicePersonal_Extend.ServiceStatus)}={query.ServiceStatus}");
}
if (query.StoreId > 0)
{
builder.Append($" AND a.{nameof(RB_Reserve_ServicePersonal_Extend.StoreId)}={query.StoreId}");
}
if (!string.IsNullOrWhiteSpace(query.Name))
{
builder.Append($" AND a.{nameof(RB_Reserve_ServicePersonal_Extend.Name)} like '%{query.Name}%'");
}
}
builder.Append($" order by a.{nameof(RB_Reserve_ServicePersonal_Extend.ID)} desc");
return GetPage<RB_Reserve_ServicePersonal_Extend>(pageIndex, pageSize, out rowCount, builder.ToString()).ToList();
}
/// <summary>
/// 服务人员信息排名
/// </summary>
/// <param name="query">查询条件</param>
/// <returns></returns>
public List<RB_Reserve_ServicePersonal_Extend> GetServicePersonalRank(RB_Reserve_ServicePersonal_Extend query, bool IsSelectDel = false)
{
StringBuilder builder = new StringBuilder();
if (query != null)
{
if (query.ID > 0)
{
builder.Append($" AND a.ServicepersonalId={query.ID}");
}
if (query.TenantId > 0)
{
builder.Append($" AND b.{nameof(RB_Reserve_ServicePersonal_Extend.TenantId)}={query.TenantId}");
}
if (query.TenantId > 0)
{
builder.Append($" AND b.{nameof(RB_Reserve_ServicePersonal_Extend.MallBaseId)}={query.MallBaseId}");
}
}
string sql= $@"SELECT t.ServicepersonalId,t.orderNum,
CASE
WHEN @prevRank = t.orderNum THEN @curRank
WHEN @prevRank := t.orderNum THEN @curRank := @curRank + 1
END AS Rank
FROM (SELECT a.ServicepersonalId,COUNT(*) orderNum from rb_goods_orderdetail as a LEFT JOIN rb_goods_order as b
on a.OrderId=b.OrderId where b.OrderStatus in(2,3,4,5,6) and DATE_FORMAT(b.PaymentTime,'%Y-%m-%d' )>=DATE_FORMAT('{System.DateTime.Now.AddMonths(-1)}','%Y-%m-%d' )
and DATE_FORMAT(b.PaymentTime,'%Y-%m-%d' )<= DATE_FORMAT('{System.DateTime.Now}','%Y-%m-%d' ) {builder.ToString()} GROUP BY a.ServicepersonalId ) as t,
(SELECT @curRank :=0, @prevRank := NULL) r
ORDER BY t.orderNum desc ";
return Get<RB_Reserve_ServicePersonal_Extend>(sql).ToList();
}
/// <summary>
/// 服务人员信息列表
/// </summary>
......@@ -113,39 +199,37 @@ LEFT JOIN (SELECT ServicePersonalId,COUNT(*) as CommentNum from rb_goods_commen
StringBuilder builder = new StringBuilder();
if (IsSelectDel)
{
builder.Append($" SELECT * FROM {TableName} WHERE 1=1 ");
builder.Append($" SELECT a.*,b.`Name` as StoreName,b.Address as StoreAddress FROM {TableName} as A LEFT JOIN rb_stores as b on a.StoreId=b.Id WHERE 1=1");
}
else
{
builder.Append($" SELECT * FROM {TableName} WHERE {nameof(RB_Reserve_ServicePersonal_Extend.Status)}=0 ");
builder.Append($" SELECT a.*,b.`Name` as StoreName,b.Address as StoreAddress FROM {TableName} as A LEFT JOIN rb_stores as b on a.StoreId=b.Id WHERE a.{nameof(RB_Reserve_ServicePersonal_Extend.Status)}=0");
}
if (query != null)
{
if (query.ID > 0)
{
builder.Append($" AND {nameof(RB_Reserve_ServicePersonal_Extend.ID)}={query.ID}");
}
if (query.TenantId > 0)
{
builder.Append($" AND {nameof(RB_Reserve_ServicePersonal_Extend.TenantId)}={query.TenantId}");
builder.Append($" AND a.{nameof(RB_Reserve_ServicePersonal_Extend.TenantId)}={query.TenantId}");
}
if (query.TenantId > 0)
{
builder.Append($" AND {nameof(RB_Reserve_ServicePersonal_Extend.MallBaseId)}={query.MallBaseId}");
}
if (!string.IsNullOrWhiteSpace(query.Name))
{
builder.Append($" AND {nameof(RB_Reserve_ServicePersonal_Extend.Name)} like '%{query.Name}%'");
builder.Append($" AND a.{nameof(RB_Reserve_ServicePersonal_Extend.MallBaseId)}={query.MallBaseId}");
}
if (query.ServiceStatus > 0)
{
builder.Append($" AND {nameof(RB_Reserve_ServicePersonal_Extend.ServiceStatus)}={query.ServiceStatus}");
builder.Append($" AND a.{nameof(RB_Reserve_ServicePersonal_Extend.ServiceStatus)}={query.ServiceStatus}");
}
if (query.StoreId > 0)
{
builder.Append($" AND {nameof(RB_Reserve_ServicePersonal_Extend.StoreId)}={query.StoreId}");
builder.Append($" AND a.{nameof(RB_Reserve_ServicePersonal_Extend.StoreId)}={query.StoreId}");
}
if (!string.IsNullOrWhiteSpace(query.Name))
{
builder.Append($" AND a.{nameof(RB_Reserve_ServicePersonal_Extend.Name)} like '%{query.Name}%'");
}
}
builder.Append($" order by a.{nameof(RB_Reserve_ServicePersonal_Extend.ID)} desc");
return Get<RB_Reserve_ServicePersonal_Extend>(builder.ToString()).ToList();
}
}
......
Mall.WebApi/Controllers/Reserve/AppletStoresController.cs
View file @ 0f18fe62
......@@ -136,7 +136,7 @@ namespace Mall.WebApi.Controllers.Reserve
{
Id = storeId,
MallBaseId = parms.MallBaseId,
CurrentPosition=position
CurrentPosition = position
}, isFirst: true)?.FirstOrDefault();
string serviceTime = "";
if (storeModel != null)
......@@ -162,9 +162,9 @@ namespace Mall.WebApi.Controllers.Reserve
storeScore = storeModel?.Score,
storeCoverImg = storeModel?.CoverImg,
storeNavImg = storeModel?.NavImg,
storeIntro= storeModel?.Intro,
storeProject= storeModel?.ServiceProject,
storeServiceTime= serviceTime,
storeIntro = storeModel?.Intro,
storeProject = storeModel?.ServiceProject,
storeServiceTime = serviceTime,
consumptionObj = new
{
consumptionStoreId = 0,
......@@ -187,12 +187,12 @@ namespace Mall.WebApi.Controllers.Reserve
/// <returns></returns>
[HttpPost]
[AllowAnonymous]
public ApiResult GetServicePersonalList()
public ApiResult GetServicePersonalList(object requestMsg)
{
var parms = RequestParm;
ResultPageModel pagelist = JsonConvert.DeserializeObject<ResultPageModel>(RequestParm.msg.ToString());
var parms = JsonConvert.DeserializeObject<RequestParm>(requestMsg.ToString());
ResultPageModel pagelist = JsonConvert.DeserializeObject<ResultPageModel>(parms.msg.ToString());
RB_Reserve_ServicePersonal_Extend demodel = JsonConvert.DeserializeObject<RB_Reserve_ServicePersonal_Extend>(RequestParm.msg.ToString());
demodel.TenantId = UserInfo.TenantId;
demodel.TenantId = parms.TenantId;
demodel.MallBaseId = parms.MallBaseId;
demodel.ServiceStatus = 1;
var list = reserveModule.GetMinServicePersonalList(pagelist.pageIndex, pagelist.pageSize, out long count, demodel);
......@@ -217,6 +217,77 @@ namespace Mall.WebApi.Controllers.Reserve
});
return ApiResult.Success("", pagelist);
}
/// <summary>
/// 获取详情
/// </summary>
/// <returns></returns>
[HttpPost]
[AllowAnonymous]
public ApiResult GetServicePersonalModel(object requestMsg)
{
var parms = JsonConvert.DeserializeObject<RequestParm>(requestMsg.ToString());
var query = JsonConvert.DeserializeObject<RB_Reserve_ServicePersonal_Extend>(parms.msg.ToString());
query.TenantId = parms.TenantId;
query.MallBaseId = parms.MallBaseId;
query.ServiceStatus = -1;
var oldLogisticsModel = reserveModule.GetServicePersonalList(query).FirstOrDefault();
List<RB_Goods_Extend> goodsList = new List<RB_Goods_Extend>();
if (oldLogisticsModel == null)
{
oldLogisticsModel = new RB_Reserve_ServicePersonal_Extend();
}
else
{
//获取服务人员的商品top3
long totalNum = 0;
RB_Goods_Extend goodsModel = new RB_Goods_Extend();
goodsModel.TeacherId = parms.TenantId;
goodsModel.MallBaseId = parms.MallBaseId;
goodsModel.GoodsStatus = 1;
goodsModel.StoresIds = query.StoreId.ToString();
string ids = string.Join(",", oldLogisticsModel.ProductList.Select(x => x.ProductId));
if (!string.IsNullOrWhiteSpace(ids))
{
if (oldLogisticsModel.ServiceType == Common.Enum.Reserve.ServiceTypeEnum.Category)
{
goodsModel.CategoryIds = ids;
}
else if (oldLogisticsModel.ServiceType == Common.Enum.Reserve.ServiceTypeEnum.Product)
{
goodsModel.GoodsIds = ids;
}
goodsList = offlineGoodsModule.GetServicePersonalGoodsList(1, 3, out totalNum, goodsModel, 3);
}
}
if (!string.IsNullOrWhiteSpace(oldLogisticsModel.LableName))
{
oldLogisticsModel.LableNameList = JsonConvert.DeserializeObject<List<string>>(oldLogisticsModel.LableName);
}
var result = new
{
oldLogisticsModel.ID,
oldLogisticsModel.Name,
oldLogisticsModel.ServiceLogo,
oldLogisticsModel.Score,
oldLogisticsModel.WorkYears,
oldLogisticsModel.Introduction,
oldLogisticsModel.Gender,
oldLogisticsModel.OrderNum,
oldLogisticsModel.FictitiousReserveNum,
oldLogisticsModel.Telephone,
oldLogisticsModel.LableName,
oldLogisticsModel.StoreAddress,
oldLogisticsModel.StoreName,
goodsList = goodsList.Select(x => new { x.Name, x.SellingPrice, x.DepositMoney, x.CoverImage, x.SubName, x.GoodsNumbers })
};
return ApiResult.Success("", result);
}
#endregion
......@@ -267,9 +338,9 @@ namespace Mall.WebApi.Controllers.Reserve
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult GetReserveCouponDetail()
public ApiResult GetReserveCouponDetail(object requestMsg)
{
var parms = RequestParm;
var parms = JsonConvert.DeserializeObject<RequestParm>(requestMsg.ToString());
var query = JsonConvert.DeserializeObject<RB_Reserve_Coupon_Extend>(RequestParm.msg.ToString());
query.TenantId = UserInfo.TenantId;
query.MallBaseId = parms.MallBaseId;
......@@ -278,6 +349,29 @@ namespace Mall.WebApi.Controllers.Reserve
{
return ApiResult.Failed("套餐卡信息不存在");
}
else
{
oldLogisticsModel.StoresList = new List<RB_Stores_Extend>();
//查询所属门店
if (string.IsNullOrWhiteSpace(oldLogisticsModel.StoreIds) || oldLogisticsModel.StoreIds == "0")
{
oldLogisticsModel.StoresList = contentModule.GetStoresListModule(new RB_Stores_Extend()
{
MallBaseId = parms.MallBaseId,
TenantId = parms.TenantId
});
}
else {
oldLogisticsModel.StoresList = contentModule.GetStoresListModule(new RB_Stores_Extend()
{
MallBaseId = parms.MallBaseId,
TenantId = parms.TenantId,
QIds= oldLogisticsModel.StoreIds
});
}
}
return ApiResult.Success("", oldLogisticsModel);
}
......@@ -308,14 +402,32 @@ namespace Mall.WebApi.Controllers.Reserve
{
return ApiResult.Failed("套餐卡信息不存在，请核实后再操作");
}
//if (oldLogisticsModel.StoreId > 0 && oldLogisticsModel.StoreId != query.StoreId)
//{
// return ApiResult.Failed("领取套餐卡不属于当前门店");
//}
if (oldLogisticsModel.StoreId > 0 && oldLogisticsModel.StoreId != query.StoreId)
if (!string.IsNullOrWhiteSpace(oldLogisticsModel.StoreIds))
{
return ApiResult.Failed("领取套餐卡不属于当前门店");
if (oldLogisticsModel.StoreIds != "0")
{
bool isGrantCoupon = false;
foreach (var item in oldLogisticsModel.StoreIds.Split(","))
{
if (Convert.ToInt32(item) > 0)
{
if (Convert.ToInt32(item) == query.StoreId)
{
isGrantCoupon = true;
}
}
}
if (!isGrantCoupon)
{
return ApiResult.Failed("领取套餐卡不属于当前门店");
}
}
}
if (oldLogisticsModel.TotalNum != -1)//判断套餐卡剩余数量是够足够
{
if (oldLogisticsModel.TotalNum < 1)
......@@ -647,13 +759,13 @@ namespace Mall.WebApi.Controllers.Reserve
if (list != null && list.Any())
{
if (list.Where(x => (x.GuideId ?? 0) > 0).Count() == 0)
if (list.Where(x => (x.GoodsId ?? 0) > 0).Count() == 0)
{
return ApiResult.ParamIsNull("请传递导游");
return ApiResult.ParamIsNull("请传递商品");
}
if (list.Where(x => (x.CarId ?? 0) > 0).Count() == 0)
if (list.Where(x => x.ServicePersonalId > 0).Count() == 0)
{
return ApiResult.ParamIsNull("请传递车辆");
return ApiResult.ParamIsNull("请传递服务人员信息");
}
}
else
......@@ -786,6 +898,9 @@ namespace Mall.WebApi.Controllers.Reserve
#endregion
#endregion
}
}
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