Commit f4e88060 authored by 黄奎's avatar 黄奎

页面修改

parent 09343e4d
...@@ -663,76 +663,78 @@ namespace Mall.Module.Reserve ...@@ -663,76 +663,78 @@ namespace Mall.Module.Reserve
/// <param name="gradeId"></param> /// <param name="gradeId"></param>
/// <param name="uid"></param> /// <param name="uid"></param>
/// <returns></returns> /// <returns></returns>
public bool DelDiscountCoupon(int id, int uid, int mallBaseId) public virtual bool DelDiscountCoupon(int id, int uid, int mallBaseId)
{ {
var trans = discountCouponRepository.DbTransaction;
bool flag; bool flag;
try try
{ {
Dictionary<string, object> cols1 = new Dictionary<string, object>() Dictionary<string, object> cols1 = new Dictionary<string, object>()
{
{ nameof(RB_Reserve_Coupon.Status),1},
{ nameof(RB_Reserve_Coupon.UpdateDate),DateTime.Now},
};
List<WhereHelper> wheres1 = new List<WhereHelper>()
{
new WhereHelper()
{ {
{ nameof(RB_Reserve_Coupon.Status),1},
{ nameof(RB_Reserve_Coupon.UpdateDate),DateTime.Now},
};
List<WhereHelper> wheres1 = new List<WhereHelper>() {
new WhereHelper(){
FiledName=nameof(RB_Reserve_Coupon.ID), FiledName=nameof(RB_Reserve_Coupon.ID),
FiledValue=id, FiledValue=id,
OperatorEnum=OperatorEnum.Equal OperatorEnum=OperatorEnum.Equal
}, },
new WhereHelper(){ new WhereHelper()
{
FiledName=nameof(RB_Reserve_Coupon.TenantId), FiledName=nameof(RB_Reserve_Coupon.TenantId),
FiledValue=Convert.ToInt32(uid), FiledValue=Convert.ToInt32(uid),
OperatorEnum=OperatorEnum.Equal OperatorEnum=OperatorEnum.Equal
}, },
new WhereHelper(){ new WhereHelper()
{
FiledName=nameof(RB_Reserve_Coupon.MallBaseId), FiledName=nameof(RB_Reserve_Coupon.MallBaseId),
FiledValue=Convert.ToInt32(mallBaseId), FiledValue=Convert.ToInt32(mallBaseId),
OperatorEnum=OperatorEnum.Equal OperatorEnum=OperatorEnum.Equal
} }
}; };
flag = discountCouponRepository.Update(cols1, wheres1); flag = discountCouponRepository.Update(cols1, wheres1);
Dictionary<string, object> cols = new Dictionary<string, object>() Dictionary<string, object> cols = new Dictionary<string, object>()
{
{ nameof(RB_Reserve_Coupon.Status),1},
{ nameof(RB_Reserve_Coupon.UpdateDate),DateTime.Now},
};
List<WhereHelper> wheres = new List<WhereHelper>()
{
new WhereHelper()
{ {
{ nameof(RB_Reserve_Coupon.Status),1},
{ nameof(RB_Reserve_Coupon.UpdateDate),DateTime.Now},
};
List<WhereHelper> wheres = new List<WhereHelper>() {
new WhereHelper(){
FiledName=nameof(RB_Reserve_CouponProduct.CouponId), FiledName=nameof(RB_Reserve_CouponProduct.CouponId),
FiledValue=id, FiledValue=id,
OperatorEnum=OperatorEnum.Equal OperatorEnum=OperatorEnum.Equal
}, },
new WhereHelper(){ new WhereHelper()
{
FiledName=nameof(RB_Reserve_CouponProduct.TenantId), FiledName=nameof(RB_Reserve_CouponProduct.TenantId),
FiledValue=Convert.ToInt32(uid), FiledValue=Convert.ToInt32(uid),
OperatorEnum=OperatorEnum.Equal OperatorEnum=OperatorEnum.Equal
}, },
new WhereHelper(){ new WhereHelper()
{
FiledName=nameof(RB_Reserve_CouponProduct.MallBaseId), FiledName=nameof(RB_Reserve_CouponProduct.MallBaseId),
FiledValue=Convert.ToInt32(mallBaseId), FiledValue=Convert.ToInt32(mallBaseId),
OperatorEnum=OperatorEnum.Equal OperatorEnum=OperatorEnum.Equal
} }
}; };
productRepository.Update(cols, wheres); if (flag)
{
flag=productRepository.Update(cols, wheres);
discountCouponRepository.DBSession.Commit(); }
} }
catch (Exception ex) catch (Exception ex)
{ {
LogHelper.Write(ex, "DelDiscountCoupon"); LogHelper.Write(ex, "DelDiscountCoupon");
discountCouponRepository.DBSession.Rollback("DelDiscountCoupon"); flag=false;
return false;
} }
return flag; return flag;
} }
/// <summary> /// <summary>
/// 删除会员套餐卡 /// 删除会员套餐卡
/// </summary> /// </summary>
...@@ -1046,66 +1048,71 @@ namespace Mall.Module.Reserve ...@@ -1046,66 +1048,71 @@ namespace Mall.Module.Reserve
/// <returns></returns> /// <returns></returns>
public bool DelDiscountSelfMotion(int id, int uid, int mallBaseId) public bool DelDiscountSelfMotion(int id, int uid, int mallBaseId)
{ {
var trans = selfMotionRepository.DbTransaction;
bool flag; bool flag;
try try
{ {
Dictionary<string, object> cols1 = new Dictionary<string, object>() Dictionary<string, object> cols1 = new Dictionary<string, object>()
{
{ nameof(RB_Reserve_CouponSelfMotion.Status),1},
{ nameof(RB_Reserve_CouponSelfMotion.UpdateDate),DateTime.Now},
};
List<WhereHelper> wheres1 = new List<WhereHelper>()
{
new WhereHelper()
{ {
{ nameof(RB_Reserve_CouponSelfMotion.Status),1},
{ nameof(RB_Reserve_CouponSelfMotion.UpdateDate),DateTime.Now},
};
List<WhereHelper> wheres1 = new List<WhereHelper>() {
new WhereHelper(){
FiledName=nameof(RB_Reserve_CouponSelfMotion.ID), FiledName=nameof(RB_Reserve_CouponSelfMotion.ID),
FiledValue=id, FiledValue=id,
OperatorEnum=OperatorEnum.Equal OperatorEnum=OperatorEnum.Equal
}, },
new WhereHelper(){ new WhereHelper()
{
FiledName=nameof(RB_Reserve_CouponSelfMotion.TenantId), FiledName=nameof(RB_Reserve_CouponSelfMotion.TenantId),
FiledValue=Convert.ToInt32(uid), FiledValue=Convert.ToInt32(uid),
OperatorEnum=OperatorEnum.Equal OperatorEnum=OperatorEnum.Equal
}, },
new WhereHelper(){ new WhereHelper()
{
FiledName=nameof(RB_Reserve_CouponSelfMotion.MallBaseId), FiledName=nameof(RB_Reserve_CouponSelfMotion.MallBaseId),
FiledValue=Convert.ToInt32(mallBaseId), FiledValue=Convert.ToInt32(mallBaseId),
OperatorEnum=OperatorEnum.Equal OperatorEnum=OperatorEnum.Equal
} }
}; };
flag = selfMotionRepository.Update(cols1, wheres1); flag = selfMotionRepository.Update(cols1, wheres1);
Dictionary<string, object> cols = new Dictionary<string, object>() Dictionary<string, object> cols = new Dictionary<string, object>()
{
{ nameof(RB_Reserve_CouponSelfMotionMember.Status),1},
{ nameof(RB_Reserve_CouponSelfMotionMember.UpdateDate),DateTime.Now},
};
List<WhereHelper> wheres = new List<WhereHelper>()
{
new WhereHelper()
{ {
{ nameof(RB_Reserve_CouponSelfMotionMember.Status),1},
{ nameof(RB_Reserve_CouponSelfMotionMember.UpdateDate),DateTime.Now},
};
List<WhereHelper> wheres = new List<WhereHelper>() {
new WhereHelper(){
FiledName=nameof(RB_Reserve_CouponSelfMotionMember.SelfMotionId), FiledName=nameof(RB_Reserve_CouponSelfMotionMember.SelfMotionId),
FiledValue=id, FiledValue=id,
OperatorEnum=OperatorEnum.Equal OperatorEnum=OperatorEnum.Equal
}, },
new WhereHelper(){ new WhereHelper()
{
FiledName=nameof(RB_Reserve_CouponSelfMotionMember.TenantId), FiledName=nameof(RB_Reserve_CouponSelfMotionMember.TenantId),
FiledValue=Convert.ToInt32(uid), FiledValue=Convert.ToInt32(uid),
OperatorEnum=OperatorEnum.Equal OperatorEnum=OperatorEnum.Equal
}, },
new WhereHelper(){ new WhereHelper()
{
FiledName=nameof(RB_Reserve_CouponSelfMotionMember.MallBaseId), FiledName=nameof(RB_Reserve_CouponSelfMotionMember.MallBaseId),
FiledValue=Convert.ToInt32(mallBaseId), FiledValue=Convert.ToInt32(mallBaseId),
OperatorEnum=OperatorEnum.Equal OperatorEnum=OperatorEnum.Equal
} }
}; };
selfMotionMemberRepository.Update(cols, wheres); if (flag)
{
flag = selfMotionMemberRepository.Update(cols, wheres);
selfMotionRepository.DBSession.Commit(); }
} }
catch (Exception ex) catch (Exception ex)
{ {
LogHelper.Write(ex, "DelDiscountSelfMotion"); LogHelper.Write(ex, "DelDiscountSelfMotion");
selfMotionRepository.DBSession.Rollback("DelDiscountSelfMotion"); flag = false;
return false;
} }
return flag; return flag;
} }
......
...@@ -28,8 +28,8 @@ namespace Mall.WebApi.Controllers.Reserve ...@@ -28,8 +28,8 @@ namespace Mall.WebApi.Controllers.Reserve
public class ReserveController : BaseController public class ReserveController : BaseController
{ {
private readonly ReserveModule reserveModule = new ReserveModule(); private readonly ReserveModule reserveModule =AOPHelper.CreateAOPObject<ReserveModule>();
private Module.User.UserModule UserModule = new Module.User.UserModule(); private readonly Module.User.UserModule UserModule = new Module.User.UserModule();
/// <summary> /// <summary>
/// 门店处理类对象 /// 门店处理类对象
/// </summary> /// </summary>
...@@ -338,7 +338,6 @@ namespace Mall.WebApi.Controllers.Reserve ...@@ -338,7 +338,6 @@ namespace Mall.WebApi.Controllers.Reserve
[HttpPost] [HttpPost]
public ApiResult GetServiceTargetDateList() public ApiResult GetServiceTargetDateList()
{ {
var parms = RequestParm;
var query = JsonConvert.DeserializeObject<RB_Reserve_ServiceTargetDate_Extend>(RequestParm.msg.ToString()); var query = JsonConvert.DeserializeObject<RB_Reserve_ServiceTargetDate_Extend>(RequestParm.msg.ToString());
var list = reserveModule.GetServiceTargetDateList(query); var list = reserveModule.GetServiceTargetDateList(query);
List<string> result = new List<string>(); List<string> result = new List<string>();
...@@ -464,10 +463,11 @@ namespace Mall.WebApi.Controllers.Reserve ...@@ -464,10 +463,11 @@ namespace Mall.WebApi.Controllers.Reserve
var oldLogisticsModel = reserveModule.GetDiscountCouponList(query).FirstOrDefault(); var oldLogisticsModel = reserveModule.GetDiscountCouponList(query).FirstOrDefault();
if (oldLogisticsModel == null) if (oldLogisticsModel == null)
{ {
oldLogisticsModel = new RB_Reserve_Coupon_Extend(); oldLogisticsModel = new RB_Reserve_Coupon_Extend
oldLogisticsModel.IndateType = Common.Enum.MarketingCenter.IndateTypeEnum.DayHorizon; {
IndateType = Common.Enum.MarketingCenter.IndateTypeEnum.DayHorizon
};
} }
return ApiResult.Success("", oldLogisticsModel); return ApiResult.Success("", oldLogisticsModel);
} }
...@@ -643,19 +643,21 @@ namespace Mall.WebApi.Controllers.Reserve ...@@ -643,19 +643,21 @@ namespace Mall.WebApi.Controllers.Reserve
{ {
if (!string.IsNullOrWhiteSpace(item)) if (!string.IsNullOrWhiteSpace(item))
{ {
RB_Reserve_MemberCoupon_Extend memberCoupon = new RB_Reserve_MemberCoupon_Extend(); RB_Reserve_MemberCoupon_Extend memberCoupon = new RB_Reserve_MemberCoupon_Extend
memberCoupon.Id = 0; {
memberCoupon.UserId = Convert.ToInt32(item); Id = 0,
memberCoupon.Description = oldLogisticsModel.Describe; UserId = Convert.ToInt32(item),
memberCoupon.CreateDate = System.DateTime.Now; Description = oldLogisticsModel.Describe,
memberCoupon.TenantId = oldLogisticsModel.TenantId; CreateDate = System.DateTime.Now,
memberCoupon.MallBaseId = oldLogisticsModel.MallBaseId; TenantId = oldLogisticsModel.TenantId,
memberCoupon.Remarks = ""; MallBaseId = oldLogisticsModel.MallBaseId,
memberCoupon.CouponId = oldLogisticsModel.ID; Remarks = "",
memberCoupon.Name = oldLogisticsModel.Name; CouponId = oldLogisticsModel.ID,
memberCoupon.UseType = oldLogisticsModel.UseType; Name = oldLogisticsModel.Name,
memberCoupon.HeXiao = oldLogisticsModel.HeXiao; UseType = oldLogisticsModel.UseType,
memberCoupon.UseHeXiao = 0; HeXiao = oldLogisticsModel.HeXiao,
UseHeXiao = 0
};
if (oldLogisticsModel.IndateType == Common.Enum.MarketingCenter.IndateTypeEnum.DayHorizon) if (oldLogisticsModel.IndateType == Common.Enum.MarketingCenter.IndateTypeEnum.DayHorizon)
{ {
memberCoupon.StartDate = System.DateTime.Now; memberCoupon.StartDate = System.DateTime.Now;
...@@ -1022,20 +1024,22 @@ namespace Mall.WebApi.Controllers.Reserve ...@@ -1022,20 +1024,22 @@ namespace Mall.WebApi.Controllers.Reserve
var tempOrderList = orderList.Where(x => x.ServicepersonalId == item.Id && day <= Convert.ToDateTime(x.ServiceDate + " " + x.ServiceTime) && Convert.ToDateTime(x.ServiceDate + " " + x.ServiceTime) < day.AddMinutes(30)); var tempOrderList = orderList.Where(x => x.ServicepersonalId == item.Id && day <= Convert.ToDateTime(x.ServiceDate + " " + x.ServiceTime) && Convert.ToDateTime(x.ServiceDate + " " + x.ServiceTime) < day.AddMinutes(30));
foreach (var itemOrder in tempOrderList) foreach (var itemOrder in tempOrderList)
{ {
OrderKanBan orderModel = new OrderKanBan(); OrderKanBan orderModel = new OrderKanBan
orderModel.Id = item.Id; {
orderModel.Name = item.Name; Id = item.Id,
orderModel.GoodsName = itemOrder.GoodsName; Name = item.Name,
orderModel.ServiceTime = itemOrder.ServiceTime; GoodsName = itemOrder.GoodsName,
orderModel.SystemServiceTime = nowTimeInfo; ServiceTime = itemOrder.ServiceTime,
orderModel.GoodServiceTime = itemOrder.GoodServiceTime; SystemServiceTime = nowTimeInfo,
orderModel.UserName = itemOrder.UserName; GoodServiceTime = itemOrder.GoodServiceTime,
orderModel.UserPhoto = itemOrder.UserPhoto; UserName = itemOrder.UserName,
orderModel.OrderId = itemOrder.OrderId ?? 0; UserPhoto = itemOrder.UserPhoto,
orderModel.OrderDetailId = itemOrder.Id; OrderId = itemOrder.OrderId ?? 0,
orderModel.Number = itemOrder.Number ?? 0; OrderDetailId = itemOrder.Id,
orderModel.BuyerMessage = itemOrder.BuyerMessage; Number = itemOrder.Number ?? 0,
orderModel.Mobile = itemOrder.Mobile; BuyerMessage = itemOrder.BuyerMessage,
Mobile = itemOrder.Mobile
};
item.OrderList.Add(orderModel); item.OrderList.Add(orderModel);
} }
} }
......
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