Merge branch 'test6.9.12' of http://git.yoho.cn/ufo/yohoufo-fore into test6.9.12

@@ -377,7 +377,6 @@ public class SellerOrderService implements IOrderListService, IOrderDetailServic
         ErpCancelSellerOrderEvent event = ErpCancelSellerOrderEvent.builder().skup(skup).build();
         OffShelveCancelCase offShelveCancelCase = new OffShelveCancelCase(event);
         offShelveCancelCase.accept(sellerOrderCancelService);
-        sellerOrderCancelService.cancel(offShelveCancelCase);
         return true;
     }
 

@@ -522,6 +522,7 @@ public class ShoppingServiceImpl implements IShoppingService {
                feeNRate.setShipFee(new BigDecimal(0.091));
                break;
             case DEPOSIT:
+            case FAST_DELIVERY:
                 feeNRate = new FeeNRate();
                 feeNRate.setStorageManagementFee(new BigDecimal(10));
                 break;

@@ -7,6 +7,8 @@ import java.util.function.BinaryOperator;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.serializer.SerializerFeature;
 import com.yohobuy.ufo.model.request.product.ProductRequestBo;
 import com.yohobuy.ufo.model.response.StorageCheckResp;
 import com.yohobuy.ufo.model.response.store.StoreInfoBo;
@@ -2018,6 +2020,7 @@ public class ProductServiceImpl implements ProductService {
             tabs.put("goods_list", Arrays.asList(goodsBO));
             tabs.put("pre_sale_goods_list", Arrays.asList(preSaleGoodsBO));
             tabs.put("seconds_goods_list", Arrays.asList(secondsGoodsBO));
+            tabs = JSON.parseObject(JSON.toJSONString(tabs, SerializerFeature.DisableCircularReferenceDetect), Map.class);
             product_info.setGoodsListTabs(tabs);
             allGoodsBO.setSizeList(allSizeList);
         }