ufo / yohoufo-fore · Commits

Go to a project

Authored by LUOXC
Commit 4a3fd2904ff088476ef12612246ff4a96399fc8f 2 parents 92e3ec3b 12b5104f

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

Inline Side-by-side
Showing 3 changed files with 4 additions and 1 deletions
@@ -377,7 +377,6 @@ public class SellerOrderService implements IOrderListService, IOrderDetailServic @@ -377,7 +377,6 @@ public class SellerOrderService implements IOrderListService, IOrderDetailServic
377 ErpCancelSellerOrderEvent event = ErpCancelSellerOrderEvent.builder().skup(skup).build(); 377 ErpCancelSellerOrderEvent event = ErpCancelSellerOrderEvent.builder().skup(skup).build();
378 OffShelveCancelCase offShelveCancelCase = new OffShelveCancelCase(event); 378 OffShelveCancelCase offShelveCancelCase = new OffShelveCancelCase(event);
379 offShelveCancelCase.accept(sellerOrderCancelService); 379 offShelveCancelCase.accept(sellerOrderCancelService);
380 - sellerOrderCancelService.cancel(offShelveCancelCase);  
381 return true; 380 return true;
382 } 381 }
383 382
@@ -522,6 +522,7 @@ public class ShoppingServiceImpl implements IShoppingService { @@ -522,6 +522,7 @@ public class ShoppingServiceImpl implements IShoppingService {
522 feeNRate.setShipFee(new BigDecimal(0.091)); 522 feeNRate.setShipFee(new BigDecimal(0.091));
523 break; 523 break;
524 case DEPOSIT: 524 case DEPOSIT:
  525 + case FAST_DELIVERY:
525 feeNRate = new FeeNRate(); 526 feeNRate = new FeeNRate();
526 feeNRate.setStorageManagementFee(new BigDecimal(10)); 527 feeNRate.setStorageManagementFee(new BigDecimal(10));
527 break; 528 break;
@@ -7,6 +7,8 @@ import java.util.function.BinaryOperator; @@ -7,6 +7,8 @@ import java.util.function.BinaryOperator;
7 import java.util.function.Function; 7 import java.util.function.Function;
8 import java.util.stream.Collectors; 8 import java.util.stream.Collectors;
9 9
  10 +import com.alibaba.fastjson.JSON;
  11 +import com.alibaba.fastjson.serializer.SerializerFeature;
10 import com.yohobuy.ufo.model.request.product.ProductRequestBo; 12 import com.yohobuy.ufo.model.request.product.ProductRequestBo;
11 import com.yohobuy.ufo.model.response.StorageCheckResp; 13 import com.yohobuy.ufo.model.response.StorageCheckResp;
12 import com.yohobuy.ufo.model.response.store.StoreInfoBo; 14 import com.yohobuy.ufo.model.response.store.StoreInfoBo;
@@ -2018,6 +2020,7 @@ public class ProductServiceImpl implements ProductService { @@ -2018,6 +2020,7 @@ public class ProductServiceImpl implements ProductService {
2018 tabs.put("goods_list", Arrays.asList(goodsBO)); 2020 tabs.put("goods_list", Arrays.asList(goodsBO));
2019 tabs.put("pre_sale_goods_list", Arrays.asList(preSaleGoodsBO)); 2021 tabs.put("pre_sale_goods_list", Arrays.asList(preSaleGoodsBO));
2020 tabs.put("seconds_goods_list", Arrays.asList(secondsGoodsBO)); 2022 tabs.put("seconds_goods_list", Arrays.asList(secondsGoodsBO));
  2023 + tabs = JSON.parseObject(JSON.toJSONString(tabs, SerializerFeature.DisableCircularReferenceDetect), Map.class);
2021 product_info.setGoodsListTabs(tabs); 2024 product_info.setGoodsListTabs(tabs);
2022 allGoodsBO.setSizeList(allSizeList); 2025 allGoodsBO.setSizeList(allSizeList);
2023 } 2026 }