Skip to content

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

提交代码

parent 92436a04
Hide whitespace changes
Inline Side-by-side
Showing with 711 additions and 15 deletions
Mall.Model/Entity/MarketingCenter/RB_Deposit.cs
View file @ 35bce0c6
......@@ -50,6 +50,11 @@ namespace Mall.Model.Entity.MarketingCenter
/// </summary>
public int IndateDay { get; set; }
/// <summary>
/// 购买方式设置1-储值卡中心
/// </summary>
public int PickupCenter { get; set; }
/// <summary>
/// 描述
......
Mall.Model/Entity/User/RB_Member_DepositBuy.cs 0 → 100644
View file @ 35bce0c6
using System;
using System.Collections.Generic;
using System.Text;
using Mall.Common.Enum.User;
using VT.FW.DB;
namespace Mall.Model.Entity.User
{
[Serializable]
[DB(ConnectionName = "DefaultConnection")]
public class RB_Member_DepositBuy
{
/// <summary>
/// Id
/// </summary>
public int Id
{
get;
set;
}
/// <summary>
/// 订单号
/// </summary>
public string OrderNo { get; set; }
/// <summary>
/// 用户id
/// </summary>
public int? UserId { get; set; }
/// <summary>
/// 储值卡id
/// </summary>
public int DepositId { get; set; }
/// <summary>
/// 储值卡名称
/// </summary>
public string Name { get; set; }
/// <summary>
/// 储值卡封面
/// </summary>
public string CouponIco { get; set; }
/// <summary>
/// 储值卡售价
/// </summary>
public decimal SalePrice { get; set; }
/// <summary>
/// 储值卡面值
/// </summary>
public decimal DepositPrice { get; set; }
/// <summary>
/// 有效天数
/// </summary>
public int IndateDay { get; set; }
/// <summary>
/// 储值卡过期时间
/// </summary>
public DateTime EndTime { get; set; }
/// <summary>
/// 状态 0-未支付 1-已支付
/// </summary>
public int Status { get; set; }
/// <summary>
/// 充值方式（1-在线充值，2-赠送 3-系统返利）
/// </summary>
public int RechargeType { get; set; }
/// <summary>
/// 订单来源（平台） 枚举
/// </summary>
public UserSourceEnum? OrderSource
{
get;
set;
}
/// <summary>
/// 支付类型 枚举 1微信 2支付宝
/// </summary>
public Common.Enum.Goods.OrderPayTypeEnum? PayWay
{
get;
set;
}
/// <summary>
/// CreateDate
/// </summary>
public DateTime? CreateDate
{
get;
set;
}
/// <summary>
/// 商户号id
/// </summary>
public int TenantId
{
get;
set;
}
/// <summary>
/// 小程序id
/// </summary>
public int MallBaseId
{
get;
set;
}
/// <summary>
/// 备注
/// </summary>
public string Remarks { get; set; }
/// <summary>
/// 订单支付时间
/// </summary>
public DateTime PayTime { get; set; }
/// <summary>
/// 订单号
/// </summary>
public string Out_Trade_No
{
get;
set;
}
/// <summary>
/// 微信支付订单号
/// </summary>
public string Transaction_Id
{
get;
set;
}
/// <summary>
/// 赠送状态0-未赠送，1-已赠送，2-赠送中（还未领取）
/// </summary>
public int SendStatus { get; set; }
/// <summary>
/// 赠送时间
/// </summary>
public DateTime? SendTime { get; set; }
}
}
Mall.Model/Entity/User/RB_Member_DepositMerge.cs 0 → 100644
View file @ 35bce0c6
using System;
using System.Collections.Generic;
using System.Text;
using Mall.Common.Enum.User;
using VT.FW.DB;
namespace Mall.Model.Entity.User
{
/// <summary>
/// 储值卡合并/赠送
/// </summary>
[Serializable]
[DB(ConnectionName = "DefaultConnection")]
public class RB_Member_DepositMerge
{
/// <summary>
/// Id
/// </summary>
public int Id
{
get;
set;
}
/// <summary>
/// 原购买id(主要针对合并的记录与合并的id值)
/// </summary>
public int OldDepositBuyId { get; set; }
/// <summary>
/// 新购买id(主要针对合并的记录与合并的id值)
/// </summary>
public int NewDepositBuyId { get; set; }
/// <summary>
/// 用户id
/// </summary>
public int? UserId { get; set; }
/// <summary>
/// 储值卡id
/// </summary>
public int DepositId { get; set; }
/// <summary>
/// 储值卡名称
/// </summary>
public string Name { get; set; }
/// <summary>
/// 储值卡封面
/// </summary>
public string CouponIco { get; set; }
/// <summary>
/// 储值卡售价
/// </summary>
public decimal SalePrice { get; set; }
/// <summary>
/// 储值卡面值
/// </summary>
public decimal DepositPrice { get; set; }
/// <summary>
/// 1-合并记录，2-赠送记录
/// </summary>
public int MergeType { get; set; }
/// <summary>
/// CreateDate
/// </summary>
public DateTime? CreateDate
{
get;
set;
}
/// <summary>
/// 商户号id
/// </summary>
public int TenantId
{
get;
set;
}
/// <summary>
/// 小程序id
/// </summary>
public int MallBaseId
{
get;
set;
}
/// <summary>
/// 备注
/// </summary>
public string Remarks { get; set; }
}
}
Mall.Model/Extend/User/RB_Member_DepositBuy_Extend.cs 0 → 100644
View file @ 35bce0c6
using System;
using System.Collections.Generic;
using System.Text;
using Mall.Model.Entity.User;
namespace Mall.Model.Extend.User
{
public class RB_Member_DepositBuy_Extend : RB_Member_DepositBuy
{
}
}
Mall.Model/Extend/User/RB_Member_DepositMerge_Extend.cs 0 → 100644
View file @ 35bce0c6
using System;
using System.Collections.Generic;
using System.Text;
using Mall.Model.Entity.User;
namespace Mall.Model.Extend.User
{
public class RB_Member_DepositMerge_Extend: RB_Member_DepositMerge
{
}
}
Mall.Module.MarketingCenter/CouponModule.cs
View file @ 35bce0c6
......@@ -36,7 +36,7 @@ namespace Mall.Module.MarketingCenter
/// </summary>
private readonly RB_Member_UserRepository member_UserRepository = new RB_Member_UserRepository();
private readonly RB_Member_DepositBuyRepository member_DepositBuyRepository = new RB_Member_DepositBuyRepository();
#region 卡券列表
/// <summary>
......@@ -1041,6 +1041,7 @@ namespace Mall.Module.MarketingCenter
{ nameof(RB_Deposit_Extend.DepositPrice),model.DepositPrice},
{ nameof(RB_Deposit_Extend.Describe),model.Describe},
{ nameof(RB_Deposit_Extend.SalePrice),model.SalePrice},
{ nameof(RB_Deposit_Extend.PickupCenter),model.PickupCenter},
};
IList<WhereHelper> whereHelpers = new List<WhereHelper>()
{
......@@ -1102,6 +1103,113 @@ namespace Mall.Module.MarketingCenter
}
#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_DepositBuy_Extend> GetDepositBuyPageList(int pageIndex, int pageSize, out long rowCount, RB_Member_DepositBuy_Extend query)
{
return member_DepositBuyRepository.GetDepositBuyPageList(pageIndex, pageSize, out rowCount, query);
}
/// <summary>
/// 购买列表
/// </summary>
/// <param name="query">查询条件</param>
/// <returns></returns>
public List<RB_Member_DepositBuy_Extend> GetDepositBuyList(RB_Member_DepositBuy_Extend query)
{
return member_DepositBuyRepository.GetDepositBuyList(query);
}
/// <summary>
/// 新增购买记录
/// </summary>
/// <param name="model"></param>
/// <returns></returns>
public int AddDepositBuy(RB_Member_DepositBuy model)
{
if (model.Id == 0)
{
int Id = member_DepositBuyRepository.Insert(model);
return Id;
}
return 0;
}
/// <summary>
/// 新增充值金额
/// </summary>
/// <param name="model"></param>
/// <returns></returns>
public bool UpdateDepositBuy(int UserId, int OrderId, string Out_Trade_No, string Transaction_Id, Common.Enum.Goods.OrderPayTypeEnum PayWay, string PayType, decimal Money, DateTime Time_End)
{
var umodel = member_UserRepository.GetEntity(UserId);
if (umodel == null)
{
return false;
}
//判断订单状态是否是待支付 2020-06-16 Add By:W
var model = member_DepositBuyRepository.GetEntity(OrderId);
if (model == null)
{
return false;
}
if (model.Status != 0)
{
return false;
}
if (model.SalePrice != Money)
{
return false;
}
bool flag;
try
{
//更新订单信息
Dictionary<string, object> keyValues = new Dictionary<string, object>() {
{ nameof(RB_Member_DepositBuy.Status),1},
{ nameof(RB_Member_DepositBuy.Out_Trade_No),Out_Trade_No},
{ nameof(RB_Member_DepositBuy.PayTime),Time_End},
{ nameof(RB_Member_DepositBuy.Transaction_Id),Transaction_Id}
};
List<WhereHelper> wheres = new List<WhereHelper>() {
new WhereHelper(){
FiledName=nameof(RB_Member_DepositBuy.Id),
FiledValue=model.Id,
OperatorEnum=OperatorEnum.Equal
}
};
flag = member_DepositBuyRepository.Update(keyValues, wheres);//更新储值卡购买记录
}
catch (Exception ex)
{
LogHelper.Write(ex, "UpdateDepositBuy");
return false;
}
return flag;
}
#endregion
}
......
Mall.Repository/MarketingCenter/RB_DepositRepository.cs
View file @ 35bce0c6
......@@ -31,7 +31,11 @@ namespace Mall.Repository.MarketingCenter
{
builder.Append($" AND {nameof(RB_Deposit_Extend.TenantId)}={query.TenantId}");
}
if (query.TenantId > 0)
if (query.PickupCenter > -1)
{
builder.Append($" AND {nameof(RB_Deposit_Extend.PickupCenter)}={query.PickupCenter}");
}
if (query.MallBaseId > 0)
{
builder.Append($" AND {nameof(RB_Deposit_Extend.MallBaseId)}={query.MallBaseId}");
}
......@@ -63,7 +67,11 @@ namespace Mall.Repository.MarketingCenter
{
builder.Append($" AND {nameof(RB_Deposit_Extend.TenantId)}={query.TenantId}");
}
if (query.TenantId > 0)
if (query.PickupCenter > -1)
{
builder.Append($" AND {nameof(RB_Deposit_Extend.PickupCenter)}={query.PickupCenter}");
}
if (query.MallBaseId > 0)
{
builder.Append($" AND {nameof(RB_Deposit_Extend.MallBaseId)}={query.MallBaseId}");
}
......
Mall.Repository/MarketingCenter/RB_DiscountCouponRepository.cs
View file @ 35bce0c6
......@@ -39,7 +39,7 @@ namespace Mall.Repository.MarketingCenter
{
builder.Append($" AND a.{nameof(RB_DiscountCoupon_Extend.TenantId)}={query.TenantId}");
}
if (query.TenantId > 0)
if (query.MallBaseId > 0)
{
builder.Append($" AND a.{nameof(RB_DiscountCoupon_Extend.MallBaseId)}={query.MallBaseId}");
}
......@@ -79,7 +79,7 @@ namespace Mall.Repository.MarketingCenter
{
builder.Append($" AND {nameof(RB_DiscountCoupon_Extend.TenantId)}={query.TenantId}");
}
if (query.TenantId > 0)
if (query.MallBaseId > 0)
{
builder.Append($" AND {nameof(RB_DiscountCoupon_Extend.MallBaseId)}={query.MallBaseId}");
}
......@@ -325,7 +325,7 @@ on a.CouponId=b.ID {where} ";
{
builder.Append($" AND a.{nameof(RB_DiscountCoupon_Extend.TenantId)}={query.TenantId}");
}
if (query.TenantId > 0)
if (query.MallBaseId > 0)
{
builder.Append($" AND a.{nameof(RB_DiscountCoupon_Extend.MallBaseId)}={query.MallBaseId}");
}
......
Mall.Repository/User/RB_Member_BalanceRechargeRepository.cs
View file @ 35bce0c6
......@@ -33,7 +33,7 @@ namespace Mall.Repository.User
{
builder.Append($" AND {nameof(RB_Member_BalanceRecharge.TenantId)}={query.TenantId}");
}
if (query.TenantId > 0)
if (query.MallBaseId > 0)
{
builder.Append($" AND {nameof(RB_Member_BalanceRecharge.MallBaseId)}={query.MallBaseId}");
}
......@@ -61,7 +61,7 @@ namespace Mall.Repository.User
{
builder.Append($" AND {nameof(RB_Member_BalanceRecharge.TenantId)}={query.TenantId}");
}
if (query.TenantId > 0)
if (query.MallBaseId > 0)
{
builder.Append($" AND {nameof(RB_Member_BalanceRecharge.MallBaseId)}={query.MallBaseId}");
}
......
Mall.Repository/User/RB_Member_DepositBuyRepository.cs 0 → 100644
View file @ 35bce0c6
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using Mall.Model.Entity.User;
using Mall.Model.Extend.User;
namespace Mall.Repository.User
{
public class RB_Member_DepositBuyRepository : BaseRepository<RB_Member_DepositBuy>
{
/// <summary>
/// 余额充值
/// </summary>
public string TableName { get { return nameof(RB_Member_DepositBuy); } }
/// <summary>
/// 购买列表
/// </summary>
/// <param name="pageIndex">页码</param>
/// <param name="pageSize">每页显示条数</param>
/// <param name="rowCount">总条数</param>
/// <param name="query">查询条件</param>
/// <returns></returns>
public List<RB_Member_DepositBuy_Extend> GetDepositBuyPageList(int pageIndex, int pageSize, out long rowCount, RB_Member_DepositBuy_Extend query)
{
StringBuilder builder = new StringBuilder();
builder.Append($" SELECT * FROM {TableName} WHERE 1=1");
if (query != null)
{
if (query.TenantId > 0)
{
builder.Append($" AND {nameof(RB_Member_DepositBuy.TenantId)}={query.TenantId}");
}
if (query.MallBaseId > 0)
{
builder.Append($" AND {nameof(RB_Member_DepositBuy.MallBaseId)}={query.MallBaseId}");
}
if (query.SendStatus > -1)
{
builder.Append($" AND {nameof(RB_Member_DepositBuy.SendStatus)}={query.SendStatus}");
}
if (query.Status > -1)
{
builder.Append($" AND {nameof(RB_Member_DepositBuy.Status)}={query.Status}");
}
if (query.UserId > 0)
{
builder.Append($" AND {nameof(RB_Member_DepositBuy.UserId)}={query.UserId}");
}
}
return GetPage<RB_Member_DepositBuy_Extend>(pageIndex, pageSize, out rowCount, builder.ToString()).ToList();
}
/// <summary>
/// 购买信息
/// </summary>
/// <param name="query">查询条件</param>
/// <returns></returns>
public List<RB_Member_DepositBuy_Extend> GetDepositBuyList(RB_Member_DepositBuy_Extend query)
{
StringBuilder builder = new StringBuilder();
builder.Append($" SELECT * FROM {TableName} WHERE 1=1 ");
if (query != null)
{
if (query.TenantId > 0)
{
builder.Append($" AND {nameof(RB_Member_DepositBuy.TenantId)}={query.TenantId}");
}
if (query.MallBaseId > 0)
{
builder.Append($" AND {nameof(RB_Member_DepositBuy.MallBaseId)}={query.MallBaseId}");
}
if (query.SendStatus > -1)
{
builder.Append($" AND {nameof(RB_Member_DepositBuy.SendStatus)}={query.SendStatus}");
}
if (query.Status > -1)
{
builder.Append($" AND {nameof(RB_Member_DepositBuy.Status)}={query.Status}");
}
if (query.UserId > 0)
{
builder.Append($" AND {nameof(RB_Member_DepositBuy.UserId)}={query.UserId}");
}
}
return Get<RB_Member_DepositBuy_Extend>(builder.ToString()).ToList();
}
}
}
Mall.WebApi/Controllers/AppletWeChat/WeChatNotifyController.cs
View file @ 35bce0c6
......@@ -25,9 +25,10 @@ namespace Mall.WebApi.Controllers.AppletWeChat
public class WeChatNotifyController : Controller
{
private readonly object _lock = new object();
readonly UserCommonModule userCommonModule = new UserCommonModule();
readonly Module.MarketingCenter.RechargeModule rechargeModule = new Module.MarketingCenter.RechargeModule();
readonly Module.Education.PointModule pointModule = new Module.Education.PointModule();
private readonly UserCommonModule userCommonModule = new UserCommonModule();
private readonly Module.MarketingCenter.RechargeModule rechargeModule = new Module.MarketingCenter.RechargeModule();
private readonly Module.MarketingCenter.CouponModule couponModule = new Module.MarketingCenter.CouponModule();
private readonly Module.Education.PointModule pointModule = new Module.Education.PointModule();
private readonly IHttpContextAccessor _accessor;
/// <summary>
......@@ -418,5 +419,59 @@ namespace Mall.WebApi.Controllers.AppletWeChat
// return ApiResult.Failed("", reqXmlFAIL);
}
}
/// <summary>
/// 会员购买储值卡回调
/// </summary>
/// <returns></returns>
[HttpGet]
[HttpPost]
public string DepositBuyNotify(int MallBaseId, int TenantId)
{
var req = new RequestHandler();
App_Code.PayUtil PayUtil = new App_Code.PayUtil();
var result = PayUtil.AllNotify(_accessor, MallBaseId, TenantId);
if (result.IsSuccess)
{
var dic = ((Dictionary<string, string>)result.Data);
//开始回写订单状态
lock (_lock)
{
string sOrderNo = dic["sOrderNo"];//订单号 时间挫+OrderId
int OrderId = Convert.ToInt32(sOrderNo[17..]);
decimal dPaid = Convert.ToDecimal(dic["dPrice"]) / 100;
string sPayerOpenID = dic["sPayerOpenID"];
int UserId = Convert.ToInt32(dic["bIsRecharge"]);
string TransactionId = dic["sTradeNo"];
string PayType = dic["OrderPayType"];
DateTime PayDate = DateTime.ParseExact(dic["PayDate"], "yyyyMMddHHmmss", System.Globalization.CultureInfo.CurrentCulture);//转换时间
#region 新增订单支付信息
couponModule.UpdateDepositBuy(UserId, OrderId, sOrderNo, TransactionId, Common.Enum.Goods.OrderPayTypeEnum.WeChatPay, PayType, dPaid, PayDate);
#endregion
}
//告诉微信我们已经处理成功，不需要再调用我们的接口了
req.SetParameter("return_code", "SUCCESS");
req.SetParameter("return_msg", "OK");
var reqXml = req.ParseXml();
return reqXml;
// return ApiResult.Success("", reqXml);
}
else
{
req.SetParameter("return_code", "FAIL");
req.SetParameter("return_msg", "订单失败");
var reqXmlFAIL = req.ParseXml();
LogHelper.Write(null, "DepositBuyNotify返回信息：" + reqXmlFAIL);
return reqXmlFAIL;
// return ApiResult.Failed("", reqXmlFAIL);
}
}
}
}
\ No newline at end of file
Mall.WebApi/Controllers/AppletWeChat/WeChatPayController.cs
View file @ 35bce0c6
......@@ -53,6 +53,7 @@ namespace Mall.WebApi.Controllers.AppletWeChat
private readonly UserVipModule userVipModule = new UserVipModule();
private readonly PointModule pointModule = new PointModule();
private readonly UserCommonModule userCommonModule = new UserCommonModule();
private readonly CouponModule couponModule = new CouponModule();
#region 商品支付
/// <summary>
/// 微信支付
......@@ -189,7 +190,7 @@ namespace Mall.WebApi.Controllers.AppletWeChat
switch ((int)demodel.PayWay)
{
case 1://微信支付
sPayInfo = App_Code.PayUtil.GetMinUnifiedOrder(sOrderNo, payGoodsName, Convert.ToDecimal(rechargeRulesModel.Money), userInfo.UserId.ToString(), userModel.OpenId, (Config.sTenpayRechargeNotify + "/" + demodel.MallBaseId + "/" + demodel.TenantId) , miniProgram, _accessor, System.Net.Dns.GetHostEntry(System.Net.Dns.GetHostName()).AddressList.FirstOrDefault(address => address.AddressFamily == System.Net.Sockets.AddressFamily.InterNetwork)?.ToString());
sPayInfo = App_Code.PayUtil.GetMinUnifiedOrder(sOrderNo, payGoodsName, Convert.ToDecimal(rechargeRulesModel.Money), userInfo.UserId.ToString(), userModel.OpenId, (Config.sTenpayRechargeNotify + "/" + demodel.MallBaseId + "/" + demodel.TenantId), miniProgram, _accessor, System.Net.Dns.GetHostEntry(System.Net.Dns.GetHostName()).AddressList.FirstOrDefault(address => address.AddressFamily == System.Net.Sockets.AddressFamily.InterNetwork)?.ToString());
break;
default:
break;
......@@ -486,7 +487,7 @@ namespace Mall.WebApi.Controllers.AppletWeChat
switch ((int)demodel.PayWay)
{
case 1://微信支付
sPayInfo = App_Code.PayUtil.GetMinUnifiedOrder(sOrderNo, payGoodsName, Convert.ToDecimal(rechargeRulesModel.BuyMoney), userInfo.UserId.ToString(), userModel.OpenId, (Config.sTenpayVipBuyNotify + "/" + demodel.MallBaseId + "/" + demodel.TenantId) , miniProgram, _accessor, System.Net.Dns.GetHostEntry(System.Net.Dns.GetHostName()).AddressList.FirstOrDefault(address => address.AddressFamily == System.Net.Sockets.AddressFamily.InterNetwork)?.ToString());
sPayInfo = App_Code.PayUtil.GetMinUnifiedOrder(sOrderNo, payGoodsName, Convert.ToDecimal(rechargeRulesModel.BuyMoney), userInfo.UserId.ToString(), userModel.OpenId, (Config.sTenpayVipBuyNotify + "/" + demodel.MallBaseId + "/" + demodel.TenantId), miniProgram, _accessor, System.Net.Dns.GetHostEntry(System.Net.Dns.GetHostName()).AddressList.FirstOrDefault(address => address.AddressFamily == System.Net.Sockets.AddressFamily.InterNetwork)?.ToString());
break;
default:
break;
......@@ -570,7 +571,7 @@ namespace Mall.WebApi.Controllers.AppletWeChat
string orderNo = parms.GetStringValue("orderNo");
int orderId = parms.GetInt("orderId");
int userId = parms.GetInt("userId");
var Robj = userCommonModule.InsertVipBuyCommission(userId, orderId, orderNo,Convert.ToDecimal(365.00), System.DateTime.Now);
var Robj = userCommonModule.InsertVipBuyCommission(userId, orderId, orderNo, Convert.ToDecimal(365.00), System.DateTime.Now);
return ApiResult.Success("", Robj);
}
......@@ -681,5 +682,97 @@ namespace Mall.WebApi.Controllers.AppletWeChat
return ApiResult.Success("", sPayInfo);
}
#endregion
#region 储值卡购买（赞羊）
/// <summary>
/// 微信支付
/// </summary>
/// <param name="request"></param>
/// <returns></returns>
[HttpPost]
public ApiResult GetDepositPayInfo()
{
var request = RequestParm;
var userInfo = AppletUserInfo;
if (userInfo == null)
{
return ApiResult.Failed("请登录");
}
RB_Member_DepositBuy demodel = JsonConvert.DeserializeObject<RB_Member_DepositBuy>(request.msg.ToString());
string sPayInfo = string.Empty;
if (!demodel.PayWay.HasValue)
{
return ApiResult.Failed("请选择支付方式");
}
//查询充值信息
if (demodel.SalePrice <= 0)
{
return ApiResult.Failed("请输入充值金额");
}
//查询用户的openId
var userModel = userModule.GetMemberUserEntityModule(new RB_Member_User_Extend { MallBaseId = userInfo.MallBaseId, TenantId = userInfo.TenantId, Id = userInfo.UserId });
if (userModel == null)
{
return ApiResult.Failed("用户不存在");
}
string payGoodsName = "余额充值";
if (demodel.DepositId > 0)
{
var rechargeRulesModel = couponModule.GetDepositList(new Model.Extend.MarketingCenter.RB_Deposit_Extend { MallBaseId = userInfo.MallBaseId, TenantId = userInfo.TenantId, ID = demodel.DepositId }).FirstOrDefault();
if (rechargeRulesModel == null)
{
return ApiResult.Failed("选择的储值卡不存在");
}
if (demodel.SalePrice != Convert.ToDecimal(rechargeRulesModel.SalePrice))
{
return ApiResult.Failed("支付金额与设定的金额不符");
}
demodel.DepositPrice = rechargeRulesModel.DepositPrice;
demodel.Name = rechargeRulesModel.Name;
demodel.CouponIco = rechargeRulesModel.CouponIco;
demodel.IndateDay = rechargeRulesModel.IndateDay;
demodel.DepositId = rechargeRulesModel.ID;
}
else
{
return ApiResult.Failed("选择的储值卡不存在");
}
Random R = new Random();
int Rstr = R.Next(111, 999);
demodel.OrderNo = DateTime.Now.ToString("yyyyMMddHHmmssfff") + Rstr;
demodel.RechargeType = 1;
demodel.UserId = userInfo.UserId;
demodel.MallBaseId = userInfo.MallBaseId;
demodel.TenantId = userInfo.TenantId;
demodel.Status = 0;
demodel.SendStatus = 0;
//新增充值记录
int rechargeId = couponModule.AddDepositBuy(demodel);
if (rechargeId == 0)
{
return ApiResult.Failed("在线购买储值卡失败");
}
string sOrderNo = (System.DateTime.Now.ToString("yyyyMMddHHmmssfff")) + rechargeId;
//根据订单号获取微信支付配置信息
RB_MiniProgram_Extend miniProgram = new RB_MiniProgram_Extend(); //2020年5月26号新增
miniProgram = programModule.GetMiniProgramModule(new RB_MiniProgram_Extend { MallBaseId = userInfo.MallBaseId, TenantId = userInfo.TenantId });
App_Code.PayUtil payUtil = new App_Code.PayUtil();
switch ((int)demodel.PayWay)
{
case 1://微信支付
sPayInfo = App_Code.PayUtil.GetMinUnifiedOrder(sOrderNo, payGoodsName, Convert.ToDecimal(demodel.SalePrice), userInfo.UserId.ToString(), userModel.OpenId, (Config.sTenpayRechargeNotify + "/" + demodel.MallBaseId + "/" + demodel.TenantId), miniProgram, _accessor, System.Net.Dns.GetHostEntry(System.Net.Dns.GetHostName()).AddressList.FirstOrDefault(address => address.AddressFamily == System.Net.Sockets.AddressFamily.InterNetwork)?.ToString());
break;
default:
break;
}
return ApiResult.Success("", sPayInfo);
}
#endregion
}
}
\ No newline at end of file
Mall.WebApi/Controllers/MarketingCenter/AppletCouponController.cs
View file @ 35bce0c6
......@@ -192,5 +192,43 @@ namespace Mall.WebApi.Controllers.MarketingCenter
return ApiResult.Success("", result);
}
#region 储值卡
/// <summary>
/// 储值卡购买中心
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult GetDepositPageList()
{
var req = RequestParm;
var userInfo = AppletUserInfo;
ResultPageModel pagelist = JsonConvert.DeserializeObject<ResultPageModel>(req.msg.ToString());
RB_Deposit_Extend demodel = JsonConvert.DeserializeObject<RB_Deposit_Extend>(req.msg.ToString());
demodel.TenantId = userInfo.TenantId;
demodel.MallBaseId = userInfo.MallBaseId;
demodel.PickupCenter = 1;
var list = couponModule.GetDepositPageList(pagelist.pageIndex, pagelist.pageSize, out long count, demodel);
pagelist.count = Convert.ToInt32(count);
pagelist.pageData = list.Select(x => new
{
x.Name,
x.Describe,
x.ID,
x.CouponIco,
x.DepositPrice,
x.IndateDay,
x.SalePrice
});
return ApiResult.Success("", pagelist);
}
#endregion
}
}
\ No newline at end of file
Mall.WebApi/Controllers/MarketingCenter/CouponController.cs
View file @ 35bce0c6
......@@ -859,6 +859,7 @@ namespace Mall.WebApi.Controllers.MarketingCenter
RB_Deposit_Extend demodel = JsonConvert.DeserializeObject<RB_Deposit_Extend>(RequestParm.msg.ToString());
demodel.TenantId = UserInfo.TenantId;
demodel.MallBaseId = parms.MallBaseId;
demodel.PickupCenter = -1;
var list = IntegralModule.GetDepositPageList(pagelist.pageIndex, pagelist.pageSize, out long count, demodel);
pagelist.count = Convert.ToInt32(count);
pagelist.pageData = list.Select(x => new
......@@ -869,11 +870,27 @@ namespace Mall.WebApi.Controllers.MarketingCenter
x.CouponIco,
x.DepositPrice,
x.IndateDay,
x.Describe
x.Describe,
x.PickupCenter
});
return ApiResult.Success("", pagelist);
}
/// <summary>
/// 获取储值卡下拉
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult GetAllDepositList()
{
var parms = RequestParm;
var query = JsonConvert.DeserializeObject<RB_Deposit_Extend>(RequestParm.msg.ToString());
query.TenantId = UserInfo.TenantId;
query.MallBaseId = parms.MallBaseId;
query.PickupCenter = -1;
var oldLogisticsList = IntegralModule.GetDepositList(query);
return ApiResult.Success("", oldLogisticsList.Select(x => new { x.PickupCenter, x.Name, x.IndateDay, x.DepositPrice, x.CouponIco, x.SalePrice }));
}
/// <summary>
/// 获取储值卡详情
......
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