|
|
@@ -87,7 +87,11 @@ class AuctionProc {
|
|
|
my_Assert(ctx()->baseInfo->cash >= $buyoutPrice, ErrCode::notenough_cash_msg);
|
|
|
//扣除钻石--交易费用 + 手续费
|
|
|
ctx()->base()->Consume_Cash($buyoutPrice);
|
|
|
- //ctx()->baseInfo->cash -= $buyoutPrice;
|
|
|
+ $sList = explode(',', $aucItem->contents);
|
|
|
+ if($aucItem->currpeopleid != null){//竞拍玩家邮件返回钻石
|
|
|
+ EmailProc::SendAuctionItemsBidCashFallback(req()->zoneid, req()->uid, $sList[0], 2, $buyoutPrice);
|
|
|
+ }
|
|
|
+
|
|
|
//更新表里的交易状态
|
|
|
$aucItem->result = "完成";
|
|
|
$aucItem->currpeopleid = req()->uid;
|
|
|
@@ -97,12 +101,11 @@ class AuctionProc {
|
|
|
//更新拍品缓存
|
|
|
|
|
|
$obj = self::updateAuctionUserItemListCache();
|
|
|
-//发送邮件，给拍品
|
|
|
- $sList = explode(',', $aucItem->contents);
|
|
|
+//发送邮件，给拍品
|
|
|
EmailProc::SendAuctionItemsMail(req()->zoneid, req()->uid, $sList[0], $sList[1]);
|
|
|
|
|
|
EmailProc::SendAuctionCashMail(req()->zoneid, $aucItem->sellerid, $sList[0], 2, $buyoutPrice - intval($buyoutPrice * 0.05)); //上架玩家给钻石邮件
|
|
|
-
|
|
|
+
|
|
|
UserProc::updateUserInfo(); # 回写玩家数据
|
|
|
return Resp::ok(array(
|
|
|
"auction" => $obj->data,
|
|
|
@@ -136,7 +139,7 @@ class AuctionProc {
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
- * 上传拍品
|
|
|
+ * 上传拍品--7406
|
|
|
* @return type
|
|
|
*/
|
|
|
static function UploadAuctionItems() {
|
|
|
@@ -183,7 +186,7 @@ class AuctionProc {
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
- * 竞价
|
|
|
+ * 竞价--7407
|
|
|
*/
|
|
|
static function UserAuctionBidItem() {
|
|
|
$uId = req()->paras[0];
|
|
|
@@ -211,6 +214,9 @@ class AuctionProc {
|
|
|
$aucItem->currprice = $curPrice;
|
|
|
|
|
|
$auchistory = json_decode($aucItem->auchistory);
|
|
|
+ if($auchistory == null){
|
|
|
+ $auchistory = new \stdClass();
|
|
|
+ }
|
|
|
$auchistory->$ts = array("uid" => req()->uid, "name" => ctx()->baseInfo->name, "price" => $curPrice);
|
|
|
$aucItem->auchistory = addslashes(json_encode($auchistory));
|
|
|
self::updateAuctionItem($aucItem);
|
|
|
@@ -222,7 +228,7 @@ class AuctionProc {
|
|
|
"res"=>"ok",
|
|
|
"cash"=>ctx()->baseInfo->cash,
|
|
|
//"store" => ctx()->store,
|
|
|
- "auction" => $auctionDic, #拍品
|
|
|
+ "auction" => $auctionDic->data, #拍品
|
|
|
));
|
|
|
}
|
|
|
|
|
|
@@ -282,8 +288,8 @@ class AuctionProc {
|
|
|
*/
|
|
|
static function insertNewUserAuctionItem($aucItem) {
|
|
|
$paydb = daoInst();
|
|
|
- $sql = "INSERT INTO `tab_auctionitems` (contents,startprice,buyoutPrice,startts,endts,sellerid,sellername,auchistory,zoneid) VALUES ('%s',%d,%d,%d,%d,'%s','%s','{}',%d)";
|
|
|
- $query = sprintf($sql, $aucItem->contents, $aucItem->startprice, $aucItem->buyoutPrice, $aucItem->startts, #
|
|
|
+ $sql = "INSERT INTO `tab_auctionitems` (contents,startprice,addstep,buyoutPrice,currprice,startts,endts,sellerid,sellername,auchistory,zoneid) VALUES ('%s',%d,%d,%d,%d,%d,%d,'%s','%s','{}',%d)";
|
|
|
+ $query = sprintf($sql, $aucItem->contents, $aucItem->startprice, $aucItem->addstep, $aucItem->buyoutPrice,$aucItem->currprice, $aucItem->startts, #
|
|
|
$aucItem->endts, $aucItem->sellerid, $aucItem->sellername, $aucItem->zoneid);
|
|
|
$result = $paydb->exec($query);
|
|
|
return $result;
|
|
|
@@ -381,7 +387,7 @@ class AuctionProc {
|
|
|
$oid = req()->uid;
|
|
|
|
|
|
$db = daoInst();
|
|
|
- $sql = "select * from tab_auctionitems where zoneid=$zoneid and currpeopleid = '$osid'";
|
|
|
+ $sql = "select * from tab_auctionitems where zoneid=$zoneid and currpeopleid = '$oid'";
|
|
|
$result = $db->query($sql)->fetchAll();
|
|
|
|
|
|
return $result;
|
cyzhao