藏品合成

extend/logicmodel/GoodsMergeLogic.php

@@ -66,9 +66,6 @@ class GoodsMergeLogic
             api_error(sprintf('超过合成次数[%d]',$info['merge_user_limit']));
         }
         $hash=$info->hash()->zero()->find();
-        if(!$hash){
-            //api_error('暂无可用hash');
-        }
         $old_user_goods_ids=[];
         foreach ($info['merge'] as $merge){
             $userGoods=UsersGoods::canMerge($merge['source_goods_id'],$userId)