|
@@ -590,8 +590,8 @@ namespace MySystem.Controllers
|
|
|
}).Entity;
|
|
|
db.SaveChanges();
|
|
|
}
|
|
|
- machineData.BindCount = db.PosMachinesTwo.Count(m => (m.UserId == uid && m.BuyUserId == uid) && m.BrandId == kind && m.BindingState == 1);
|
|
|
- machineData.UnBindCount = db.PosMachinesTwo.Count(m => (m.UserId == uid && m.BuyUserId == uid) && m.BrandId == kind && m.BindingState == 0);
|
|
|
+ machineData.BindCount = db.PosMachinesTwo.Count(m => m.Status > -1 && m.BuyUserId == uid && m.BrandId == kind && m.BindingState == 1);
|
|
|
+ machineData.UnBindCount = db.PosMachinesTwo.Count(m => m.Status > -1 && m.BuyUserId == uid && m.BrandId == kind && m.BindingState == 0);
|
|
|
machineData.TotalMachineCount = machineData.BindCount + machineData.UnBindCount;
|
|
|
db.SaveChanges();
|
|
|
RedisDbconn.Instance.Set("UserMachineData:" + IdBrand, machineData);
|
|
@@ -670,7 +670,135 @@ namespace MySystem.Controllers
|
|
|
public string test()
|
|
|
{
|
|
|
string result = "ok";
|
|
|
-
|
|
|
+ OtherMySqlConn.connstr = "server=47.109.31.237;port=3306;user=KxsMainServer;password=Rw2imhXQQt5ODWIF;database=KxsMainServer;charset=utf8;";
|
|
|
+ DataTable dt = OtherMySqlConn.dtable("select * from ProfitSubsidyDetail where TradeMonth='202204'");
|
|
|
+ WebCMSEntities db = new WebCMSEntities();
|
|
|
+ foreach (DataRow dr in dt.Rows)
|
|
|
+ {
|
|
|
+ int BrandId = int.Parse(function.CheckInt(dr["BrandId"].ToString()));
|
|
|
+ int MerchantId = int.Parse(function.CheckInt(dr["MerchantId"].ToString()));
|
|
|
+ int SubsidyUserId = int.Parse(function.CheckInt(dr["SubsidyUserId"].ToString()));
|
|
|
+ int SubsidyType = int.Parse(function.CheckInt(dr["SubsidyType"].ToString()));
|
|
|
+ ulong MerHelpFlag = ulong.Parse(function.CheckInt(dr["MerHelpFlag"].ToString()));
|
|
|
+ decimal SubsidyProfitRate = decimal.Parse(function.CheckNum(dr["SubsidyProfitRate"].ToString()));
|
|
|
+ decimal CreditTradeAmt = decimal.Parse(function.CheckNum(dr["CreditTradeAmt"].ToString()));
|
|
|
+ decimal QrCreditTradeAmt = decimal.Parse(function.CheckNum(dr["QrCreditTradeAmt"].ToString()));
|
|
|
+ decimal NonQrCreditTradeAmt = decimal.Parse(function.CheckNum(dr["NonQrCreditTradeAmt"].ToString()));
|
|
|
+ decimal CreditProfitRate = decimal.Parse(function.CheckNum(dr["CreditProfitRate"].ToString()));
|
|
|
+ decimal SubsidyProfit = decimal.Parse(function.CheckNum(dr["SubsidyProfit"].ToString()));
|
|
|
+ string TradeMonth = dr["TradeMonth"].ToString();
|
|
|
+ string SnNo = dr["SnNo"].ToString();
|
|
|
+ string MerNo = dr["MerNo"].ToString();
|
|
|
+ string RecordNo = dr["RecordNo"].ToString();
|
|
|
+
|
|
|
+ MachineForSnNo forSnNo = db.MachineForSnNo.FirstOrDefault(m => m.SnNo == SnNo) ?? new MachineForSnNo();
|
|
|
+ PosMachinesTwo pos = db.PosMachinesTwo.FirstOrDefault(m => m.Id == forSnNo.SnId) ?? new PosMachinesTwo();
|
|
|
+ PosMerchantInfo merchant = db.PosMerchantInfo.FirstOrDefault(m => m.Id == MerchantId) ?? new PosMerchantInfo();
|
|
|
+ ProfitSubsidyDetail item = db.ProfitSubsidyDetail.FirstOrDefault(m => m.SubsidyUserId == SubsidyUserId && m.TradeMonth == TradeMonth && m.MerchantId == MerchantId && m.SnNo == SnNo);
|
|
|
+ if (item == null)
|
|
|
+ {
|
|
|
+ db.ProfitSubsidyDetail.Add(new ProfitSubsidyDetail()
|
|
|
+ {
|
|
|
+ CreateDate = DateTime.Now,
|
|
|
+ UpdateDate = DateTime.Now,
|
|
|
+ RecordNo = RecordNo, //流水号
|
|
|
+ BrandId = BrandId, //品牌
|
|
|
+ ProductName = RelationClass.GetKqProductBrandInfo(BrandId), //产品名称
|
|
|
+ TradeMonth = TradeMonth, //交易月份
|
|
|
+ MerchantId = MerchantId, //商户
|
|
|
+ MerNo = MerNo, //渠道商户编号
|
|
|
+ SnNo = SnNo, //渠道SN号
|
|
|
+ MerRegTime = pos.BindingTime, //渠道注册时间
|
|
|
+ MerStandardDate = merchant.MerStandardDate, //商户激活时间
|
|
|
+ BelongUserId = merchant.UserId, //商户归属人
|
|
|
+ MerHelpFlag = MerHelpFlag, //是否属于扶持周期内商户
|
|
|
+ SubsidyUserId = SubsidyUserId, //补贴人
|
|
|
+ SubsidyType = SubsidyType, //分润补贴类型
|
|
|
+ SubsidyProfitRate = SubsidyProfitRate, //创客活动期内直营商户分润万分之十
|
|
|
+ CreditTradeAmt = CreditTradeAmt, //商户贷记卡交易总金额
|
|
|
+ QrCreditTradeAmt = QrCreditTradeAmt, //商户(云闪付)贷记卡交易总金额
|
|
|
+ NonQrCreditTradeAmt = NonQrCreditTradeAmt, //商户(非云闪付)贷记卡交易总金额
|
|
|
+ CreditProfitRate = CreditProfitRate, //(非云闪付)贷记卡交易分润比例
|
|
|
+ SubsidyProfit = SubsidyProfit, //商户(非云闪付)贷记卡交易分润补贴金额
|
|
|
+ });
|
|
|
+ // db.SaveChanges();
|
|
|
+ result += "增加--SubsidyUserId:" + SubsidyUserId + ";SnNo" + SnNo + ";SubsidyProfit" + SubsidyProfit + ";";
|
|
|
+ }
|
|
|
+ else
|
|
|
+ {
|
|
|
+ if (item.SubsidyProfit < SubsidyProfit)
|
|
|
+ {
|
|
|
+ item.SubsidyProfitRate = SubsidyProfitRate; //创客活动期内直营商户分润万分之十
|
|
|
+ item.SubsidyProfit = SubsidyProfit; //商户(非云闪付)贷记卡交易分润补贴金额
|
|
|
+ result += "更新--SubsidyUserId:" + SubsidyUserId + ";SnNo" + SnNo + ";SubsidyProfit" + SubsidyProfit + ";";
|
|
|
+ // db.SaveChanges();
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ OtherMySqlConn.connstr = "";
|
|
|
+ db.Dispose();
|
|
|
+ return result;
|
|
|
+ }
|
|
|
+
|
|
|
+ public string test2()
|
|
|
+ {
|
|
|
+ string result = "ok";
|
|
|
+ OtherMySqlConn.connstr = "server=47.108.231.170;port=3306;user=KxsMainServer;password=Rw2imhXQQt5ODWIF;database=KxsMainServer;charset=utf8;";
|
|
|
+ DataTable dt = OtherMySqlConn.dtable("select SubsidyUserId,BrandId,sum(SubsidyProfitRate) as SubsidyProfit from ProfitSubsidyDetail where TradeMonth='202204' and SubsidyUserId>0 GROUP BY SubsidyUserId,BrandId");
|
|
|
+ WebCMSEntities db = new WebCMSEntities();
|
|
|
+ DateTime checkDate = DateTime.Parse("2022-05-20 00:00:00");
|
|
|
+ foreach (DataRow dr in dt.Rows)
|
|
|
+ {
|
|
|
+ int BrandId = int.Parse(function.CheckInt(dr["BrandId"].ToString()));
|
|
|
+ int SubsidyUserId = int.Parse(function.CheckInt(dr["SubsidyUserId"].ToString()));
|
|
|
+ decimal SubsidyProfit = decimal.Parse(function.CheckNum(dr["SubsidyProfit"].ToString()));
|
|
|
+ UserAccountRecord userAccountRecord = db.UserAccountRecord.FirstOrDefault(m => m.Id > 86538 && m.CreateDate > checkDate && m.UserId == SubsidyUserId && m.ProductType == BrandId && m.ChangeType == 111);
|
|
|
+ if (userAccountRecord == null)
|
|
|
+ {
|
|
|
+ UserAccount account = db.UserAccount.FirstOrDefault(m => m.Id == SubsidyUserId);
|
|
|
+ if (account == null)
|
|
|
+ {
|
|
|
+ account = db.UserAccount.Add(new UserAccount()
|
|
|
+ {
|
|
|
+ Id = SubsidyUserId,
|
|
|
+ UserId = SubsidyUserId,
|
|
|
+ }).Entity;
|
|
|
+ db.SaveChanges();
|
|
|
+ }
|
|
|
+ decimal BeforeTotalAmount = account.TotalAmount; //变更前总金额
|
|
|
+ decimal BeforeFreezeAmount = account.FreezeAmount; //变更前冻结金额
|
|
|
+ decimal BeforeBalanceAmount = account.BalanceAmount; //变更前余额
|
|
|
+ // account.BalanceAmount += SubsidyProfit;
|
|
|
+ // account.TotalAmount += SubsidyProfit;
|
|
|
+ decimal AfterTotalAmount = account.TotalAmount; //变更后总金额
|
|
|
+ decimal AfterFreezeAmount = account.FreezeAmount; //变更后冻结金额
|
|
|
+ decimal AfterBalanceAmount = account.BalanceAmount; //变更后余额
|
|
|
+ userAccountRecord = db.UserAccountRecord.Add(new UserAccountRecord()
|
|
|
+ {
|
|
|
+ CreateDate = DateTime.Now,
|
|
|
+ UpdateDate = DateTime.Now,
|
|
|
+ UserId = SubsidyUserId, //创客
|
|
|
+ ProductType = BrandId,
|
|
|
+ ChangeType = 111, //变动类型
|
|
|
+ ChangeAmount = SubsidyProfit, //变更金额
|
|
|
+ BeforeTotalAmount = BeforeTotalAmount, //变更前总金额
|
|
|
+ AfterTotalAmount = AfterTotalAmount, //变更后总金额
|
|
|
+ BeforeFreezeAmount = BeforeFreezeAmount, //变更前冻结金额
|
|
|
+ AfterFreezeAmount = AfterFreezeAmount, //变更后冻结金额
|
|
|
+ BeforeBalanceAmount = BeforeBalanceAmount, //变更前余额
|
|
|
+ AfterBalanceAmount = AfterBalanceAmount, //变更后余额
|
|
|
+ Remark = "直拓商户补贴",
|
|
|
+ }).Entity;
|
|
|
+ db.SaveChanges();
|
|
|
+ }
|
|
|
+ else
|
|
|
+ {
|
|
|
+ userAccountRecord.ChangeAmount = SubsidyProfit;
|
|
|
+ db.SaveChanges();
|
|
|
+ }
|
|
|
+ }
|
|
|
+ OtherMySqlConn.connstr = "";
|
|
|
+ db.Dispose();
|
|
|
return result;
|
|
|
}
|
|
|
}
|