字段调整2

src/main/java/com/caimei365/commodity/components/PriceUtilService.java

@@ -177,6 +177,7 @@ public class PriceUtilService {
         product.setMinBuyNumber(price.getMinBuyNumber());
         product.setUserIdentity(price.getUserIdentity());
         product.setRepurchaseFlag(price.getRepurchaseFlag());
+        product.setMaxBuyNumber(price.getMaxBuyNumber());
     }
 
 }

src/main/java/com/caimei365/commodity/model/vo/PriceVo.java

@@ -34,6 +34,10 @@ public class PriceVo implements Serializable {
      * 最小购买量
      */
     private Integer minBuyNumber;
+    /**
+     * 最大购买量
+     */
+    private Integer maxBuyNumber;
     /**
      * 是否公开机构价 0公开价格 1不公开价格
      */

src/main/java/com/caimei365/commodity/model/vo/ProductDetailVo.java

@@ -269,4 +269,12 @@ public class ProductDetailVo implements Serializable {
      * 用户身份: 2-会员机构, 4-普通机构
      */
     private Integer userIdentity;
+    /**
+     * 最大购买量
+     */
+    private Integer maxBuyNumber;
+    /**
+     * 是否复购 0否 1是
+     */
+    private Integer repurchaseFlag;
 }

src/main/java/com/caimei365/commodity/model/vo/ProductItemVo.java

@@ -61,6 +61,10 @@ public class ProductItemVo implements Serializable {
     private Integer step;
     /** 起订量 */
     private Integer minBuyNumber;
+    /**
+     * 最大购买量
+     */
+    private Integer maxBuyNumber;
     /** 商品上架状态：0逻辑删除 1待审核 2已上架 3已下架 8审核未通过 9已冻结 */
     private Integer validFlag;
     /** 活动状态：1有效，0失效 */

src/main/java/com/caimei365/commodity/service/impl/PageServiceImpl.java

@@ -274,6 +274,8 @@ public class PageServiceImpl implements PageService {
             product.setPromotions(price.getPromotions());
             product.setMinBuyNumber(price.getMinBuyNumber());
             product.setUserIdentity(price.getUserIdentity());
+            product.setRepurchaseFlag(price.getRepurchaseFlag());
+            product.setMaxBuyNumber(price.getMaxBuyNumber());
         }
         return ResponseJson.success(product);
     }

src/main/java/com/caimei365/commodity/service/impl/ShopServiceImpl.java

@@ -20,6 +20,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
 import java.text.SimpleDateFormat;
@@ -111,6 +112,12 @@ public class ShopServiceImpl implements ShopService {
                 // 设置商品主图及价格
                 Integer userId = shopMapper.getUserIdByshopId(shopId);
                 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);

src/main/resources/mapper/PageMapper.xml

@@ -96,6 +96,7 @@
             p.searchKey as keyword,
             p.price8Text as beautyActFlag,
             p.minBuyNumber as minBuyNumber,
+            p.maxBuyNumber as maxBuyNumber,
             p.ladderPriceFlag,
             p.normalPrice,
             p.step,
@@ -168,6 +169,7 @@
             p.searchKey as keyword,
             p.price8Text as beautyActFlag,
             p.minBuyNumber as minBuyNumber,
+            p.maxBuyNumber as maxBuyNumber,
             p.ladderPriceFlag,
             p.normalPrice,
             p.step,

src/main/resources/mapper/PriceMapper.xml

@@ -9,6 +9,7 @@
             p.productID as productId,
             p.price1 as price,
             p.minBuyNumber as minBuyNumber,
+            p.maxBuyNumber as maxBuyNumber,
             p.price1TextFlag as priceFlag,
             p.ladderPriceFlag as ladderPriceFlag,
             p.normalPrice as normalPrice,
@@ -28,6 +29,7 @@
             p.productID as productId,
             p.price1 as price,
             p.minBuyNumber as minBuyNumber,
+            p.maxBuyNumber as maxBuyNumber,
             p.price1TextFlag as priceFlag,
             p.ladderPriceFlag as ladderPriceFlag,
             p.normalPrice as normalPrice,

src/main/resources/mapper/SellerMapper.xml

@@ -15,6 +15,7 @@
             p.searchKey as keyword,
             p.price8Text as beautyActFlag,
             p.minBuyNumber as minBuyNumber,
+            p.maxBuyNumber as maxBuyNumber,
             p.ladderPriceFlag,
             p.normalPrice,
             p.step,
@@ -60,6 +61,7 @@
             p.searchKey as keyword,
             p.price8Text as beautyActFlag,
             p.minBuyNumber as minBuyNumber,
+            p.maxBuyNumber as maxBuyNumber,
             p.ladderPriceFlag,
             p.normalPrice,
             p.step,

src/main/resources/mapper/ShopMapper.xml

@@ -348,6 +348,7 @@
             p.searchKey as keyword,
             p.price8Text as beautyActFlag,
             p.minBuyNumber as minBuyNumber,
+            p.maxBuyNumber as maxBuyNumber,
             p.ladderPriceFlag,
             p.normalPrice,
             p.step,