diff --git a/webapp/controller/ShopController.class.php b/webapp/controller/ShopController.class.php
index 0a210da9..b8a31772 100644
--- a/webapp/controller/ShopController.class.php
+++ b/webapp/controller/ShopController.class.php
@@ -113,18 +113,7 @@ class ShopController extends BaseAuthedController {
         }
 
         $priceArray = splitStr1($goodsMeta['price']);
-        $discountArray = splitStr1($goodsMeta['discount']);
-
         $needPrice = $priceArray[$tokenPos];
-        $discount = $discountArray[$tokenPos];
-
-        $discountBegin = strtotime($goodsMeta['discount_begin']);
-        $discountEnd = strtotime($goodsMeta['discount_end']);
-        $nowTime = myself()->_getNowTime();
-
-        if ($nowTime >= $discountBegin && $nowTime < $discountEnd) {
-            $needPrice = ceil($needPrice * ($discount / 100.0));
-        }
 
         $costItemId = myself()->getCostItemIdByTokenType($tokenType);
         $costItems = array(
diff --git a/webapp/services/ShopService.php b/webapp/services/ShopService.php
index 6e2128be..1057383c 100644
--- a/webapp/services/ShopService.php
+++ b/webapp/services/ShopService.php
@@ -147,15 +147,6 @@ class ShopService {
         $errCode = 0;
         $errMsg = '';
         switch ($itemMeta['type']) {
-            case mt\Item::HERO_TYPE: {
-                    $heroDb = Hero::find($itemMeta['id']);
-                    if ($heroDb) {
-                        $errCode = 10;
-                        $errMsg = 'You already have the hero';
-                        return false;
-                    }
-                }
-                break;
             case mt\Item::HERO_SKIN_TYPE: {
                     $heroSkinDb = HeroSkin::find($itemMeta['id']);
                     if ($heroSkinDb) {
@@ -165,15 +156,6 @@ class ShopService {
                     }
                 }
                 break;
-            case mt\Item::GUN_SKIN_TYPE: {
-                    $gunSkinDb = GunSkin::find($itemMeta['id']);
-                    if ($gunSkinDb) {
-                        $errCode = 10;
-                        $errMsg = 'You already have the skin';
-                        return false;
-                    }
-                }
-                break;
             default: {
                     return true;
                 }