fixed: Pair programming with chenye, code review for auction and mysql tables.

Gameserver/Amfphp/model/User/Ins_AuctionItemModel.php

@@ -1,11 +1,5 @@
 <?php
 
-/*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
- */
-
 namespace loyalsoft;
 
 /**
@@ -14,6 +8,7 @@ namespace loyalsoft;
  * @author cyzhao
  */
 class Ins_AuctionItemModel {
+
     /**
      * 拍品id, uniq
      * @var type
@@ -28,18 +23,16 @@ class Ins_AuctionItemModel {
 
     /**
      * 物品内容
-     * @var string/json {"itemid":123,"num":1}
+     * @var string  "itemid,num;itemid,num;..."
      */
     public $contents; # 物品内容
-    
-    public $cxtId; # 物品内容
-    public $cxtNum; # 物品内容
+
     /**
      * 起拍价
      * @var int
      */
     public $startprice;
-    
+
     /**
      * 一口价
      * @var type
@@ -57,27 +50,30 @@ class Ins_AuctionItemModel {
      * @var type
      */
     public $tag1; //标签1
+
     /**
      * 标签2
      * @var type
      */
     public $tag2; //标签2
     // ---- 运行时字段 -----
+
     /**
      * 开始时间
      * @var int
      */
-    public $startts; # 
+    public $startts; #
+
     /**
      * 结束时间
      * @var int
      */
-    public $endts; # 
+    public $endts; #
     public $sellerid;  # 卖家ID
     public $sellername; # 卖家昵称
 
     /**
-     * 
+     *
      * 竞价历史
      * @var object:{ts:{oid:"",name:"",price:""},ts2:{...}}
      */
@@ -85,10 +81,11 @@ class Ins_AuctionItemModel {
 
     /**
      * 当前最高出价
-     * @var int 
+     * @var int
      */
     public $currprice;
     public $currpeopleid; # 当前最高价者ID
     public $currpeoplename; # 当前最高价者昵称
     public $result; # 拍卖结果, 结算以后会有:成交,流拍
+
 }

Gameserver/Amfphp/process/AuctionProc.php

@@ -1,11 +1,5 @@
 <?php
 
-/*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
- */
-
 namespace loyalsoft;
 
 /**
@@ -14,6 +8,7 @@ namespace loyalsoft;
  * @author cyzhao
  */
 class AuctionProc {
+
     static function procMain() {
         switch (req()->cmd) {
             case CmdCode::cmd_Auction_GetUserAuctionItemsInfo:                  # 7401 获取全部拍卖信息
@@ -25,97 +20,97 @@ class AuctionProc {
             case CmdCode::cmd_Auction_UserAuctionBidItem:                       # 7404 竞拍/一口价
                 return AuctionProc::UserAuctionBidItem();
             case CmdCode::cmd_Auction_CancelAuction:                            # 7405 取消出售
-                return AuctionProc::CancelAuction();     
+                return AuctionProc::CancelAuction();
             case CmdCode::cmd_Auction_UploadAuctionItems:                       # 7406 上传拍品
-                return AuctionProc::UploadAuctionItems();     
+                return AuctionProc::UploadAuctionItems();
             default:
                 Err(ErrCode::cmd_err);
         }
     }
+
     /**
      * 获取全部拍卖信息
      */
     static function GetAuctionItemsInfo() {
         $obj = self::getAuctionUserItemListCache(req()->zoneid);
-        
+
         $ret = array(
             "auctionitems" => $obj->data,
-            //"bidRecord" => $req->userInfo->privateState->arrUserlAucBidItems # 加一个出价记录
-        );        
-        
-        UserProc::updateUserInfo();                                             # 回写玩家数据 
+                //"bidRecord" => $req->userInfo->privateState->arrUserlAucBidItems # 加一个出价记录
+        );
+
+        UserProc::updateUserInfo();                                             # 回写玩家数据
         return Resp::ok(array(
-                    "ret" => $ret,                                     
+                    "ret" => $ret,
         ));
     }
-    
+
     /**
      * 玩家上架拍品信息
      */
     static function GetUserUploadAuctionItems() {
-        UserProc::updateUserInfo();                                             # 回写玩家数据 
+        UserProc::updateUserInfo();                                             # 回写玩家数据
         return Resp::ok(array(
-                    "store" => "ok", 
+                    "store" => "ok",
         ));
     }
-    
+
     /**
      * 玩家竞拍信息
      */
     static function GetUserAuctionItems() {
-        UserProc::updateUserInfo();                                             # 回写玩家数据 
+        UserProc::updateUserInfo();                                             # 回写玩家数据
         return Resp::ok(array(
-                    "store" => "ok", 
+                    "store" => "ok",
         ));
     }
-    
+
     /**
      * 竞拍/一口价
      */
     static function UserAuctionBidItem() {
-        
-        
-        UserProc::updateUserInfo();                                             # 回写玩家数据 
+
+
+        UserProc::updateUserInfo();                                             # 回写玩家数据
         return Resp::ok(array(
-                    "store" => "ok", 
+                    "store" => "ok",
         ));
     }
-    
+
     /**
      * 取消出售
      */
     static function CancelAuction() {
-        UserProc::updateUserInfo();                                             # 回写玩家数据 
+        UserProc::updateUserInfo();                                             # 回写玩家数据
         return Resp::ok(array(
-                    "store" => "ok", 
+                    "store" => "ok",
         ));
     }
-    
+
     /**
      * 上传拍品
      * @return type
-     */   
+     */
     static function UploadAuctionItems() {
-        list($itemId,$num,$price,$buyoutPrice) = req()->paras;//上传拍品的 id 数量 竞拍价 一口价
-        
+        list($itemId, $num, $price, $buyoutPrice) = req()->paras; //上传拍品的 id 数量 竞拍价 一口价
+
         $user = req()->userInfo->game;
         //$items = $user->store->items;
-        
-        my_Assert(StlUtil::dictHasProperty($user->store->items, $itemId), ErrCode::store_itemno_err); # 参数合法性判断   
+
+        my_Assert(StlUtil::dictHasProperty($user->store->items, $itemId), ErrCode::store_itemno_err); # 参数合法性判断
         $auctionPrice = GameConfig::item_base_getItem($itemId)->auctionPrice;
-        my_Assert($auctionPrice*$num <= $price && $auctionPrice*$num <= $buyoutPrice, ErrCode::store_itemno_err); # 参数合法性判断 
-        
+        my_Assert($auctionPrice * $num <= $price && $auctionPrice * $num <= $buyoutPrice, ErrCode::store_itemno_err); # 参数合法性判断
+
         StoreProc::removeItemFromStore($user->store, $itemId, $num);
-        
-        
+
         $aucItem = new Ins_AuctionItemModel();
         $aucItem->addstep = 1;
         $aucItem->startprice = $price;
         $aucItem->buyoutPrice = $buyoutPrice;
-        $aucItem->cxtId = $itemId;
-        $aucItem->cxtNum = $num;
+//        $aucItem->cxtId = $itemId;
+//        $aucItem->cxtNum = $num;
         $aucItem->startts = time();
-        $aucItem->endts = glc()->AuctionEndTs*60*60 + time(); # 24小时
+        $aucItem->endts = glc()->AuctionEndTs * 60 * 60 + time(); # 24小时
         if (!GAME_ONLINE) {
             $aucItem->endts = self::tsCurrHour(1); # 内网1小时。
         }
@@ -124,35 +119,36 @@ class AuctionProc {
         $aucItem->zoneid = $req->zoneid;
         $err = self::insertNewUserAuctionItem($aucItem);
         if ($err != ErrCode::succeed) { # 数据库操作失误
-                        $resp = ResponseVo ::myErrResponse($req, $err);
-                    } else { # 插入成功后,更新缓存
-                        # 写入玩家数据
-                        UserProc::updateUserInfo($req); # 包括手续费
-                        self::updateAuctionUserItemListCache($req); # 更新缓存
-                        $resp = ResponseVo ::myRetResponse($req, "succeed"); # 更新下客户端的拍品列表
-                    }
-        
-        UserProc::updateUserInfo();                                             # 回写玩家数据 
+            $resp = ResponseVo ::myErrResponse($req, $err);
+        } else { # 插入成功后,更新缓存
+            # 写入玩家数据
+            UserProc::updateUserInfo($req); # 包括手续费
+            self::updateAuctionUserItemListCache($req); # 更新缓存
+            $resp = ResponseVo ::myRetResponse($req, "succeed"); # 更新下客户端的拍品列表
+        }
+
+        UserProc::updateUserInfo();                                             # 回写玩家数据
         return Resp::ok(array(
-                    "store" => "ok", 
+                    "store" => "ok",
         ));
     }
-    
-        /**
+
+    /**
      * 获取当前的玩家拍卖缓存
      * @param type $mem
      * @return array
      */
-    static function getAuctionUserItemListCache($zoneid) {             
+    static function getAuctionUserItemListCache($zoneid) {
 //        gMem()->hget($key, $itemId);
 //        return $mem->get(MemKey::auctionItemListCache($zoneid));
     }
-    
+
     /**
      * 玩家拍卖的拍品列表缓存
      * @return string
      */
     static function auctionItemListCache($zoneid) {
-        return "auction-user-itemlist" ."-zone" . $zoneid;
+        return "auction-user-itemlist" . "-zone" . $zoneid;
     }
+
 }