订单补偿 + 奖励券使用倒计时

yujian

2019-10-21 d085ca89e39b4cda025a9a53d3797fbe8b242ae7

 fanli/src/main/java/com/yeshi/fanli/util/jd/JDApiUtil.java

@@ -132,6 +132,7 @@


      JSONObject resultJson = JSONObject.fromObject(result);

      result = resultJson.optJSONObject("jd_union_open_promotion_common_get_response").optString("result");

      System.out.println(result);

      if (result == null) {

         return null;

      }

@@ -398,8 +399,8 @@
               if (discount_temp == null) {

                  add = true;

                  discount_temp = discount;

               } else if (discount_temp.compareTo(discount) > 0) { // 券面额大

                  add = true;

               } else if (discount_temp.compareTo(discount) < 0 && discount.compareTo(price) <= 0) { 
                  add = true; // 券面额大,且券能够使用

               }



               if (add) {

@@ -484,14 +485,17 @@
      if (!StringUtil.isNullOrEmpty(isFreeShipping)) {

         goods.setIsFreeShipping(Integer.parseInt(isFreeShipping));

      }



      String inOrderCount = json.optString("inOrderCount");

      if (!StringUtil.isNullOrEmpty(isFreeShipping)) {

         goods.setInOrderCount30Days(Long.parseLong(inOrderCount));

      }

		
      goods.setCouponInfo(null);

      goods.setGoodCommentsShare(null);

      List<String> imageList = new ArrayList<>();

      imageList.add(json.optString("imgUrl"));

      goods.setPicUrl(json.optString("imgUrl"));

      goods.setImageList(imageList);

      goods.setInOrderCount30Days(0L);

      goods.setIsHot(null);

      goods.setMaterialUrl(json.optString("materialUrl"));

      goods.setOwner(null);