Skip to content

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

页面修改

parent 753f345e
Hide whitespace changes
Inline Side-by-side
Showing with 64 additions and 63 deletions
Mall.Module.TradePavilion/FirstShopListModule.cs
View file @ 7296dd4b
......@@ -412,9 +412,8 @@ namespace Mall.Module.TradePavilion
/// 取消报名
/// </summary>
/// <param name="enrollId"></param>
/// <param name="userInfo"></param>
/// <returns></returns>
public string CancelAppletFirstShopListInfo(int enrollId, AppletUserInfo userInfo)
public string CancelAppletFirstShopListInfo(int enrollId)
{
Dictionary<string, object> keyValues = new Dictionary<string, object>() {
{ nameof(RB_FirstShop_ListEnroll_Extend.Status),1},
......
Mall.WebApi/Controllers/Education/EducationController.cs
View file @ 7296dd4b
......@@ -1029,10 +1029,11 @@ namespace Mall.WebApi.Controllers.Education
var oldLogisticsModel = educationModule.GetDiscountCouponList(query).FirstOrDefault();
if (oldLogisticsModel == null)
{
oldLogisticsModel = new RB_Education_Coupon_Extend();
oldLogisticsModel.IndateType = Common.Enum.MarketingCenter.IndateTypeEnum.DayHorizon;
oldLogisticsModel = new RB_Education_Coupon_Extend
{
IndateType = Common.Enum.MarketingCenter.IndateTypeEnum.DayHorizon
};
}
return ApiResult.Success("", oldLogisticsModel);
}
......@@ -1207,19 +1208,21 @@ namespace Mall.WebApi.Controllers.Education
{
if (!string.IsNullOrWhiteSpace(item))
{
RB_Education_MemberCoupon_Extend memberCoupon = new RB_Education_MemberCoupon_Extend();
memberCoupon.Id = 0;
memberCoupon.UserId = Convert.ToInt32(item);
memberCoupon.Description = oldLogisticsModel.Describe;
memberCoupon.CreateDate = System.DateTime.Now;
memberCoupon.TenantId = oldLogisticsModel.TenantId;
memberCoupon.MallBaseId = oldLogisticsModel.MallBaseId;
memberCoupon.Remarks = "";
memberCoupon.CouponId = oldLogisticsModel.ID;
memberCoupon.Name = oldLogisticsModel.Name;
memberCoupon.UseType = oldLogisticsModel.UseType;
memberCoupon.HeXiao = oldLogisticsModel.HeXiao;
memberCoupon.UseHeXiao = 0;
RB_Education_MemberCoupon_Extend memberCoupon = new RB_Education_MemberCoupon_Extend
{
Id = 0,
UserId = Convert.ToInt32(item),
Description = oldLogisticsModel.Describe,
CreateDate = System.DateTime.Now,
TenantId = oldLogisticsModel.TenantId,
MallBaseId = oldLogisticsModel.MallBaseId,
Remarks = "",
CouponId = oldLogisticsModel.ID,
Name = oldLogisticsModel.Name,
UseType = oldLogisticsModel.UseType,
HeXiao = oldLogisticsModel.HeXiao,
UseHeXiao = 0
};
if (oldLogisticsModel.IndateType == Common.Enum.MarketingCenter.IndateTypeEnum.DayHorizon)
{
memberCoupon.StartDate = System.DateTime.Now;
......@@ -2346,7 +2349,7 @@ namespace Mall.WebApi.Controllers.Education
x.RefundPrice,
x.IsCommission,
x.CommissionPrice,
PlatformTax = x.PlatformTax,//(x.PaymentWay == OrderPaymentTypeEnum.OnlinePayment ? ((x.Status == 0 && x.OrderStatus == 1) ? (Math.Round((Convert.ToDecimal(Config.SettlementRate) / 100) * (Convert.ToDecimal(x.Money)), 2, MidpointRounding.AwayFromZero)) : 0) : x.PlatformTax),
x.PlatformTax,//(x.PaymentWay == OrderPaymentTypeEnum.OnlinePayment ? ((x.Status == 0 && x.OrderStatus == 1) ? (Math.Round((Convert.ToDecimal(Config.SettlementRate) / 100) * (Convert.ToDecimal(x.Money)), 2, MidpointRounding.AwayFromZero)) : 0) : x.PlatformTax),
DueInMoney = x.Money - x.Income - x.PlatformTax - x.RefundPrice,
PaymentWay = x.PaymentWay.HasValue ? (int)x.PaymentWay : 0,
PaymentWayName = (x.Money == 0 && x.TotalPoint == 0) ? "免费" : (x.PaymentWay.HasValue ? EnumHelper.GetEnumName(x.PaymentWay) : ""),
......@@ -2406,7 +2409,7 @@ namespace Mall.WebApi.Controllers.Education
x.Money,
x.Income,
x.RefundPrice,
PlatformTax = x.PlatformTax,//(x.PaymentWay == OrderPaymentTypeEnum.OnlinePayment ? ((x.Status == 0 && x.OrderStatus == 1) ? (Math.Round((Convert.ToDecimal(Config.SettlementRate) / 100) * (Convert.ToDecimal(x.Money)), 2, MidpointRounding.AwayFromZero)) : 0) : x.PlatformTax),
x.PlatformTax,//(x.PaymentWay == OrderPaymentTypeEnum.OnlinePayment ? ((x.Status == 0 && x.OrderStatus == 1) ? (Math.Round((Convert.ToDecimal(Config.SettlementRate) / 100) * (Convert.ToDecimal(x.Money)), 2, MidpointRounding.AwayFromZero)) : 0) : x.PlatformTax),
x.ApplyForCancelStatus,
x.CancelRemark,
x.ActivityName,
......@@ -3515,11 +3518,12 @@ namespace Mall.WebApi.Controllers.Education
{
return ApiResult.ParamIsNull();
}
Rb_Education_School_Extend demodel = new Rb_Education_School_Extend();
demodel.TenantId = UserInfo.TenantId;
demodel.MallBaseId = parms.MallBaseId;
demodel.Id = Id;
//demodel.TeacherStatus = -1;
Rb_Education_School_Extend demodel = new Rb_Education_School_Extend
{
TenantId = UserInfo.TenantId,
MallBaseId = parms.MallBaseId,
Id = Id
};
var model = educationModule.GetEducationSchoolList(demodel);
var result = model.Select(x => new
{
......@@ -3591,10 +3595,12 @@ namespace Mall.WebApi.Controllers.Education
{
return ApiResult.Failed("请传递参数");
}
Rb_Education_School_Extend demodel = new Rb_Education_School_Extend();
demodel.TenantId = UserInfo.TenantId;
demodel.MallBaseId = parms.MallBaseId;
demodel.Ids = idInfo;
Rb_Education_School_Extend demodel = new Rb_Education_School_Extend
{
TenantId = UserInfo.TenantId,
MallBaseId = parms.MallBaseId,
Ids = idInfo
};
var list = educationModule.GetEducationSchoolList(demodel);
if (list.Any(x => x.UserCount > 0))
{
......
Mall.WebApi/Controllers/TradePavilion/AppletTradeController.cs
View file @ 7296dd4b
......@@ -26,11 +26,6 @@ namespace Mall.WebApi.Controllers.TradePavilion
[EnableCors("AllowCors")]
public class AppletTradeController : BaseController
{
/// <summary>
/// 联系人处理类对象
/// </summary>
private readonly ContractModule module = new ContractModule();
/// <summary>
/// 投资采购处理类对象
/// </summary>
......@@ -1073,15 +1068,17 @@ namespace Mall.WebApi.Controllers.TradePavilion
foreach (var item in firstShopModel.FirstShopLinkManList)
{
RB_Commerce_Consult_Extend demodel = new RB_Commerce_Consult_Extend();
demodel.ActivityName = model.ActivityName;
demodel.LinkMan = item.LinkMan;
demodel.LinkTel = item.LinkTel;
demodel.Post = item.Post;
demodel.CompanyName = firstShopModel.CompanyName;
demodel.ActivityIds = firstShopModel.ActivityIds;
demodel.CountryInfo = item.CountryInfo;
demodel.Nature = firstShopModel.Nature;
RB_Commerce_Consult_Extend demodel = new RB_Commerce_Consult_Extend
{
ActivityName = model.ActivityName,
LinkMan = item.LinkMan,
LinkTel = item.LinkTel,
Post = item.Post,
CompanyName = firstShopModel.CompanyName,
ActivityIds = firstShopModel.ActivityIds,
CountryInfo = item.CountryInfo,
Nature = firstShopModel.Nature
};
Random R = new Random();
int Rstr = R.Next(111, 999);
demodel.ActivityId = model.Id;
......@@ -1877,16 +1874,15 @@ namespace Mall.WebApi.Controllers.TradePavilion
public ApiResult GetBrandClassList()
{
JObject parms = JObject.Parse(RequestParm.msg.ToString());
var query = new RB_BrandClass_Extend();
query.MallBaseId = RequestParm.MallBaseId;
query.TenantId = RequestParm.TenantId;
var query = new RB_BrandClass_Extend
{
MallBaseId = RequestParm.MallBaseId,
TenantId = RequestParm.TenantId
};
var list = carrierModule.GetBrandClassList(query);
return ApiResult.Success(data: list);
}
#region 奖章
[HttpPost]
[AllowAnonymous]
......@@ -1925,18 +1921,19 @@ namespace Mall.WebApi.Controllers.TradePavilion
public ApiResult GetMyBrandList()
{
var userInfo = base.AppletUserInfo;
JObject parms = JObject.Parse(RequestParm.msg.ToString());
var query = new RB_Brand_Extend();
query.MallBaseId = userInfo.MallBaseId;
query.TenantId = userInfo.TenantId;
query.RanQi = -1;
query.KongTiao = -1;
query.XinFeng = -1;
query.Plumbing = -1;
query.Caliber = -1;
query.PaiYan = -1;
query.Sewage = -1;
query.UserId = userInfo.UserId;
var query = new RB_Brand_Extend
{
MallBaseId = userInfo.MallBaseId,
TenantId = userInfo.TenantId,
RanQi = -1,
KongTiao = -1,
XinFeng = -1,
Plumbing = -1,
Caliber = -1,
PaiYan = -1,
Sewage = -1,
UserId = userInfo.UserId
};
var extList = carrierModule.GetBrandListByWhere(query);
return ApiResult.Success(data: extList);
}
......@@ -2385,8 +2382,7 @@ namespace Mall.WebApi.Controllers.TradePavilion
{
return ApiResult.ParamIsNull();
}
string msg = firstShopListModule.CancelAppletFirstShopListInfo(EnrollId, userInfo);
string msg = firstShopListModule.CancelAppletFirstShopListInfo(EnrollId);
if (msg == "")
{
return ApiResult.Success();
......
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