diff --git a/webapp/controller/ShopController.class.php b/webapp/controller/ShopController.class.php index 8ff95c57..f4779765 100644 --- a/webapp/controller/ShopController.class.php +++ b/webapp/controller/ShopController.class.php @@ -101,30 +101,11 @@ class ShopController extends BaseAuthedController { $desiredTokenType = $goodsMeta['token_type']; $checkTokenType = splitStr1($desiredTokenType); $tokenPos = array_search($tokenType, $checkTokenType, true); - $isFreeBuy = false; - if (!empty($goodsMeta['free_type'])) { - $count = $this->countFreeBuyTimes($goodsMeta['free_type'], $goodsMeta['id'], $goodsMeta['item_id']); - if ($count < $goodsMeta['free_num']) { - $isFreeBuy = true; - } - } $propertyChgService = new services\PropertyChgService(); $awardService = new services\AwardService(); - if ($isFreeBuy) { - $awardService->addItem($itemMeta['id'], $goodsNum); - myself()->_rspData( - array( - 'award' => $awardService->toDto(), - 'property_chg' => $propertyChgService->toDto(), - //'goods_chg' => $goodsDto - ) - ); + if (!in_array($tokenType, $checkTokenType)) { + myself()->_rspErr(1, "token_type parameter error, desired_token_type: {$desiredTokenType}"); return; - } else { - if (!in_array($tokenType, $checkTokenType)) { - myself()->_rspErr(1, "token_type parameter error, desired_token_type: {$desiredTokenType}"); - return; - } } $priceArray = splitStr1($goodsMeta['price']);