Skip to content

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

Merge branch 'master' of http://gitlab.oytour.com/Kui2/mall.oytour.com

parents cf26709d fb4d1339
Hide whitespace changes
Inline Side-by-side
Showing with 45 additions and 51 deletions
Mall.Common/Pay/WeChatPat/ResponseHandler.cs
View file @ 83ffc508
......@@ -27,14 +27,13 @@ namespace Mall.Common.Pay.WeChatPat
/// </summary>
private const string Charset = "utf-8";
/// <summary>
///
/// </summary>
private Hashtable xmlMap;
public Hashtable XmlMap { get; }
/// <summary>
/// 获取页面提交的get和post参数
/// 获取页面提交的参数
/// </summary>
/// <param name="_accessor"></param>
public ResponseHandler(IHttpContextAccessor _accessor)
{
xmlMap = new Hashtable();
......@@ -51,9 +50,9 @@ namespace Mall.Common.Pay.WeChatPat
//接收从微信后台POST过来的数据
System.IO.Stream s = _accessor.HttpContext.Request.Body;
int count = 0;
byte[] buffer = new byte[1024];
StringBuilder builder = new StringBuilder();
int count;
while ((count = s.Read(buffer, 0, 1024)) > 0)
{
builder.Append(Encoding.UTF8.GetString(buffer, 0, count));
......@@ -73,11 +72,12 @@ namespace Mall.Common.Pay.WeChatPat
XmlNodeList nodes = xmlNode.ChildNodes;
foreach (XmlNode xn in nodes)
{
xmlMap.Add(xn.Name, xn.InnerText);
XmlMap.Add(xn.Name, xn.InnerText);
}
}
catch (Exception ex)
{
Common.Plugin.LogHelper.Write(ex, "ResponseHandler");
//若签名错误，则立即返回结果给微信支付后台
Plugin.LogHelper.Error($"ResponseHandler xml错误",ex);
}
......@@ -117,27 +117,10 @@ namespace Mall.Common.Pay.WeChatPat
/// <returns></returns>
public string GetParameter(string parameter)
{
var s = (string)xmlMap[parameter];
var s = (string)XmlMap[parameter];
return s ?? "";
}
/// <summary>
/// 设置参数值
/// </summary>
/// <param name="parameter"></param>
/// <param name="parameterValue"></param>
public void SetParameter(string parameter, string parameterValue)
{
//if (parameter != null && parameter != "")
//{
// if (parameters.Contains(parameter))
// {
// parameters.Remove(parameter);
// }
// parameters.Add(parameter, parameterValue);
//}
}
/// <summary>
/// 判断微信签名
/// </summary>
......@@ -146,11 +129,11 @@ namespace Mall.Common.Pay.WeChatPat
{
var sb = new StringBuilder();
var signMap = new Hashtable();
foreach (string k in xmlMap.Keys)
foreach (string k in XmlMap.Keys)
{
if (k != "sign")
{
signMap.Add(k.ToLower(), xmlMap[k]);
signMap.Add(k.ToLower(), XmlMap[k]);
}
}
var akeys = new ArrayList(signMap.Keys);
......@@ -162,8 +145,8 @@ namespace Mall.Common.Pay.WeChatPat
}
sb.Append("key=" + this._key);
var sign = Plugin.SecurityHelper.MD5EncryptWeChat(sb.ToString(), Charset).ToUpper();
error = "sign = " + sign + "\r\n xmlMap[sign]=" + xmlMap["sign"].ToString();
return sign.Equals(xmlMap["sign"]);
error = "sign = " + sign + "\r\n xmlMap[sign]=" + XmlMap["sign"].ToString();
return sign.Equals(XmlMap["sign"]);
}
///// <summary>
......
Mall.Model/Entity/User/RB_Member_DiscountCoupon.cs
View file @ 83ffc508
......@@ -102,7 +102,7 @@ namespace Mall.Model.Entity.User
/// <summary>
/// 领取方式0-自行领取（领劵中心领取），1-分享，2-购买并付款，3-新人领取
/// </summary>
public int GetType { get; set; }
public new int GetType { get; set; }
/// <summary>
......
Mall.Module.User/UserModule.cs
View file @ 83ffc508
......@@ -2351,13 +2351,13 @@ namespace Mall.Module.User
{
return "提现方式不正确";
}
//今日可提
decimal CanRemitMoney = -1;
if (basicsModel.DailyWithdrawalLimit != -1)
{
//获取当日所有用户提现金额
decimal RemitMoney = distributor_RemitRepository.GetAllUserToDayRemitMoney(demodel.TenantId, demodel.MallBaseId);
CanRemitMoney = (basicsModel.DailyWithdrawalLimit ?? 0) - RemitMoney;
//今日可提
decimal CanRemitMoney = (basicsModel.DailyWithdrawalLimit ?? 0) - RemitMoney;
CanRemitMoney = CanRemitMoney < 0 ? 0 : CanRemitMoney;
if (CanRemitMoney < (demodel.AppliedMoney ?? 0)) {
......
Mall.WebApi/Controllers/AppletWeChat/PublishController.cs
View file @ 83ffc508
......@@ -24,10 +24,10 @@ namespace Mall.WebApi.Controllers.AppletWeChat
public class PublishController : BaseController
{
private MiniProgramModule appletWeChatModule = new MiniProgramModule();
string projectUrl = Mall.Common.Config.ProjectUrl;
string developerKitsPort = Mall.Common.Config.DeveloperKitsPort;
string FirstPage = Mall.Common.Config.FirstPage;
private readonly MiniProgramModule appletWeChatModule = new MiniProgramModule();
readonly string projectUrl = Mall.Common.Config.ProjectUrl;
readonly string developerKitsPort = Mall.Common.Config.DeveloperKitsPort;
readonly string FirstPage = Mall.Common.Config.FirstPage;
/// <summary>
/// 发布微信小程序获取登录二维码
......@@ -37,9 +37,11 @@ namespace Mall.WebApi.Controllers.AppletWeChat
public ApiResult GetLoginAppletWeChat()
{
var parms = RequestParm;
var query = new RB_MiniProgram_Extend();
query.TenantId = UserInfo.TenantId;
query.MallBaseId = parms.MallBaseId;
var query = new RB_MiniProgram_Extend
{
TenantId = UserInfo.TenantId,
MallBaseId = parms.MallBaseId
};
var model = appletWeChatModule.GetTenantListModule(query).FirstOrDefault();
if (model == null)
{
......@@ -60,6 +62,7 @@ namespace Mall.WebApi.Controllers.AppletWeChat
}
catch (Exception ex)
{
Common.Plugin.LogHelper.Write(ex, "GetLoginAppletWeChat");
return ApiResult.Failed("获取登录二维码识别");
}
}
......@@ -91,6 +94,7 @@ namespace Mall.WebApi.Controllers.AppletWeChat
}
catch (Exception ex)
{
Common.Plugin.LogHelper.Write(ex, "GetPreviewAppletWeChat");
return ApiResult.Failed("获取登录二维码识别");
}
}
......@@ -104,9 +108,11 @@ namespace Mall.WebApi.Controllers.AppletWeChat
public ApiResult GetPuploadAppletWeChat()
{
var parms = RequestParm;
var query = new RB_MiniProgram_Extend();
query.TenantId = UserInfo.TenantId;
query.MallBaseId = parms.MallBaseId;
var query = new RB_MiniProgram_Extend
{
TenantId = UserInfo.TenantId,
MallBaseId = parms.MallBaseId
};
var model = appletWeChatModule.GetTenantListModule(query).FirstOrDefault();
if (model == null)
{
......@@ -138,6 +144,7 @@ namespace Mall.WebApi.Controllers.AppletWeChat
}
catch (Exception ex)
{
Common.Plugin.LogHelper.Write(ex, "GetPuploadAppletWeChat");
return ApiResult.Failed("上传失败");
}
}
......@@ -155,9 +162,11 @@ namespace Mall.WebApi.Controllers.AppletWeChat
public virtual ApiResult GetWeiXinShare()
{
var parms = RequestParm;
var query = new RB_MiniProgram_Extend();
query.TenantId = UserInfo.TenantId;
query.MallBaseId = parms.MallBaseId;
var query = new RB_MiniProgram_Extend
{
TenantId = UserInfo.TenantId,
MallBaseId = parms.MallBaseId
};
var appletWeChatModel = appletWeChatModule.GetTenantListModule(query).FirstOrDefault();
string imgBase64 = appletWeChatModule.GetWeiXinShare(appletWeChatModel, FirstPage);
......@@ -293,9 +302,11 @@ namespace Mall.WebApi.Controllers.AppletWeChat
JObject parmsJob = JObject.Parse(RequestParm.msg.ToString());
string OpenId = parmsJob.GetStringValue("OpenId");
var query = new RB_Member_Subscription_Extend();
query.TenantId = UserInfo.TenantId;
query.MallBaseId = parms.MallBaseId;
var query = new RB_Member_Subscription_Extend
{
TenantId = UserInfo.TenantId,
MallBaseId = parms.MallBaseId
};
if (string.IsNullOrEmpty(OpenId))
{
......@@ -396,6 +407,7 @@ namespace Mall.WebApi.Controllers.AppletWeChat
[HttpPost]
[Obsolete]
public ApiResult GetLiveHousePageList()
{
var parms = RequestParm;
......@@ -427,19 +439,18 @@ namespace Mall.WebApi.Controllers.AppletWeChat
/// </summary>
/// <param name="timeStamp">Unix时间戳格式</param>
/// <returns>C#格式时间</returns>
[Obsolete]
public static string GetTime(string timeStamp)
{
try
{
DateTime dtStart = TimeZone.CurrentTimeZone.ToLocalTime(new DateTime(1970, 1, 1));
long lTime = long.Parse(timeStamp + "0000000");
TimeSpan toNow = new TimeSpan(lTime);
return dtStart.Add(toNow).ToString("yyyy-MM-dd HH:mm:ss");
}
catch (Exception)
{
return "";
}
}
......
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