搜索词

yujian

2019-07-17 20d1a38a0f8049873f1fbbaef96c22e971ea9d77

 fanli/src/main/java/com/yeshi/fanli/controller/apph5/AppH5QualityGoodsController.java

@@ -206,14 +206,17 @@
         // 618活动

         if (System.currentTimeMillis() < TimeUtil.convertToTimeTemp("2019-06-19", "yyyy-MM-dd")) {

            if (mcid == null || mcid == 0) {

               count = taoBaoGoodsActivityService.countByPrice(minQuanPrice, maxQuanPrice);

               count = taoBaoGoodsActivityService.countByPrice(minQuanPrice,

                     maxQuanPrice.add(new BigDecimal("0.1")));

               List<TaoBaoGoodsBrief> goodsList = taoBaoGoodsActivityService.listByPrice(minQuanPrice,

                     maxQuanPrice.add(new BigDecimal("0.1")), page, pageSize);

               if (goodsList != null)

               if (goodsList != null) {

                  array.clear();

                  for (TaoBaoGoodsBrief goods : goodsList) {

                     array.add(gson

                           .toJson(TaoBaoUtil.getTaoBaoGoodsBriefExtra(goods, proportion.toString(), null)));

                  }

               }

            }

         }



@@ -596,7 +599,7 @@
            // 判断收藏

            if (!StringUtil.isNullOrEmpty(uid)) {

               CollectionGoodsV2 collectionGoods = collectionGoodsV2Service

                     .findByUidAndAuctionId(Long.parseLong(uid), taoBaoGoodsBrief.getAuctionId());

                     .findByUidAndAuctionId(Long.parseLong(uid), taoBaoGoodsBrief.getAuctionId(),Constant.SOURCE_TYPE_TAOBAO);

               if (collectionGoods != null) {

                  collected = 1;

               }