chao hace 4 años
padre
commit
9841dbccef

+ 7 - 0
src/main/java/com/caimei365/commodity/components/PriceUtilService.java

@@ -9,6 +9,7 @@ import com.caimei365.commodity.utils.MathUtil;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
 
 
 import javax.annotation.Resource;
 import javax.annotation.Resource;
 import java.math.BigDecimal;
 import java.math.BigDecimal;
@@ -178,6 +179,12 @@ public class PriceUtilService {
         product.setUserIdentity(price.getUserIdentity());
         product.setUserIdentity(price.getUserIdentity());
         product.setRepurchaseFlag(price.getRepurchaseFlag());
         product.setRepurchaseFlag(price.getRepurchaseFlag());
         product.setMaxBuyNumber(price.getMaxBuyNumber());
         product.setMaxBuyNumber(price.getMaxBuyNumber());
+        List<LadderPriceVo> ladderPrices = priceMapper.getladderPricesByProductId(product.getProductId());
+        TaxVo tax = priceMapper.getTaxByProductId(product.getProductId());
+        if (!CollectionUtils.isEmpty(ladderPrices)) {
+            setLadderPriceList(ladderPrices, tax);
+        }
+        product.setLadderPrices(ladderPrices);
     }
     }
 
 
 }
 }

+ 1 - 5
src/main/java/com/caimei365/commodity/service/impl/SellerServiceImpl.java

@@ -4,12 +4,8 @@ import com.caimei365.commodity.components.PriceUtilService;
 import com.caimei365.commodity.mapper.PriceMapper;
 import com.caimei365.commodity.mapper.PriceMapper;
 import com.caimei365.commodity.mapper.SellerMapper;
 import com.caimei365.commodity.mapper.SellerMapper;
 import com.caimei365.commodity.model.ResponseJson;
 import com.caimei365.commodity.model.ResponseJson;
-import com.caimei365.commodity.model.vo.CombinationVo;
-import com.caimei365.commodity.model.vo.PaginationVo;
-import com.caimei365.commodity.model.vo.PriceVo;
-import com.caimei365.commodity.model.vo.ProductItemVo;
+import com.caimei365.commodity.model.vo.*;
 import com.caimei365.commodity.service.SellerService;
 import com.caimei365.commodity.service.SellerService;
-import com.caimei365.commodity.utils.ImageUtils;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageHelper;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;

+ 0 - 6
src/main/java/com/caimei365/commodity/service/impl/ShopServiceImpl.java

@@ -112,12 +112,6 @@ public class ShopServiceImpl implements ShopService {
                 // 设置商品主图及价格
                 // 设置商品主图及价格
                 Integer userId = shopMapper.getUserIdByshopId(shopId);
                 Integer userId = shopMapper.getUserIdByshopId(shopId);
                 priceUtilService.setProductDetails(userId, product);
                 priceUtilService.setProductDetails(userId, product);
-                List<LadderPriceVo> ladderPrices = priceMapper.getladderPricesByProductId(product.getProductId());
-                TaxVo tax = priceMapper.getTaxByProductId(product.getProductId());
-                if (!CollectionUtils.isEmpty(ladderPrices)) {
-                    priceUtilService.setLadderPriceList(ladderPrices, tax);
-                }
-                product.setLadderPrices(ladderPrices);
             }
             }
         }
         }
         PaginationVo<ProductItemVo> productPage = new PaginationVo<>(productList);
         PaginationVo<ProductItemVo> productPage = new PaginationVo<>(productList);