新分配方案改了一部分

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

View File

@@ -31,10 +31,11 @@ namespace Mtxfw.DAL
/// </summary>
/// <param name="config"></param>
/// <param name="umodel"></param>
/// <param name="pv"></param>
/// <param name="pv">付款金额</param>
/// <param name="xfz">消费值</param>
/// <param name="gtype"></param>
/// <param name="dt"></param>
/// <param name="ttype"></param>
/// <param name="ttype">0热卖推荐1会员商城</param>
/// <param name="ptype"></param>
/// <param name="peitype"></param>
/// <param name="orderid"></param>
@@ -43,7 +44,7 @@ namespace Mtxfw.DAL
/// <param name="City"></param>
/// <param name="County"></param>
/// <param name="Tradingarea"></param>
public static void UpdteYJ(Mtxfw.Utility.Config config, Model.user_info umodel, Double pv, int gtype, DateTime dt, int ttype,int ptype, int peitype, string orderid, int OId, string Province, string City, string County, string Tradingarea)
public static void UpdteYJ(Mtxfw.Utility.Config config, Model.user_info umodel, Double pv, Double xfz, int gtype, DateTime dt, int ttype,int ptype, int peitype, string orderid, int OId, string Province, string City, string County, string Tradingarea)
{
Model.User_Errlog mo;
string mindt = DateTime.Now.ToString("yyyy-MM-dd") + " 00:00:00";
@@ -60,7 +61,7 @@ namespace Mtxfw.DAL
mjl2.Cutmoney = 0;
mjl2.Totalmoney = umodel.umoney20 + pv;
mjl2.addtime = dt;
mjl2.BZContent = "购买套餐";
mjl2.BZContent = ttype == 0 ? "购买热卖商品" : "购买商城商品";
mjl2.PayID = "";
mjl2.OrdersIDs = "";
mjl2.OrdersID = 0;
@@ -92,8 +93,12 @@ namespace Mtxfw.DAL
//}
#endregion
///如果符合条件更新自己的等级
var uplevel = UpdteSelfuLevel(gtype, umodel, config, ptype, pv);
///如果热卖推荐且符合条件更新自己的等级
if(ttype == 0)
{
var uplevel = UpdteSelfuLevel(gtype, umodel, config, ptype, pv);
}
/// umodel.ContactIDS 值的格式如下:",68,160021,160023,160024,"
string[] ASuperiorsIDS = (umodel.ContactIDS).Split(',');
@@ -131,8 +136,15 @@ namespace Mtxfw.DAL
daoUser.UpdateMoney("umoney19", pv, dID);
var isLast = ak == 1;
//先更新业绩
yfbl = JiangJinJS(config, umodel, ds.Tables[0].Rows[0], YContactID, YContactIDS, pv, yfbl);
//热卖商品,且遍历到当前会员是付款仁直接推荐人,则计算佣金
if(ttype == 0 && YuLevel == YContactID)
{
//计算佣金
YongJinJS(config, umodel, ds.Tables[0].Rows[0], YContactID, YContactIDS, pv, xfz, yfbl, ttype);
}
//结算奖金(按等级算批发差价)
yfbl = JiangJinJS(config, umodel, ds.Tables[0].Rows[0], YContactID, YContactIDS, pv, xfz, yfbl, ttype);
}
@@ -140,8 +152,8 @@ namespace Mtxfw.DAL
/////如果符合条件更新自己的等级 移到上面了,这里 注释掉了,如果今后没影响,记得删掉,留着没意义
//var uplevel = UpdteSelfuLevel(gtype, umodel, config, ptype, pv);
///更新上级的等级
if (uplevel > 0)
///如果热卖商城的商品,更新上级的等级
if (uplevel > 0 && ttype == 0)
{
UpdteContacttLevel(gtype, umodel, config, ds.Tables[0].Rows[0], YContactID, YContactIDS, uplevel);
///上面更新金额和等级的几个方法顺序不能颠倒,否则会出错
@@ -910,16 +922,18 @@ namespace Mtxfw.DAL
#endregion
/// <summary>
/// 奖金结算
/// 奖金结算(批发差价)
/// </summary>
/// <param name="config">配置文件</param>
/// <param name="umodel">支付客户数据</param>
/// <param name="ContactRow">一条支付链条用户数据</param>
/// <param name="YContactID">支付客户直接上级</param>
/// <param name="YContactIDS">支付链条</param>
/// <param name="pv">消费金额</param>
/// <param name="pv">付款金额</param>
/// <param name="xfz">消费值</param>
/// <param name="yfbl">已分奖金比例</param>
public static Double JiangJinJS(Mtxfw.Utility.Config config, Model.user_info umodel, DataRow ContactRow, int YContactID,string YContactIDS, Double pv,double yfbl)
/// <param name="ttype">0热卖推荐1会员商城</param>
public static Double JiangJinJS(Mtxfw.Utility.Config config, Model.user_info umodel, DataRow ContactRow, int YContactID,string YContactIDS, Double pv, Double xfz, double yfbl,int ttype)
{
Model.User_Errlog mo;
DateTime dt = DateTime.Now;
@@ -933,23 +947,60 @@ namespace Mtxfw.DAL
int buyerlevel = umodel.uLevel;
var buyerlevelname = Mtxfw.Utility.Common.GetuLevelname(buyerlevel);
var Contactlevelname = Mtxfw.Utility.Common.GetuLevelname(ContactLevel); ;
var BZContent = "";//备注
if (ttype == 0)
{
BZContent = "热卖商品批发差价"
}
else
{
BZContent = "商城商品批发差价"
}
//当前奖金比例
Double fixed_bonus = 0;
//当前级别对应的最大奖金比例 - 下级已分比例 等于当前等级剩余可分奖金比例
switch (ContactLevel)
//热卖商品分配方案
if (ttype == 0)
{
case 1:
fixed_bonus = config.level1_fixed_bonus - yfbl;
break;
case 2:
fixed_bonus = config.level2_fixed_bonus - yfbl;
break;
case 3:
fixed_bonus = config.level3_fixed_bonus - yfbl;
break;
case 4:
fixed_bonus = config.level4_fixed_bonus - yfbl;
break;
//直接推荐人获得业务佣金
if (ContactLevel == YContactID)
{
var yjbl
}
switch (ContactLevel)
{
case 1:
fixed_bonus = config.level1_fixed_bonus - yfbl;
break;
case 2:
fixed_bonus = config.level2_fixed_bonus - yfbl;
break;
case 3:
fixed_bonus = config.level3_fixed_bonus - yfbl;
break;
case 4:
fixed_bonus = config.level4_fixed_bonus - yfbl;
break;
}
}
//商城商品分配方案
else
{
switch (ContactLevel)
{
case 1:
fixed_bonus = config.level1_fixed_bonus - yfbl;
break;
case 2:
fixed_bonus = config.level2_fixed_bonus - yfbl;
break;
case 3:
fixed_bonus = config.level3_fixed_bonus - yfbl;
break;
case 4:
fixed_bonus = config.level4_fixed_bonus - yfbl;
break;
}
}
if (fixed_bonus > 0)
{
@@ -965,7 +1016,7 @@ namespace Mtxfw.DAL
mjl2.Cutmoney = 0;
mjl2.Totalmoney = -(Yumoney17 - jaingjin);
mjl2.addtime = dt;
mjl2.BZContent = "奖金结算";
mjl2.BZContent = BZContent;
mjl2.PayID = "";
mjl2.OrdersIDs = "";
mjl2.OrdersID = 0;
@@ -1002,6 +1053,88 @@ namespace Mtxfw.DAL
return result;
}
/// <summary>
/// 佣金结算
/// </summary>
/// <param name="config">配置文件</param>
/// <param name="umodel">支付客户数据</param>
/// <param name="ContactRow">一条支付链条用户数据</param>
/// <param name="YContactID">支付客户直接上级</param>
/// <param name="YContactIDS">支付链条</param>
/// <param name="pv">付款金额</param>
/// <param name="xfz">消费值</param>
/// <param name="yfbl">已分奖金比例</param>
/// <param name="ttype">0热卖推荐1会员商城</param>
public static Double YongJinJS(Mtxfw.Utility.Config config, Model.user_info umodel, DataRow ContactRow, int YContactID, string YContactIDS, Double pv, Double xfz, double yfbl, int ttype)
{
Model.User_Errlog mo;
DateTime dt = DateTime.Now;
double result = yfbl;
try
{
int dID = Convert.ToInt32(ContactRow["ID"].ToString());
//Yumoney17就是余额而且写成负数
Double Yumoney17 = Convert.ToDouble(Convert.ToDouble(ContactRow["umoney17"]).ToString("f4"));
int ContactLevel = Convert.ToInt32(ContactRow["uLevel"].ToString());
int buyerlevel = umodel.uLevel;
var buyerlevelname = Mtxfw.Utility.Common.GetuLevelname(buyerlevel);
var Contactlevelname = Mtxfw.Utility.Common.GetuLevelname(ContactLevel); ;
var BZContent = "业务佣金";//备注
Double fixed_bonus = 0//config.level3_fixed_bonus
if (fixed_bonus > 0)
{
if (pv > 0)
{
Double jaingjin = Convert.ToDouble((fixed_bonus * pv).ToString("f4"));
if (jaingjin > 0.0000)
{
var mjl2 = new Model.user_Results_jl2();
mjl2.MemberId = dID;
mjl2.MemberId2 = 0;
mjl2.Addmoney = jaingjin;
mjl2.Cutmoney = 0;
mjl2.Totalmoney = -(Yumoney17 - jaingjin);
mjl2.addtime = dt;
mjl2.BZContent = BZContent;
mjl2.PayID = "";
mjl2.OrdersIDs = "";
mjl2.OrdersID = 0;
mjl2.utype = 1;
mjl2.utype2 = 0;
mjl2.Seef = 0;
mjl2.seeftime = dt;
mjl2.gtype = 0;
daojl2.Add(mjl2);
}
var flag = daoUser.UpdateMoney("umoney17", -jaingjin, dID);
if (flag > 0)
{
//增加已分比例
return result += fixed_bonus;
}
}
}
}
catch (Exception ex)
{
mo = new Model.User_Errlog();
mo.DLID = 0;
mo.ErrType = "奖金结算,JiangJinJS";
mo.addtime = dt;
mo.ErrBody = ex.ToString();
mo.ErrBody2 = ex.Message;
new DAL.User_Errlog().Add(mo);
}
return result;
}
#region
public static void UpdteJJ(Mtxfw.Utility.Config config, int YID, Int64 ResultId, string ContactIDS, string UserName, Double umoney26, Double pv, ref Double FHMoney0, int gtype, DateTime dt, int ifxy)
{

View File

@@ -19,7 +19,7 @@ namespace Mtxfw.Model
private Double _G_JG1;//<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
private Double _G_JG2;//ԭ<><D4AD>
private Double _G_JG3;//<2F>ɱ<EFBFBD><C9B1><EFBFBD>
private Double _G_JG4;//<2F><>ֵ<EFBFBD><D6B5><EFBFBD><EFBFBD>//<2F><><EFBFBD><EFBFBD>ֵ
private Double _G_JG4;//<2F><>ֵ<EFBFBD><D6B5><EFBFBD><EFBFBD>//<2F><><EFBFBD><EFBFBD>ֵ/<2F><><EFBFBD><EFBFBD>ֵ<EFBFBD><D6B5><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ʒ<EFBFBD><C6B7><EFBFBD><EFBFBD>ģʽ2<CABD><32><EFBFBD><EFBFBD><EFBFBD>ϰ<EFBFBD><CFB0><EFBFBD><EFBFBD><EFBFBD>Ϊ<EFBFBD><CEAA>׼<EFBFBD>ۣ<EFBFBD>
private Double _G_JG5;//<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>/<2F>׵<EFBFBD>ֱ<EFBFBD>ƽ<EFBFBD><C6BD><EFBFBD>
private Double _G_JG6;//˰/<2F>׵<EFBFBD><D7B5><EFBFBD><EFBFBD>ƽ<EFBFBD><C6BD><EFBFBD>
private Double _G_JG7;//<2F><><EFBFBD><EFBFBD>ֱ<EFBFBD>ƽ<EFBFBD><C6BD><EFBFBD>

View File

@@ -11,7 +11,7 @@ namespace Mtxfw.Model
{ }
#region Model
private int _id;
private int _pid;//直播ID或拼单商品ID
private int _pid;//直播ID或拼单商品ID 明明就是规格id
private int _poid;//拼单父ID
private int _pcount;//需拼单数量/已转售数量
private int _ypcount;//已拼单数量/已提货数量

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>
<%} %>

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>";

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));

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);

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)
{