拍卖一口价类型老是变

Gameserver/Amfphp/configs/GameConfig.php

@@ -3,7 +3,7 @@
  // 由CodeGenerator创建。
  // Copyright (C) gwang (wanggangzero@qq.com), Loyalsoft@sjz Inc
  // author： gwang 
- // 日期: 2021-06-23 15:14:37
+ // 日期: 2021-06-24 17:54:10
 ////////////////////
 namespace loyalsoft;
 /**

Gameserver/Amfphp/model/Const/GameConfig.php

@@ -3,7 +3,7 @@
  // 由CodeGenerator创建。
  // Copyright (C) gwang (wanggangzero@qq.com), Loyalsoft@sjz Inc
  // author： gwang 
- // 日期: 2021-06-23 15:14:37
+ // 日期: 2021-06-24 17:54:10
 ////////////////////
 
 /**

Gameserver/Amfphp/model/Const/sm_item_base.php

@@ -3,7 +3,7 @@
  // 由CodeGenerator创建。
  // Copyright (C) gwang (wanggangzero@qq.com), Loyalsoft@sjz Inc
  // author： gwang 
- // 日期: 2021-06-23 10:42:03
+ // 日期: 2021-06-24 17:51:29
 ////////////////////
 
 
@@ -131,7 +131,7 @@ class sm_item_base
     public $channel;
 
     /**
-    * @var String 竞拍初始价格不得低于此价格  
+    * @var Int32 竞拍初始价格不得低于此价格 default(0) 
     */
     public $auctionPrice;
 

Gameserver/Amfphp/model/User/Ins_AuctionItemModel.php

@@ -26,12 +26,6 @@ class Ins_AuctionItemModel {
      * @var string  "itemid,num;itemid,num;..."
      */
     public $contents; # 物品内容
-    
-    /**
-     * 消耗类型
-     * @var type
-     */
-    public $costType; # 消耗类型
 
     /**
      * 起拍价

Gameserver/Amfphp/process/AuctionProc.php

@@ -22,9 +22,7 @@ class AuctionProc {
             case CmdCode::cmd_Auction_CancelAuction:                            # 7405 取消出售
                 return AuctionProc::CancelAuction();
             case CmdCode::cmd_Auction_UploadAuctionItems:                       # 7406 上传拍品
-                return AuctionProc::UploadAuctionItems();
-            case CmdCode::cmd_Auction_TriggerSettlement:
-                return AuctionProc::TriggerSettlement();
+                return AuctionProc::UploadAuctionItems();            
             default:
                 Err(ErrCode::cmd_err);
         }
@@ -79,21 +77,13 @@ class AuctionProc {
     static function UserAuctionBidItem() {
         list($uId) = req()->paras;
         $aucItem = self::getAuctionItem($uId);
-        
-        $costType = $aucItem->costType;
-        $buyoutPrice = $aucItem->buyoutPrice;
               
+        $buyoutPrice = $aucItem->buyoutPrice;             
         $price = $buyoutPrice + intval($buyoutPrice * 0.05);
-        if($costType == META_GOLD_ITEMID){                       
-            my_Assert(req()->userInfo->game->baseInfo->gold >=$price, ErrCode::notenough_gold_msg);
-            //扣除金币--交易费用 + 手续费
-            req()->userInfo->game->baseInfo->gold -= $price; 
-        } else if($costType == META_CASH_ITEMID){
-            my_Assert(req()->userInfo->game->baseInfo->cash >=$price, ErrCode::notenough_cash_msg);
-            //扣除钻石--交易费用 + 手续费
-            req()->userInfo->game->baseInfo->cash -= $price; 
-        }           
-                      
+        my_Assert(req()->userInfo->game->baseInfo->cash >=$price, ErrCode::notenough_cash_msg);
+        //扣除钻石--交易费用 + 手续费
+        req()->userInfo->game->baseInfo->cash -= $price; 
+                                   
         //更新表里的交易状态
         $aucItem->result = "完成";
         $aucItem->currpeopleid = req()->uid;
@@ -135,23 +125,24 @@ class AuctionProc {
      * @return type
      */
     static function UploadAuctionItems() {
-        list($itemId, $num) = req()->paras; //上传拍品的 id 数量 竞拍价 一口价
+        list($itemId, $num,$bugoutPrice) = req()->paras; //上传拍品的 id 数量 竞拍价 一口价
 
         $user = req()->userInfo->game; 
 
         my_Assert(StlUtil::dictHasProperty($user->store->items, $itemId), ErrCode::store_itemno_err); # 参数合法性判断
-        $mo = GameConfig::item_base_getItem($itemId);
+        $mo = GameConfig::item_base_getItem($itemId);       
         my_Assert($mo != null, ErrCode::err_const_no);
-        $auctionPrice = explode(',',$mo->auctionPrice); 
-       
+                             
+        $sList = explode(',', $mo->buyoutPrice);       
+        my_Assert($bugoutPrice>= $sList[1], ErrCode::notenough_cash_msg);
+        
         StoreProc::removeItemFromStore($user->store, $itemId, $num);
        
         $aucItem = new Ins_AuctionItemModel();
         $aucItem->addstep = 1;
-        $aucItem->contents = $itemId.",".$num;
-        $aucItem->costType = $auctionPrice[0];
+        $aucItem->contents = $itemId.",".$num;       
         $aucItem->startprice = 0;
-        $aucItem->buyoutPrice = $buyoutPrice[1]*$num;
+        $aucItem->buyoutPrice = $sList[1]*$num;
         $aucItem->startts = time();
         $aucItem->endts = glc()->AuctionEndTs * 60 * 60 + time(); # 24小时 
         $aucItem->sellerid = req()->uid;