bugfix

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

@@ -100,10 +100,8 @@ public class SearchOpenService {
         String tracer = jsonObj.getString("tracer");
         JSONObject result = jsonObj.getJSONObject("result");
         JSONArray errors = jsonObj.getJSONArray("errors");
-        Integer newvalidflag=jsonObj.getInt("p_newvalidflag");
         log.info(">>>>>>query(" + queryStr + "): " + status + ",request_id=" + requestId + ",errors=" + errors.toString() + ",tracer=" + tracer);
         log.info("查询结果---------------------------------------------》result: "+result.toString());
-        log.info("新品结果---------------------->"+newvalidflag);
         if ("OK".equals(status)) {
             result.put("status", 1);
         } else {

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

@@ -93,14 +93,18 @@ public class ProductPageApi {
 
         return pageService.getNewFloorRecommend();
     }
+
     @ApiImplicitParams({
             @ApiImplicitParam(required = false, name = "brandID", value = "品牌id"),
 
     })
     @ApiOperation("新品橱窗列表")
     @GetMapping("/home/NewFloorList")
-    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) {
+    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(source,userId,brandID,pageNum,pageSize);
     }

src/main/java/com/caimei365/commodity/model/search/ProductDO.java

@@ -76,10 +76,10 @@ public class ProductDO implements Serializable {
     private Integer p_promotions_id;
     /**商品类型：0其它类型(默认)，1妆字号，2械字号 */
     private Integer p_product_type;
-    /**
-     * 新品状态1.新品
-     */
-    private Integer p_newvalidflag;
+//    /**
+//     * 新品状态1.新品
+//     */
+//    private Integer p_newvalidflag;
 
     private static final long serialVersionUID = 1L;
 }

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

@@ -1368,8 +1368,10 @@ public class PageServiceImpl implements PageService {
     }
    @Override
     public ResponseJson<PaginationVo<ProductItemVo>> getNewFloorList(Integer source,Integer userId,List<String> brandID,int pageNum, int pageSize) {
+        log.info("pagenum,pagesize,brandId-------------------------------->"+pageNum+"-----"+pageSize+"-=---------------"+brandID.toString());
         PageHelper.startPage(pageNum, pageSize);
         List<ProductItemVo> list = pageMapper.getNewFloorList(brandID);
+        log.info("当前分页--------------------》"+list.toString());
         list.forEach(product -> {
             Boolean couponsLogo = setCouponsLogo(userId, product.getProductId(), source);
             product.setCouponsLogo(couponsLogo);
@@ -1382,7 +1384,6 @@ public class PageServiceImpl implements PageService {
                             Cons += product.getBrandID().toString() + ",";
                         }
                         Cons = Cons.substring(0, Cons.length() - 1);
-                        System.out.println(Cons);
                     }
                 }
             }
@@ -1390,7 +1391,6 @@ public class PageServiceImpl implements PageService {
             product.setImage(ImageUtils.getImageURL("product", product.getImage(), 0, domain));
         });
         PaginationVo<ProductItemVo> pageData = new PaginationVo(list);
-        log.info(pageData.toString());
         return ResponseJson.success(pageData);
     }
 

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

@@ -78,7 +78,6 @@ public class SearchProductServiceImpl implements SearchProductService {
             c.add(Calendar.YEAR, -1);
             String time = new SimpleDateFormat("yyyyMMdd").format(c.getTime());
             filterList.add("p_time > " + time);
-            filterList.add("p_newvalidflag = 1");
         }
         if (promotionFlag == 1) {
             filterList.add("p_promotions_id > 0");
@@ -131,12 +130,6 @@ public class SearchProductServiceImpl implements SearchProductService {
     }
 
 
-
-
-
-
-
-
     @Override
     public ResponseJson<Set<HashMap<String, Object>>> queryBrand(String keyword, Integer id, Integer idType, Integer newFlag, Integer promotionFlag, Integer identity) {
         log.info("查询品牌传入keyword----------->"+keyword+"-------------》id"+id+"------------->idType"+idType+"newFlag----------------->"+newFlag+"------------>promotionFlag------------->"+promotionFlag+"identity------------>"+identity);
@@ -269,7 +262,6 @@ public class SearchProductServiceImpl implements SearchProductService {
             c.add(Calendar.YEAR, -1);
             String time = new SimpleDateFormat("yyyyMMdd").format(c.getTime());
             filterList.add("p_time > " + time);
-            filterList.add("p_newvalidflag = 1");
         }
         if (promotionFlag == 1) {
             filterList.add("p_promotions_id > 0");

src/main/java/com/caimei365/commodity/utils/Json2PojoUtil.java

@@ -59,7 +59,7 @@ public class Json2PojoUtil {
             /**
              * 新品状态 1.已审核表示新品
              */
-            product.setNewvalidflag(json.getInt("p_newvalidflag"));
+//            product.setNewvalidflag(json.getInt("p_newvalidflag"));
             productList.add(product);
         }
         return productList;

src/main/resources/mapper/PageMapper.xml

@@ -826,13 +826,7 @@
                     p.brandID LIKE CONCAT('%',#{item},'%')
                 </foreach>
             </if>
-
         </where>
-
-#         order by p.combinationSort != 0 desc, p.combinationSort asc
-
-        order by p.sortIndex desc
-
     </select>
 
     <select id="getNewFloor" resultType="com.caimei365.commodity.model.vo.ProductItemVo">