ss002/RenyiServer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

新分配方案改了一部分

Browse Source
This commit is contained in:
lym
2026-03-20 02:20:12 +08:00
parent d049fc2c76
commit 1b8c475381
8 changed files with 215 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Mtxfw.VipSite/Admin_Member_Products_add1.aspx
View File

@@ -461,7 +461,7 @@
var len = 1;
function onaddgg() {
//var html = '<ul class="addggbox_box" id="addggbox_box' + len + '"><li class="textgg"><input id="textgg" type="text" /></li><li class="textjg"><input id="textjg" type="text" /></li><li class="textjg"><input id="textjg2" type="text" /></li><li class="textjg"><input id="textjg0" type="text" /></li><li class="textjg"><input id="textjg1" type="text" /></li>';
var html = '<ul class="addggbox_box" id="addggbox_box' + len + '"><li class="textgg"><input id="textgg" type="text" /></li><li class="textjg"><input id="textjg" type="text" /></li><li class="textjg"><input id="textjg2" type="text" /></li>';
var html = '<ul class="addggbox_box" id="addggbox_box' + len + '"><li class="textgg"><input id="textgg" type="text" /></li><li class="textjg"><input id="textjg" type="text" /></li><li class="textjg"><input id="textjg2" type="text" /></li><li class="textjg"><input id="textjg4" type="text" /></li>';
html += '<li class="textzl"><input id="textzl" type="text" /></li><li class="textkc"><input id="textkc" type="text" /></li><li class="textcolor" colors="" onclick="showcolor(' + len + ')">#颜色#</li><li class="texttp" tps="" onclick="showtp(' + len + ')">#图片#</li><li class="textcz"><input id="editbtn" class="abtn" type="button" value="保存" onclick="showedit(' + len + ')" /><input id="delbtn" class="abtn" type="button" value="删除" onclick="ondelgg(' + len + ')" /></div></li></ul>';
@@ -500,7 +500,7 @@
var jg0 = "";
var jg1 = "";//fTrim($("#addggbox_box" + id + " #textjg1").val());
var jg3 = "";
var jg4 = "";
jg4 = fTrim($("#addggbox_box" + id + " #textjg4").val());
var jg5 = "";
var jg6 = "";
@@ -1005,13 +1005,13 @@
<td>
<div class="addggbox">
<ul class="addggbox_title"><li class="textgg">规格</li><li>会员价</li><li>零售价</li>
<ul class="addggbox_title"><li class="textgg">规格</li><li>会员价</li><li>零售价</li><li>消费值</li>
<li>重量</li><li>库存</li><li>颜色</li><li>图片</li><li class="textcz"><input id="addbtn" class="abtn" type="button" value="添加" onclick="onaddgg()" /></li></ul>
<%=guige%>
<%if (guige == "")
{%>
<ul class="addggbox_box" id="addggbox_box0"><li class="textgg"><input id="textgg" type="text" /></li><li class="textjg2"><input id="textjg" type="text" /></li><li class="textjg"><input id="textjg2" type="text" /></li>
<ul class="addggbox_box" id="addggbox_box0"><li class="textgg"><input id="textgg" type="text" /></li><li class="textjg2"><input id="textjg" type="text" /></li><li class="textjg"><input id="textjg2" type="text" /></li><li class="textjg"><input id="textjg4" type="text" /></li>
<li class="textzl"><input id="textzl" type="text" /></li><li class="textkc"><input id="textkc" type="text" /></li><li class="textcolor" colors="" onclick="showcolor(0)">#颜色#</li><li class="texttp" tps="" onclick="showtp(0)">#图片#</li><li class="textcz"><input id="editbtn" class="abtn" type="button" value="保存" onclick="showedit(0)" /><input id="delbtn" class="abtn" type="button" value="删除" onclick="ondelgg(0)" /><input id="ggids" type="hidden" value="" runat="server" /></li></ul>
<%} %>

4
Mtxfw.VipSite/Admin_Member_Products_add1.aspx.cs
View File

@@ -106,7 +106,7 @@ namespace Mtxfw.VipSite
int G_KC = int.Parse(Dr["G_KC"].ToString());
string colors = Dr["G_Color"].ToString();
string tps = Dr["G_Images"].ToString();
guige += "<ul class=\"addggbox_box addggbox_boxed\" id=\"addggbox_box" + G_ID + "\"><li class=\"textgg\"><input id=\"textgg\" type=\"text\" value=\"" + G_Name + "\" /></li><li class=\"textjg2\"><input id=\"textjg\" type=\"text\"value=\"" + G_JG + "\" /></li><li class=\"textjg\"><input id=\"textjg2\" type=\"text\" value=\"" + G_JG2 + "\" /></li>";
guige += "<ul class=\"addggbox_box addggbox_boxed\" id=\"addggbox_box" + G_ID + "\"><li class=\"textgg\"><input id=\"textgg\" type=\"text\" value=\"" + G_Name + "\" /></li><li class=\"textjg2\"><input id=\"textjg\" type=\"text\"value=\"" + G_JG + "\" /></li><li class=\"textjg\"><input id=\"textjg2\" type=\"text\" value=\"" + G_JG2 + "\" /></li><li class=\"textjg\"><input id=\"textjg4\" type=\"text\" value=\"" + G_JG4+ "\" /></li>";
@@ -213,7 +213,7 @@ namespace Mtxfw.VipSite
string colors = Dr["G_Color"].ToString();
string tps = Dr["G_Images"].ToString();
//guige += "<ul class=\"addggbox_box addggbox_boxed\" id=\"addggbox_box" + G_ID + "\"><li class=\"textgg\"><input id=\"textgg\" type=\"text\" value=\"" + G_Name + "\" /></li><li class=\"textjg2\"><input id=\"textjg\" type=\"text\"value=\"" + G_JG + "\" /></li><li class=\"textjg\"><input id=\"textjg2\" type=\"text\" value=\"" + G_JG2 + "\" /></li><li class=\"textjg\"><input id=\"textjg0\" type=\"text\" value=\"" + G_JG0 + "\" /></li><li class=\"textjg\"><input id=\"textjg1\" type=\"text\" value=\"" + G_JG1 + "\" /></li>";
guige += "<ul class=\"addggbox_box addggbox_boxed\" id=\"addggbox_box" + G_ID + "\"><li class=\"textgg\"><input id=\"textgg\" type=\"text\" value=\"" + G_Name + "\" /></li><li class=\"textjg2\"><input id=\"textjg\" type=\"text\"value=\"" + G_JG + "\" /></li><li class=\"textjg\"><input id=\"textjg2\" type=\"text\" value=\"" + G_JG2 + "\" /></li>";
guige += "<ul class=\"addggbox_box addggbox_boxed\" id=\"addggbox_box" + G_ID + "\"><li class=\"textgg\"><input id=\"textgg\" type=\"text\" value=\"" + G_Name + "\" /></li><li class=\"textjg2\"><input id=\"textjg\" type=\"text\"value=\"" + G_JG + "\" /></li><li class=\"textjg\"><input id=\"textjg2\" type=\"text\" value=\"" + G_JG2 + "\" /></li><li class=\"textjg\"><input id=\"textjg4\" type=\"text\" value=\"" + G_JG4 + "\" /></li>";

55
Mtxfw.VipSite/GetFiles.ashx.cs
View File

@@ -1,4 +1,4 @@
using System;
using System;
using System.Collections.Generic;
using System.Web;
using System.IO;
@@ -92,23 +92,32 @@ namespace Mtxfw.VipSite
/// <returns></returns>
protected string CheckRequestSizeIsExists(string itsize, string filepath)
{
string _path = Path.Combine(config.webUpPath, itsize);
if (filepath.IndexOf("/Files/grimage/") == -1)
try
{
_path = Path.Combine(_path, filepath);
string _path = Path.Combine(config.webUpPath, itsize);
if (filepath.IndexOf("/Files/grimage/") == -1)
{
_path = Path.Combine(_path, filepath);
}
else
{
_path = _path.Replace("\\", "/") + filepath;
}
//_path = _path.Replace("\\", "/");
if (File.Exists(HttpContext.Current.Server.MapPath(_path)))
{
return _path;
}
else
{
return "";
}
}
else
catch (Exception ex)
{
_path = _path.Replace("\\", "/") + filepath;
}
if (File.Exists(HttpContext.Current.Server.MapPath(_path)))
{
return _path;
}
else
{
return "";
}
return "";
}
/// <summary>
@@ -135,6 +144,20 @@ namespace Mtxfw.VipSite
string itsize = Query.Get("itsize", "");
if (Mtxfw.Utility.Common.Is_ThumbNail_AllowSizes(itsize)) //是否为允许的尺寸
{
//https://fv.pmhapp.cn/ksd2023/20260309225240.png
//如果包含https，则只取域名之后的部分
//if (ate_FilePath.StartsWith("http://", StringComparison.OrdinalIgnoreCase) ||
// ate_FilePath.StartsWith("https://", StringComparison.OrdinalIgnoreCase))
//{
// Uri uri = new Uri(ate_FilePath);
// ate_FilePath = uri.AbsolutePath;
// // 移除开头的斜杠（如果有）
// if (ate_FilePath.StartsWith("/"))
// {
// ate_FilePath = ate_FilePath.Substring(1);
// }
//}
//获取已存在的缩略图
string existfilepath = CheckRequestSizeIsExists(itsize, ate_FilePath);
//没有该尺寸已生成好的图，创建缩略图
@@ -151,8 +174,8 @@ namespace Mtxfw.VipSite
{
saveFilePath = saveFilePath.Replace("\\", "/") + ate_FilePath;
}
string savepath = Path.GetDirectoryName(saveFilePath);
saveFilePath = saveFilePath.Replace("\\", "/")
; string savepath = Path.GetDirectoryName(saveFilePath);
if (!Directory.Exists(HttpContext.Current.Server.MapPath(savepath)))
{
Directory.CreateDirectory(HttpContext.Current.Server.MapPath(savepath));

2
Mtxfw.VipSite/pay/hfpay_notify_url_huiyuan.aspx.cs
View File

@@ -888,6 +888,8 @@ namespace Mtxfw.VipSite
}
Mtxfw.Utility.Common.WriteHtml("/weixin/8", i.ToString());
///lym修改
Mtxfw.Model.P_Guige ggmodel = new DAL.P_Guige().GetModel(Convert.ToInt32(OrderModel.pid));
var xfz = ggmodel.G_JG4;
DAL.MemberStatistics_huiyuan.UpdteYJ(config, umodel, money, gtype, dt, OrderModel.ttype, OrderModel.ptype, peitype, OrderModel.orderid, OrderModel.Id, OrderModel.Province, OrderModel.City, OrderModel.County, OrderModel.Tradingarea);
daoorder.UpdateqyState(0, "1", dt, OrderModel.Id);

9
Mtxfw.VipSite/xapiajax.ashx.cs
View File

@@ -16445,16 +16445,19 @@ namespace Mtxfw.VipSite
if (utype == 0)
{
DAL.MemberStatistics.UpdteYJ(config, umodel, money, money0, money2, money3, gtype, dt, OrderModel.ttype, OrderModel.ptype, peitype, OrderModel.orderid, OrderModel.Id, OrderModel.Province, OrderModel.City, OrderModel.County, OrderModel.Tradingarea);
}
}
else if (utype == 2)
{
if (ycount0 > 0)
{
money0 = money1;
}
///lym修改
Mtxfw.Model.P_Guige ggmodel = new DAL.P_Guige().GetModel(Convert.ToInt32(OrderModel.pid));
var xfz = ggmodel.G_JG4;
///lym修改 这里变成热卖商城余额支付了，看得我懵逼了
//DAL.MemberStatistics.UpdteYJ(config, umodel, money, money0, money2, money3, gtype, dt, OrderModel.ttype, OrderModel.ptype, peitype, OrderModel.orderid, OrderModel.Id, OrderModel.Province, OrderModel.City, OrderModel.County, OrderModel.Tradingarea);
DAL.MemberStatistics_huiyuan.UpdteYJ(config, umodel, money, gtype, dt, OrderModel.ttype, OrderModel.ptype, peitype, OrderModel.orderid, OrderModel.Id, OrderModel.Province, OrderModel.City, OrderModel.County, OrderModel.Tradingarea);
DAL.MemberStatistics_huiyuan.UpdteYJ(config, umodel, money, xfz, gtype, dt, OrderModel.ttype, OrderModel.ptype, peitype, OrderModel.orderid, OrderModel.Id, OrderModel.Province, OrderModel.City, OrderModel.County, OrderModel.Tradingarea);
}
if (utype == 14)
{