商城首页增加新品橱窗楼层

src/main/java/com/caimei365/commodity/controller/ProductPageApi.java

@@ -99,10 +99,10 @@ public class ProductPageApi {
     })
     @ApiOperation("新品橱窗列表")
     @GetMapping("/home/NewFloorList")
-    public ResponseJson<PaginationVo<ProductItemVo>> getNewFloorList(Integer userId,@RequestParam(value = "brandID",required=false)List<String> brandID,@RequestParam(value = "pageNum", defaultValue = "1") int pageNum,
+    public ResponseJson<PaginationVo<ProductItemVo>> getNewFloorList(Integer source,Integer userId,@RequestParam(value = "brandID",required=false)List<String> brandID,@RequestParam(value = "pageNum", defaultValue = "1") int pageNum,
                                                    @RequestParam(value = "pageSize", defaultValue = "20") int pageSize) {
 
-        return pageService.getNewFloorList(userId,brandID,pageNum,pageSize);
+        return pageService.getNewFloorList(source,userId,brandID,pageNum,pageSize);
     }
 
     @ApiOperation("新品橱窗品牌查询")

src/main/java/com/caimei365/commodity/model/dto/ProductDto.java

@@ -197,11 +197,10 @@ public class ProductDto implements Serializable {
      */
     @ApiModelProperty("培训费用(售价未包含)")
     private BigDecimal trainingFee;
-
-    @ApiModelProperty("新品参与状态：1.参与2.未参与")
     /**
      * 新品参与状态：1.参与2.未参与
      */
+    @ApiModelProperty("新品参与状态：1.参与2.未参与")
     private Integer newProductType;
 
 

src/main/java/com/caimei365/commodity/service/PageService.java

@@ -233,7 +233,7 @@ public interface PageService {
 
      ResponseJson <List<BrandVo>>getNewFloorBrand();
 
-    ResponseJson<PaginationVo<ProductItemVo>> getNewFloorList(Integer userId,List<String> brandID,int pageNum, int pageSize);
+    ResponseJson<PaginationVo<ProductItemVo>> getNewFloorList(Integer source,Integer userId,List<String> brandID,int pageNum, int pageSize);
 
 
     /**

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

@@ -171,6 +171,9 @@ public class PageServiceImpl implements PageService {
             newFloorList.forEach(n -> priceUtilService.setProductDetails(userId, n));
             List<FloorImageVo> floorImageLists = new ArrayList<>();
             for (int i = 0; i < newFloorList.size(); i++) {
+                //优惠券标识
+                Boolean couponsLogo = setCouponsLogo(userId, newFloorList.get(i).getProductId(), source);
+                newFloorList.get(i).setCouponsLogo(couponsLogo);
                 FloorImageVo floorImageVo = new FloorImageVo();
                 floorImageVo.setProduct(newFloorList.get(i));
                 floorImageVo.setLink(pageMapper.findLink(newFloorList.get(i).getProductId()));
@@ -1363,15 +1366,13 @@ public class PageServiceImpl implements PageService {
         List<BrandVo> floorBrand = pageMapper.getNewFloorBrand();
         return ResponseJson.success(floorBrand);
     }
-    @Override
-    public ResponseJson<PaginationVo<ProductItemVo>> getNewFloorList(Integer userId,List<String> brandID,int pageNum, int pageSize) {
+   @Override
+    public ResponseJson<PaginationVo<ProductItemVo>> getNewFloorList(Integer source,Integer userId,List<String> brandID,int pageNum, int pageSize) {
         PageHelper.startPage(pageNum, pageSize);
-
-
         List<ProductItemVo> list = pageMapper.getNewFloorList(brandID);
-
-
         list.forEach(product -> {
+            Boolean couponsLogo = setCouponsLogo(userId, product.getProductId(), source);
+            product.setCouponsLogo(couponsLogo);
             if(product.getBrandID()!=null){
                 if (StringUtils.isNotBlank(product.getBrandID().toString())) {
                     if (product.getBrandID().toString().contains(",")) {

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

@@ -222,8 +222,9 @@ public class ShopServiceImpl implements ShopService {
         //保存或修改商品
         ProductPo product = new ProductPo();
         product.setNewProductType(productDto.getNewProductType());
+        log.info("打印日志__________>"+productDto.getNewProductType());
         if(productDto.getNewProductType()==1){
-            product.setShowFlag(1);
+            product.setShowFlag(0);
         }else {
             product.setShowFlag(3);
         }

src/main/resources/mapper/SearchMapper.xml

@@ -297,7 +297,7 @@
         p.searchKey as keyword
         from product p
         left join cm_brand as br on p.brandID = br.id
-        where p.productCategory = 1
+        where p.productCategory = 1 and p.newvalidFlag=1
         <choose>
             <when test="identity == 1">
                 and p.validFlag in (2,3,9)

src/main/resources/mapper/ShopMapper.xml

@@ -76,7 +76,7 @@
         <if test="invoiceType != null and  invoiceType != ''">
             invoiceType,
         </if>
-        updateTime,validFlag,newProductType
+        updateTime,validFlag,newProductType,showFlag
         ) values (
         #{shopId}, #{name}, #{aliasName}, #{commodityType}, #{bigTypeId}, #{smallTypeId}, #{tinyTypeId}, #{mainImage},
         #{brandId}, #{productType}, #{tags}, #{unit}, #{normalPrice}, #{price}, #{includedTax}, #{minBuyNumber},
@@ -150,7 +150,7 @@
         <if test="invoiceType != null and  invoiceType != ''">
             #{invoiceType},
         </if>
-        #{updateTime}, #{validFlag},#{newProductType}
+        #{updateTime}, #{validFlag},#{newProductType},#{showFlag}
         )
     </insert>
     <update id="updateProduct">