fix suggest price show

chenchao
Commit 2a582ce7593a216a3b85c76a1064ccf3474b4d8f 1 parent ade9e3a2
Showing 1 changed file with 6 additions and 3 deletions
order/src/main/java/com/yohoufo/order/service/impl/SkupListService.java
--- a/order/src/main/java/com/yohoufo/order/service/impl/SkupListService.java
View file @2a582ce
+++ b/order/src/main/java/com/yohoufo/order/service/impl/SkupListService.java
View file @2a582ce
@@ -528,13 +528,16 @@ public class SkupListService {
         productInfo.setStorageId(sellerOrderGoods.getStorageId());
         Integer soga = sellerOrderGoods.getAttributes();
         SkupType skupType = SkupType.getSkupType(soga);
+         boolean isAdvance = OrderAssist.skupIsAdvance(sellerOrderGoods.getAttributes());
         //
         GoodsInfo giwp = storageIdGoodInfoMap.get(sellerOrderGoods.getStorageId());
         if (Objects.nonNull(giwp)){
             productInfo.setMinPrice(giwp.getMinPrice());
             productInfo.setMaxPrice(giwp.getMaxPrice());
-             productInfo.setSuggestMinPrice(giwp.getSuggestMinPrice());
-             productInfo.setSuggestMaxPrice(giwp.getSuggestMaxPrice());
+             if (!isAdvance) {
+                 productInfo.setSuggestMinPrice(giwp.getSuggestMinPrice());
+                 productInfo.setSuggestMaxPrice(giwp.getSuggestMaxPrice());
+             }
             PrdPrice prdPrice;
             if (Objects.nonNull(prdPrice=giwp.getPrdPrice())) {
                 BigDecimal leastPrice = prdPrice.getLeastPrice(skupType);
@@ -544,7 +547,7 @@ public class SkupListService {
 
         orderListInfo.setGoodsInfo(productInfo);
         //tips
-         if (!OrderAssist.skupIsAdvance(sellerOrderGoods.getAttributes())){
+         if (!isAdvance){
             orderListInfo.setTips(overPriceTipsMap.get(OrderAssist.overFlowPriceKey(sellerOrderGoods.getStorageId(), sellerOrderGoods.getGoodsPrice())));
         }
         orderListInfo.setIsAdvance(OrderAssist.getSkupIsAdvance(soga));