From 4b916dd4e22f726973af3defb4281f45bdf214e2 Mon Sep 17 00:00:00 2001
From: client_Zxw <826696702@qq.com>
Date: 星期二, 26 三月 2019 16:39:48 +0800
Subject: [PATCH] 3088 【BUG】【2.0】拍卖，没有加时
---
System/Auction/AuctionInquiryModel.cs | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/System/Auction/AuctionInquiryModel.cs b/System/Auction/AuctionInquiryModel.cs
index ed6813d..0efbd4e 100644
--- a/System/Auction/AuctionInquiryModel.cs
+++ b/System/Auction/AuctionInquiryModel.cs
@@ -18,7 +18,8 @@
public int ItemID;//鐗╁搧ID
public int ItemCount;
public string TimeStr;//涓婃灦鏃堕棿 yyyy-MM-dd hh:mm:ss
- public DateTime Time;
+ public DateTime Time;//涓婃灦鏃堕棿
+ public DateTime TimeEnd;//鏈�鍚庝笂鏋舵椂闂�
public int BidderPrice;//绔炴媿鐜╁鍑轰环
public string UserData;//鑷畾涔夋暟鎹�
public string FamilyPlayerIDInfo;//鍙幏寰楁敹鐩婄殑浠欑洘鐜╁ID淇℃伅
@@ -131,6 +132,7 @@
playerAuctionItemClass.ItemCount = (int)PlayerAuctionItem.ItemCount;
playerAuctionItemClass.TimeStr = PlayerAuctionItem.AddTime;
playerAuctionItemClass.Time = DateTime.Parse(PlayerAuctionItem.AddTime);
+ playerAuctionItemClass.TimeEnd= DateTime.Parse(PlayerAuctionItem.BiddingTime);
playerAuctionItemClass.BidderPrice = PlayerAuctionItem.BidderPrice;
playerAuctionItemClass.UserData = PlayerAuctionItem.UserData;
var index = FullServiceAuctionList.FindIndex((x) => { return x.ItemGUID == PlayerAuctionItem.ItemGUID; });
@@ -190,6 +192,7 @@
playerAuctionItemClass.ItemCount = (int)PlayerAuctionItem.ItemCount;
playerAuctionItemClass.TimeStr = PlayerAuctionItem.AddTime;
playerAuctionItemClass.Time = DateTime.Parse(PlayerAuctionItem.AddTime);
+ playerAuctionItemClass.TimeEnd= DateTime.Parse(PlayerAuctionItem.BiddingTime);
playerAuctionItemClass.BidderPrice = PlayerAuctionItem.BidderPrice;
playerAuctionItemClass.UserData = PlayerAuctionItem.UserData;
if (PlayerAuctionItemInfoDic.ContainsKey(playerAuctionItemClass.ItemGUID))
@@ -277,6 +280,7 @@
familyAuctionItemClass.ItemCount = (int)FamilyAuctionItem.ItemCount;
familyAuctionItemClass.TimeStr = FamilyAuctionItem.AddTime;
familyAuctionItemClass.Time = DateTime.Parse(FamilyAuctionItem.AddTime);
+ familyAuctionItemClass.TimeEnd= DateTime.Parse(FamilyAuctionItem.BiddingTime);
familyAuctionItemClass.BidderPrice = FamilyAuctionItem.BidderPrice;
familyAuctionItemClass.UserData = FamilyAuctionItem.UserData;
familyAuctionItemClass.FamilyPlayerIDInfo = FamilyAuctionItem.FamilyPlayerIDInfo;
@@ -323,6 +327,7 @@
playerAuctionItemClass.ItemCount = (int)AttentionAuctionItem.ItemCount;
playerAuctionItemClass.TimeStr = AttentionAuctionItem.AddTime;
playerAuctionItemClass.Time = DateTime.Parse(AttentionAuctionItem.AddTime);
+ playerAuctionItemClass.TimeEnd= DateTime.Parse(AttentionAuctionItem.BiddingTime);
playerAuctionItemClass.BidderPrice = AttentionAuctionItem.BidderPrice;
playerAuctionItemClass.UserData = AttentionAuctionItem.UserData;
if (AttentionAuctionItemDic.ContainsKey(playerAuctionItemClass.ItemGUID))
@@ -373,6 +378,7 @@
{
FamilyAuctionItem.TimeStr = RefreshAuctionItem.AddTime;
FamilyAuctionItem.Time = DateTime.Parse(RefreshAuctionItem.AddTime);
+ FamilyAuctionItem.TimeEnd= DateTime.Parse(RefreshAuctionItem.BiddingTime);
FamilyAuctionItem.BidderID = (int)RefreshAuctionItem.BidderID;
FamilyAuctionItem.BidderPrice = (int)RefreshAuctionItem.BidderPrice;
FamilyAuctionItemDic[RefreshAuctionItem.ItemGUID] = FamilyAuctionItem;
@@ -458,6 +464,7 @@
BiddingItemClass.FamilyID = (int)BiddingItem.FamilyID;
BiddingItemClass.TimeStr = BiddingItem.AddTime;
BiddingItemClass.Time = DateTime.Parse(BiddingItem.AddTime);
+ BiddingItemClass.TimeEnd= DateTime.Parse(BiddingItem.BiddingTime);
BiddingItemClass.BidderPrice = BiddingItem.BidderPrice;//绔炴媿鐜╁鍑轰环
BiddingItemClass.BidderID = (int)BiddingItem.BidderID;//绔炴媿鐜╁ID锛屼篃灏辨槸褰撳墠鏈�楂樼珵浠风帺瀹禝D
BiddingItemClass.UserData = BiddingItem.UserData;
--
Gitblit v1.8.0