diff --git a/webapp/controller/FirstTopupController.class.php b/webapp/controller/FirstTopupController.class.php index 23df2166..d1e534b9 100644 --- a/webapp/controller/FirstTopupController.class.php +++ b/webapp/controller/FirstTopupController.class.php @@ -137,6 +137,7 @@ class FirstTopupController extends BaseAuthedController 'group' => $group, 'status' => $status, 'reward' => $reward, + 'property_chg' => $propertyChgService->toDto(), ) ); } else if ($test >= 2) { diff --git a/webapp/controller/MarketController.class.php b/webapp/controller/MarketController.class.php index 0a9e18f3..f6786676 100644 --- a/webapp/controller/MarketController.class.php +++ b/webapp/controller/MarketController.class.php @@ -758,10 +758,11 @@ class MarketController extends BaseAuthedController $goods['amount'] ); - if (!$this->markOrderBuying($idx)) { - $this->_rspErr(1, 'buy failed, update order status failed, idx:' . $idx); - return; - } + // 不再标记购买状态,改为抢单模式,第一个交易成功者获得商品 + // if (!$this->markOrderBuying($idx)) { + // $this->_rspErr(1, 'buy failed, update order status failed, idx:' . $idx); + // return; + // } $item_id = $goods['item_id']; $item_count = $goods['amount'];