Commit 35c20869 authored by 吴春's avatar 吴春

提交

parent a704dfc6
using Mall.Common.Plugin;
using System;
using System.Collections.Generic;
using System.Text;
namespace Mall.Common.Enum.MallBase
{
public enum ChargeModeEnum
{
/// <summary>
/// 按重计费
/// </summary>
[EnumField("按重计费")]
Weight = 1,
/// <summary>
/// 按件计费
/// </summary>
[EnumField("按件计费")]
Num = 2
}
}
using Mall.Common.Plugin;
using System;
using System.Collections.Generic;
using System.Text;
namespace Mall.Common.Enum.MarketingCenter
{
public enum RecordTypeEnum
{
/// <summary>
/// 收入
/// </summary>
[EnumField("+")]
Income = 1,
/// <summary>
/// 支出
/// </summary>
[EnumField("-")]
Expend = 2,
}
}
......@@ -38,7 +38,7 @@ namespace Mall.Model.Entity.BaseSetUp
/// <summary>
/// 计费方式
/// </summary>
public int ChargeMode { get; set; }
public ChargeModeEnum ChargeMode { get; set; }
public int Status { get; set; }
......
using Mall.Common.AOP;
using System;
using System.Collections.Generic;
using System.Text;
namespace Mall.Model.Entity.MarketingCenter
{
/// <summary>
/// 积分设置
/// </summary>
[Serializable]
[DB(ConnectionName = "DefaultConnection")]
public class RB_Integral_Settings
{
public int ID { get; set; }
/// <summary>
/// 商户id
/// </summary>
public int TenantId { get; set; }
/// <summary>
/// 小程序id
/// </summary>
public int MallBaseId { get; set; }
public int Status { get; set; }
public DateTime CreateDate { get; set; }
public DateTime UpdateDate { get; set; }
/// <summary>
/// 用户积分使用规则
/// </summary>
public string Explain { get; set; }
/// <summary>
/// 用户积分
/// </summary>
public int IntegralNum { get; set; }
}
}
using Mall.Common.AOP;
using System;
using System.Collections.Generic;
using System.Text;
namespace Mall.Model.Entity.MarketingCenter
{
/// <summary>
/// 充值设置
/// </summary>
[Serializable]
[DB(ConnectionName = "DefaultConnection")]
public class RB_Recharge_Settings
{
public int ID { get; set; }
/// <summary>
/// 商户id
/// </summary>
public int TenantId { get; set; }
/// <summary>
/// 小程序id
/// </summary>
public int MallBaseId { get; set; }
public int Status { get; set; }
public DateTime CreateDate { get; set; }
public DateTime UpdateDate { get; set; }
/// <summary>
/// 开启余额功能0-否,1-是
/// </summary>
public int IsOpenBalance { get; set; }
/// <summary>
/// 是否开放自定义金额,0-否,1-是
/// </summary>
public int IsExploitMoney { get; set; }
/// <summary>
/// 背景图片
/// </summary>
public string BackImg { get; set; }
/// <summary>
/// 广告图片
/// </summary>
public string AdvertisingImg { get; set; }
/// <summary>
/// 广告图片跳转链接
/// </summary>
public string AdvertisingLink { get; set; }
/// <summary>
/// 充值说明图标
/// </summary>
public string ExplainIco { get; set; }
/// <summary>
/// 充值说明
/// </summary>
public string Explain { get; set; }
}
}
using Mall.Common.AOP;
using Mall.Common.Enum.MarketingCenter;
using Mall.Common.Enum.User;
using System;
using System.Collections.Generic;
......@@ -29,7 +30,7 @@ namespace Mall.Model.Entity.User
/// <summary>
/// 类型 1增加 2减少
/// </summary>
public int? Type
public RecordTypeEnum? Type
{
get;
set;
......@@ -82,5 +83,9 @@ namespace Mall.Model.Entity.User
get;
set;
}
/// <summary>
/// 备注
/// </summary>
public string Remarks { get; set; }
}
}
......@@ -13,6 +13,19 @@ namespace Mall.Model.Extend.User
[DB(ConnectionName = "DefaultConnection")]
public class RB_Member_Integral_Extend : RB_Member_Integral
{
/// <summary>
/// 会员名称
/// </summary>
public string MemberName { get; set; }
/// <summary>
/// 开始时间【查询使用】
/// </summary>
public string StartDate { get; set; }
/// <summary>
/// 结束时间【查询使用】
/// </summary>
public string EndDate { get; set; }
}
}
using Mall.Model.Entity.MarketingCenter;
using Mall.Model.Extend.MarketingCenter;
using Mall.Model.Extend.User;
using Mall.Repository.MarketingCenter;
using Mall.Repository.User;
using System;
using System.Collections.Generic;
using System.Text;
namespace Mall.Module.MarketingCenter
{
public class IntegralModule
{
private RB_Integral_SettingsRepository settingsRepository = new RB_Integral_SettingsRepository();
private RB_Member_IntegralRepository recordRepository = new RB_Member_IntegralRepository();
#region 积分设置
/// <summary>
/// 积分设置列表
/// </summary>
/// <param name="query">查询条件</param>
/// <returns></returns>
public List<RB_Integral_Settings> GetIntegralSettingsList(RB_Integral_Settings query)
{
return settingsRepository.GetIntegralSettingsList(query);
}
/// <summary>
/// 新增修改积分
/// </summary>
/// <param name="model"></param>
/// <returns></returns>
public bool AddOrUpdateIntegralSettings(RB_Integral_Settings model)
{
if (model.ID == 0)
{
return settingsRepository.Insert(model) > 0;
}
else
{
return settingsRepository.Update(model);
}
}
#endregion
#region 积分记录
/// <summary>
/// 积分记录列表
/// </summary>
/// <param name="pageIndex">页码</param>
/// <param name="pageSize">每页显示条数</param>
/// <param name="rowCount">总条数</param>
/// <param name="query">查询条件</param>
/// <returns></returns>
public List<RB_Member_Integral_Extend> GetRechargeRecordPageList(int pageIndex, int pageSize, out long rowCount, RB_Member_Integral_Extend query)
{
return recordRepository.GetRechargeRecordPageList(pageIndex, pageSize, out rowCount, query);
}
#endregion
}
}
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework>
<TargetFramework>netcoreapp3.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\Mall.Common\Mall.Common.csproj" />
<ProjectReference Include="..\Mall.Model\Mall.Model.csproj" />
<ProjectReference Include="..\Mall.Repository\Mall.Repository.csproj" />
</ItemGroup>
......
using Mall.Model.Extend.MarketingCenter;
using Mall.Common.Plugin;
using Mall.Model.Entity.MarketingCenter;
using Mall.Model.Extend.MarketingCenter;
using Mall.Repository;
using Mall.Repository.MarketingCenter;
using System;
using System.Collections.Generic;
......@@ -11,7 +14,9 @@ namespace Mall.Module.MarketingCenter
private RB_Recharge_RulesRepository rulesRepository = new RB_Recharge_RulesRepository();
#region 充值信息
private RB_Recharge_SettingsRepository settingsRepository = new RB_Recharge_SettingsRepository();
#region 充值规则信息
/// <summary>
/// 充值信息列表
/// </summary>
......@@ -49,7 +54,76 @@ namespace Mall.Module.MarketingCenter
}
}
/// <summary>
/// 删除充值方案
/// </summary>
/// <param name="gradeId"></param>
/// <param name="uid"></param>
/// <returns></returns>
public bool DelRechargeRules(int id, int uid, int mallBaseId)
{
try
{
Dictionary<string, object> cols = new Dictionary<string, object>()
{
{ nameof(RB_Recharge_Rules.Status),1},
{ nameof(RB_Recharge_Rules.UpdateDate),DateTime.Now},
};
List<WhereHelper> wheres1 = new List<WhereHelper>() {
new WhereHelper(){
FiledName=nameof(RB_Recharge_Rules.ID),
FiledValue=id,
OperatorEnum=OperatorEnum.Equal
},
new WhereHelper(){
FiledName=nameof(RB_Recharge_Rules.TenantId),
FiledValue=Convert.ToInt32(uid),
OperatorEnum=OperatorEnum.Equal
},
new WhereHelper(){
FiledName=nameof(RB_Recharge_Rules.MallBaseId),
FiledValue=Convert.ToInt32(mallBaseId),
OperatorEnum=OperatorEnum.Equal
}
};
return rulesRepository.Update(cols, wheres1);
}
catch (Exception ex)
{
LogHelper.Write(ex, "DelRechargeRules");
return false;
}
}
#endregion
#region 充值设置
/// <summary>
/// 充值设置列表
/// </summary>
/// <param name="query">查询条件</param>
/// <returns></returns>
public List<RB_Recharge_Settings> GetRechargeSettingsList(RB_Recharge_Settings query)
{
return settingsRepository.GetRechargeSettingsList(query);
}
public bool AddOrUpdateRechargeSettings(RB_Recharge_Settings model)
{
if (model.ID == 0)
{
return settingsRepository.Insert(model) > 0;
}
else
{
return settingsRepository.Update(model);
}
}
#endregion
}
}
......@@ -431,7 +431,7 @@ namespace Mall.Module.User
{
var umodel = member_UserRepository.GetEntity(demodel.UserId);
int Integral = 0;
if (demodel.Type == 1)
if ((int)demodel.Type == 1)
{
Integral = (umodel.Integral ?? 0) + (demodel.Integral ?? 0);
}
......
using Mall.Model.Entity.MarketingCenter;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
namespace Mall.Repository.MarketingCenter
{
/// <summary>
/// 积分设置
/// </summary>
public class RB_Integral_SettingsRepository : RepositoryBase<RB_Integral_Settings>
{
/// <summary>
/// 表名称
/// </summary>
public string TableName { get { return nameof(RB_Integral_Settings); } }
/// <summary>
/// 积分设置列表
/// </summary>
/// <param name="query">查询条件</param>
/// <returns></returns>
public List<RB_Integral_Settings> GetIntegralSettingsList(RB_Integral_Settings query)
{
StringBuilder builder = new StringBuilder();
builder.Append($" SELECT * FROM {TableName} WHERE {nameof(RB_Integral_Settings.Status)}=0 ");
if (query != null)
{
if (query.ID > 0)
{
builder.Append($" AND {nameof(RB_Integral_Settings.ID)}={query.ID}");
}
if (query.TenantId > 0)
{
builder.Append($" AND {nameof(RB_Integral_Settings.TenantId)}={query.TenantId}");
}
if (query.TenantId > 0)
{
builder.Append($" AND {nameof(RB_Integral_Settings.MallBaseId)}={query.MallBaseId}");
}
}
return Get<RB_Integral_Settings>(builder.ToString()).ToList();
}
}
}
using Mall.Model.Entity.MarketingCenter;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
namespace Mall.Repository.MarketingCenter
{
/// <summary>
/// 充值设置仓储层
/// </summary>
public class RB_Recharge_SettingsRepository : RepositoryBase<RB_Recharge_Settings>
{
/// <summary>
/// 表名称
/// </summary>
public string TableName { get { return nameof(RB_Recharge_Settings); } }
/// <summary>
/// 充值设置列表
/// </summary>
/// <param name="query">查询条件</param>
/// <returns></returns>
public List<RB_Recharge_Settings> GetRechargeSettingsList(RB_Recharge_Settings query)
{
StringBuilder builder = new StringBuilder();
builder.Append($" SELECT * FROM {TableName} WHERE {nameof(RB_Recharge_Settings.Status)}=0 ");
if (query != null)
{
if (query.ID > 0)
{
builder.Append($" AND {nameof(RB_Recharge_Settings.ID)}={query.ID}");
}
if (query.TenantId > 0)
{
builder.Append($" AND {nameof(RB_Recharge_Settings.TenantId)}={query.TenantId}");
}
if (query.TenantId > 0)
{
builder.Append($" AND {nameof(RB_Recharge_Settings.MallBaseId)}={query.MallBaseId}");
}
}
return Get<RB_Recharge_Settings>(builder.ToString()).ToList();
}
}
}
......@@ -12,7 +12,11 @@ namespace Mall.Repository.User
/// </summary>
public class RB_Member_IntegralRepository : RepositoryBase<RB_Member_Integral>
{
public string MemberTableName { get { return nameof(RB_Member_User); } }
/// <summary>
/// 表名称
/// </summary>
public string TableName { get { return nameof(RB_Member_Integral); } }
/// <summary>
/// 分页列表
/// </summary>
......@@ -24,19 +28,24 @@ namespace Mall.Repository.User
public List<RB_Member_Integral_Extend> GetPageList(int pageIndex, int pageSize, out long rowCount, RB_Member_Integral_Extend dmodel)
{
string where = " 1=1 ";
if (dmodel.TenantId > 0) {
if (dmodel.TenantId > 0)
{
where += $@" and {nameof(RB_Member_Integral.TenantId)}={dmodel.TenantId}";
}
if (dmodel.MallBaseId > 0) {
if (dmodel.MallBaseId > 0)
{
where += $@" and {nameof(RB_Member_Integral.MallBaseId)}={dmodel.MallBaseId}";
}
if (dmodel.Id > 0) {
if (dmodel.Id > 0)
{
where += $@" and {nameof(RB_Member_Integral.Id)}={dmodel.Id}";
}
if (dmodel.Type > 0) {
if (dmodel.Type > 0)
{
where += $@" and {nameof(RB_Member_Integral.Type)}={dmodel.Type}";
}
if (dmodel.UserId > 0) {
if (dmodel.UserId > 0)
{
where += $@" and {nameof(RB_Member_Integral.UserId)}={dmodel.UserId}";
}
......@@ -76,5 +85,49 @@ namespace Mall.Repository.User
string sql = $@"select * from RB_Member_Integral where {where} order by Id desc";
return Get<RB_Member_Integral_Extend>(sql).ToList();
}
/// <summary>
/// 营销中心-积分记录
/// </summary>
/// <param name="pageIndex">页码</param>
/// <param name="pageSize">每页显示条数</param>
/// <param name="rowCount">总条数</param>
/// <param name="query">查询条件</param>
/// <returns></returns>
public List<RB_Member_Integral_Extend> GetRechargeRecordPageList(int pageIndex, int pageSize, out long rowCount, RB_Member_Integral_Extend query)
{
StringBuilder builder = new StringBuilder();
builder.Append($" SELECT a.*,b.`Name` as MemberName FROM {TableName} as a LEFT JOIN {MemberTableName} as b on a.MemberId = b.Id WHERE 1=1 ");
if (query != null)
{
if (query.Id > 0)
{
builder.Append($" AND a.{nameof(RB_Member_Integral_Extend.Id)}={query.Id}");
}
if (query.TenantId > 0)
{
builder.Append($" AND a.{nameof(RB_Member_Integral_Extend.TenantId)}={query.TenantId}");
}
if (query.TenantId > 0)
{
builder.Append($" AND a.{nameof(RB_Member_Integral_Extend.MallBaseId)}={query.MallBaseId}");
}
if (!string.IsNullOrWhiteSpace(query.MemberName))
{
builder.Append($" AND b.{nameof(RB_Member_Integral_Extend.MemberName)} like '%{query.MemberName}%'");
}
if (!string.IsNullOrWhiteSpace(query.StartDate))
{
builder.Append($" AND DATE_FORMAT(a.{nameof(RB_Member_Integral_Extend.CreateDate)},'%Y-%m-%d' )>= DATE_FORMAT('{nameof(RB_Member_Integral_Extend.StartDate)}','%Y-%m-%d' )");
}
if (!string.IsNullOrWhiteSpace(query.EndDate))
{
builder.Append($" AND DATE_FORMAT(a.{nameof(RB_Member_Integral_Extend.CreateDate)},'%Y-%m-%d' )<= DATE_FORMAT('{nameof(RB_Member_Integral_Extend.EndDate)}','%Y-%m-%d' )");
}
}
return GetPage<RB_Member_Integral_Extend>(pageIndex, pageSize, out rowCount, builder.ToString()).ToList();
}
}
}
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using Mall.Common.API;
using Mall.Model.Entity.MarketingCenter;
using Mall.Model.Extend.MarketingCenter;
using Mall.Model.Extend.User;
using Mall.Module.MarketingCenter;
using Mall.WebApi.Filter;
using Microsoft.AspNetCore.Cors;
using Microsoft.AspNetCore.Mvc;
using Newtonsoft.Json;
namespace Mall.WebApi.Controllers.MarketingCenter
{
[Route("api/[controller]/[action]")]
[ApiExceptionFilter]
[ApiController]
[EnableCors("AllowCors")]
public class IntegralController : BaseController
{
private IntegralModule IntegralModule = new IntegralModule();
#region 积分设置
/// <summary>
/// 获取积分设置
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult GetIntegralSettingsList()
{
var parms = RequestParm;
var query = JsonConvert.DeserializeObject<RB_Integral_Settings>(RequestParm.msg.ToString());
query.TenantId = UserInfo.TenantId;
query.MallBaseId = parms.MallBaseId;
var oldLogisticsModel = IntegralModule.GetIntegralSettingsList(query).FirstOrDefault();
if (oldLogisticsModel == null)
{
oldLogisticsModel = new RB_Integral_Settings();
}
return ApiResult.Success("", oldLogisticsModel);
}
/// <summary>
/// 保存积分设置
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult AddOrUpdateIntegralSettings()
{
var parms = RequestParm;
var query = JsonConvert.DeserializeObject<RB_Integral_Settings>(RequestParm.msg.ToString());
query.TenantId = UserInfo.TenantId;
query.MallBaseId = parms.MallBaseId;
if (query == null)
{
return ApiResult.Failed("请传入积分设置");
}
else
{
if (query.ID == 0)
{
query.CreateDate = System.DateTime.Now;
}
query.UpdateDate = System.DateTime.Now;
bool result = IntegralModule.AddOrUpdateIntegralSettings(query);
if (result)
{
return ApiResult.Success("积分设置保存成功");
}
else
{
return ApiResult.Failed("积分设置保存失败");
}
}
}
#endregion
#region 积分记录
/// <summary>
/// 充值方案列表
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult GetRechargeRulesPage()
{
var parms = RequestParm;
ResultPageModel pagelist = JsonConvert.DeserializeObject<ResultPageModel>(RequestParm.msg.ToString());
RB_Member_Integral_Extend demodel = JsonConvert.DeserializeObject<RB_Member_Integral_Extend>(RequestParm.msg.ToString());
demodel.TenantId = UserInfo.TenantId;
demodel.MallBaseId = parms.MallBaseId;
var list = IntegralModule.GetRechargeRecordPageList(pagelist.pageIndex, pagelist.pageSize, out long count, demodel);
pagelist.count = Convert.ToInt32(count);
pagelist.pageData = list.Select(x => new
{
x.Id,
CreateDate = x.CreateDate.Value.ToString("yyyy-MM-dd HH:mm:ss"),
x.MemberName,
x.Integral,
x.Description,
x.Remarks,
RecordTypeStr = Mall.Common.Plugin.EnumHelper.GetEnumName(x.Type)
});
return ApiResult.Success("", pagelist);
}
#endregion
}
}
\ No newline at end of file
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using Mall.Common.API;
using Mall.Common.Plugin;
using Mall.Model.Entity.MarketingCenter;
using Mall.Model.Extend.BaseSetUp;
using Mall.Model.Extend.MarketingCenter;
using Mall.Module.MarketingCenter;
using Mall.WebApi.Filter;
using Microsoft.AspNetCore.Cors;
using Microsoft.AspNetCore.Mvc;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
namespace Mall.WebApi.Controllers.MarketingCenter
{
[Route("api/[controller]/[action]")]
[ApiExceptionFilter]
[ApiController]
[EnableCors("AllowCors")]
public class RechargeController : BaseController
{
private RechargeModule rechargeModule = new RechargeModule();
#region 充值规则设置
/// <summary>
/// 充值方案列表
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult GetRechargeRulesPage()
{
var parms = RequestParm;
ResultPageModel pagelist = JsonConvert.DeserializeObject<ResultPageModel>(RequestParm.msg.ToString());
RB_Recharge_Rules_Extend demodel = JsonConvert.DeserializeObject<RB_Recharge_Rules_Extend>(RequestParm.msg.ToString());
demodel.TenantId = UserInfo.TenantId;
demodel.MallBaseId = parms.MallBaseId;
var list = rechargeModule.GetRechargeRulesPageList(pagelist.pageIndex, pagelist.pageSize, out long count, demodel);
pagelist.count = Convert.ToInt32(count);
pagelist.pageData = list.Select(x => new
{
x.ID,
CreateDate = x.CreateDate.ToString("yyyy-MM-dd HH:mm:ss"),
x.GiveIntegral,
x.GiveMoney,
x.Money,
x.Name
});
return ApiResult.Success("", pagelist);
}
/// <summary>
/// 获取详情
/// </summary>
/// <returns></returns>
public ApiResult GetRechargeRules()
{
var parms = RequestParm;
var query = JsonConvert.DeserializeObject<RB_Recharge_Rules_Extend>(RequestParm.msg.ToString());
query.TenantId = UserInfo.TenantId;
query.MallBaseId = parms.MallBaseId;
var oldLogisticsModel = rechargeModule.GetRechargeRulesList(query).FirstOrDefault();
if (oldLogisticsModel == null)
{
oldLogisticsModel = new RB_Recharge_Rules_Extend();
}
return ApiResult.Success("", oldLogisticsModel);
}
/// <summary>
/// 保存充值方案
/// </summary>
/// <returns></returns>
public ApiResult AddOrUpdateRechargeRules()
{
var parms = RequestParm;
var query = JsonConvert.DeserializeObject<RB_Recharge_Rules_Extend>(RequestParm.msg.ToString());
query.TenantId = UserInfo.TenantId;
query.MallBaseId = parms.MallBaseId;
if (query == null)
{
return ApiResult.Failed("请传入充值方案");
}
else
{
if (string.IsNullOrWhiteSpace(query.Name))
{
return ApiResult.Failed("请输入充值名称");
}
if (query.Money == 0)
{
return ApiResult.Failed("请输入充值金额");
}
if (query.ID == 0)
{
query.CreateDate = System.DateTime.Now;
}
query.UpdateDate = System.DateTime.Now;
bool result = rechargeModule.AddOrUpdateRechargeRules(query);
if (result)
{
return ApiResult.Success("充值方案保存成功");
}
else
{
return ApiResult.Failed("充值方案保存失败");
}
}
}
/// <summary>
/// 删除充值方案
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult DelRules()
{
var parms = RequestParm;
JObject parmsJob = JObject.Parse(RequestParm.msg.ToString());
int Id = parmsJob.GetInt("Id", 0);
if (Id <= 0)
{
return ApiResult.Failed("请传递参数");
}
bool flag = rechargeModule.DelRechargeRules(Id, UserInfo.TenantId, parms.MallBaseId);
if (flag)
{
return ApiResult.Success();
}
else
{
return ApiResult.Failed();
}
}
#endregion
#region 充值设置
/// <summary>
/// 获取详情
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult GetRechargeSettingsList()
{
var parms = RequestParm;
var query = JsonConvert.DeserializeObject<RB_Recharge_Settings>(RequestParm.msg.ToString());
query.TenantId = UserInfo.TenantId;
query.MallBaseId = parms.MallBaseId;
var oldLogisticsModel = rechargeModule.GetRechargeSettingsList(query).FirstOrDefault();
if (oldLogisticsModel == null)
{
oldLogisticsModel = new RB_Recharge_Settings();
}
return ApiResult.Success("", oldLogisticsModel);
}
/// <summary>
/// 保存充值方案
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult AddOrUpdateRechargeSettings()
{
var parms = RequestParm;
var query = JsonConvert.DeserializeObject<RB_Recharge_Settings>(RequestParm.msg.ToString());
query.TenantId = UserInfo.TenantId;
query.MallBaseId = parms.MallBaseId;
if (query == null)
{
return ApiResult.Failed("请传入充值设置");
}
else
{
if (query.ID == 0)
{
query.CreateDate = System.DateTime.Now;
}
query.UpdateDate = System.DateTime.Now;
bool result = rechargeModule.AddOrUpdateRechargeSettings(query);
if (result)
{
return ApiResult.Success("充值设置保存成功");
}
else
{
return ApiResult.Failed("充值设置保存失败");
}
}
}
#endregion
}
}
\ No newline at end of file
......@@ -572,7 +572,7 @@ namespace Mall.WebApi.Controllers.MallBase
{
return ApiResult.ParamIsNull("请传递用户id");
}
if (demodel.Type != 1 && demodel.Type != 2)
if ((int)demodel.Type != 1 && (int)demodel.Type != 2)
{
return ApiResult.ParamIsNull("请选择充值/扣除");
}
......
......@@ -15,6 +15,7 @@
<ProjectReference Include="..\Mall.DataHelper\Mall.DataHelper.csproj" />
<ProjectReference Include="..\Mall.Model\Mall.Model.csproj" />
<ProjectReference Include="..\Mall.Module.BaseSetUp\Mall.Module.BaseSetUp.csproj" />
<ProjectReference Include="..\Mall.Module.MarketingCenter\Mall.Module.MarketingCenter.csproj" />
<ProjectReference Include="..\Mall.Module.Product\Mall.Module.Product.csproj" />
<ProjectReference Include="..\Mall.Module.User\Mall.Module.User.csproj" />
<ProjectReference Include="..\Mall.ThirdCore\Mall.ThirdCore.csproj" />
......
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