|
@@ -70,33 +70,34 @@ public class WifiTradeHelper
|
|
{
|
|
{
|
|
decimal TradeAmt = trade.TradeAmount / trade.Duration;
|
|
decimal TradeAmt = trade.TradeAmount / trade.Duration;
|
|
TradeAmt = PublicFunction.NumberFormat(TradeAmt);
|
|
TradeAmt = PublicFunction.NumberFormat(TradeAmt);
|
|
- PosMachinesTwo pos = posList.FirstOrDefault(m => m.PosSn == trade.SnNo) ?? new PosMachinesTwo();
|
|
|
|
- PosMerchantInfo mer = merList.FirstOrDefault(m => m.Id == pos.BindMerchantId) ?? new PosMerchantInfo();
|
|
|
|
- StatTrade(statTrade, users, pos.BuyUserId, pos.BrandId, Month.Replace("-", ""), TradeAmt);
|
|
|
|
- if (pos.BindingTime < trade.CreateDate.Value.AddMonths(-9))
|
|
|
|
- {
|
|
|
|
- StatTradeBefore(statTradeBefore, users, pos.BuyUserId, pos.BrandId, Month.Replace("-", ""), TradeAmt);
|
|
|
|
- }
|
|
|
|
- else
|
|
|
|
- {
|
|
|
|
- StatTradeAfter(statTradeAfter, users, pos.BuyUserId, pos.BrandId, Month.Replace("-", ""), TradeAmt);
|
|
|
|
- }
|
|
|
|
|
|
+ // PosMachinesTwo pos = posList.FirstOrDefault(m => m.PosSn == trade.SnNo) ?? new PosMachinesTwo();
|
|
|
|
+ // PosMerchantInfo mer = merList.FirstOrDefault(m => m.Id == pos.BindMerchantId) ?? new PosMerchantInfo();
|
|
|
|
+ // StatTrade(statTrade, users, pos.BuyUserId, pos.BrandId, Month.Replace("-", ""), TradeAmt);
|
|
|
|
+ // if (pos.BindingTime < trade.CreateDate.Value.AddMonths(-9))
|
|
|
|
+ // {
|
|
|
|
+ // StatTradeBefore(statTradeBefore, users, pos.BuyUserId, pos.BrandId, Month.Replace("-", ""), TradeAmt);
|
|
|
|
+ // }
|
|
|
|
+ // else
|
|
|
|
+ // {
|
|
|
|
+ // StatTradeAfter(statTradeAfter, users, pos.BuyUserId, pos.BrandId, Month.Replace("-", ""), TradeAmt);
|
|
|
|
+ // }
|
|
WifiTradeRecord edit = db.WifiTradeRecord.FirstOrDefault(m => m.Id == trade.Id);
|
|
WifiTradeRecord edit = db.WifiTradeRecord.FirstOrDefault(m => m.Id == trade.Id);
|
|
if(edit != null)
|
|
if(edit != null)
|
|
{
|
|
{
|
|
edit.DoMonths += 1;
|
|
edit.DoMonths += 1;
|
|
edit.LastMonth = Month.Replace("-", "");
|
|
edit.LastMonth = Month.Replace("-", "");
|
|
|
|
+ db.SaveChanges();
|
|
|
|
|
|
//推送wifi交易给java
|
|
//推送wifi交易给java
|
|
- // PosPushDataNewHelper.Trade(new MySystem.SpModels.TradeRecord()
|
|
|
|
- // {
|
|
|
|
- // TradeSnNo = edit.SnNo,
|
|
|
|
- // MerNo = edit.Remark,
|
|
|
|
- // TradeAmount = TradeAmt,
|
|
|
|
- // TradeSerialNo = Guid.NewGuid().ToString(),
|
|
|
|
- // CreateDate = DateTime.Parse(DateTime.Now.AddMonths(-1).ToString("yyyy-MM") + "-01 00:00:00"),
|
|
|
|
- // ProductType = edit.BrandId.ToString(),
|
|
|
|
- // });
|
|
|
|
|
|
+ PosPushDataNewHelper.Trade(new MySystem.SpModels.TradeRecord()
|
|
|
|
+ {
|
|
|
|
+ TradeSnNo = edit.SnNo,
|
|
|
|
+ MerNo = edit.SnNo,
|
|
|
|
+ TradeAmount = TradeAmt,
|
|
|
|
+ TradeSerialNo = Guid.NewGuid().ToString(),
|
|
|
|
+ CreateDate = DateTime.Parse(DateTime.Now.AddMonths(-1).ToString("yyyy-MM") + "-01 00:00:00"),
|
|
|
|
+ ProductType = edit.BrandId.ToString(),
|
|
|
|
+ });
|
|
}
|
|
}
|
|
SnNos.Add(trade.SnNo);
|
|
SnNos.Add(trade.SnNo);
|
|
}
|
|
}
|