yujian
2019-07-30 c6f32fd5fd0cf1cf0758765a697c9e9ad5bbba13
fanli/src/main/java/com/yeshi/fanli/util/jd/JDApiUtil.java
@@ -169,8 +169,13 @@
      root.put("promotionCodeReq", json);
      String result = baseRequest("jd.union.open.promotion.common.get", null, root);
      JSONObject resultJson = JSONObject.fromObject(result);
      result = resultJson.optJSONObject("jd_union_open_promotion_common_get_response").optString("result");
      if (result == null) {
         return null;
      }
      resultJson = JSONObject.fromObject(result);
      return resultJson.optJSONObject("data").optString("clickURL");
   }
@@ -318,6 +323,20 @@
   
   private static JDGoods parseJDGoods(JSONObject json) {
      JDGoods goods = new JDGoods();
      // 佣金信息
      Object commission = json.get("commissionInfo");
      JSONObject commissionJson = JSONObject.fromObject(commission);
      BigDecimal commissionShare = new BigDecimal(commissionJson.optString("commissionShare"));
      if (commissionShare.compareTo(new BigDecimal(0)) > 0) {
         JDCommissionInfo commissionInfo = new JDCommissionInfo();
         commissionInfo.setCommission(new BigDecimal(commissionJson.optString("commission")));
         commissionInfo.setCommissionShare(commissionShare);
         goods.setCommissionInfo(commissionInfo);
      } else {
         return null;
      }
      goods.setComments(json.optLong("comments"));
      goods.setBrandCode(json.optString("brandCode"));
      goods.setBrandName(json.optString("brandName"));
@@ -356,14 +375,6 @@
      categoryInfo.setCid3Name(categoryJson.optString("cid3Name"));
      goods.setCategoryInfo(categoryInfo);
      
      // 佣金信息
      Object commission = json.get("commissionInfo");
      JSONObject commissionJson = JSONObject.fromObject(commission);
      JDCommissionInfo commissionInfo = new JDCommissionInfo();
      commissionInfo.setCommission(new BigDecimal(commissionJson.optString("commission")));
      commissionInfo.setCommissionShare(new BigDecimal(commissionJson.optString("commissionShare")));
      goods.setCommissionInfo(commissionInfo);
      
      // 图片信息
      List<String> imageList = new ArrayList<String>();
@@ -468,7 +479,6 @@
      if (resultJson.optInt("code") == 0) {
         result = resultJson.optString("result");
         resultJson = JSONObject.fromObject(result);
         System.out.println(resultJson);
         JSONArray array = resultJson.optJSONArray("data");
         if (array != null)
            for (int i = 0; i < array.size(); i++) {
@@ -482,7 +492,21 @@
   private static JDGoods parseSimpleJDGoods(JSONObject json) {
      JDGoods goods = new JDGoods();
      goods.setPrice(StringUtil.isNullOrEmpty(json.optString("wlUnitPrice"))
            ? new BigDecimal(json.optString("unitPrice")) : new BigDecimal(json.optString("wlUnitPrice")));
      BigDecimal commisionRatioWl = new BigDecimal(json.optString("commisionRatioWl"));
      if (commisionRatioWl.compareTo(new BigDecimal(0)) > 0) {
         JDCommissionInfo commissionInfo = new JDCommissionInfo();
         commissionInfo.setCommissionShare(new BigDecimal(json.optString("commisionRatioWl")));
         commissionInfo.setCommission(MoneyBigDecimalUtil
               .div(goods.getPrice().multiply(commissionInfo.getCommissionShare()), new BigDecimal(100)));
         goods.setCommissionInfo(commissionInfo);
      } else {
         return null;
      }
      JDCategoryInfo categoryInfo = new JDCategoryInfo();
      categoryInfo.setCid1(json.optLong("cid1"));
      categoryInfo.setCid1Name(json.optString("cid1Name"));
@@ -493,21 +517,12 @@
      goods.setCategoryInfo(categoryInfo);
      goods.setComments(null);
      goods.setPrice(StringUtil.isNullOrEmpty(json.optString("wlUnitPrice"))
            ? new BigDecimal(json.optString("unitPrice")) : new BigDecimal(json.optString("wlUnitPrice")));
      JDCommissionInfo commissionInfo = new JDCommissionInfo();
      commissionInfo.setCommissionShare(new BigDecimal(json.optString("commisionRatioWl")));
      commissionInfo.setCommission(MoneyBigDecimalUtil
            .div(goods.getPrice().multiply(commissionInfo.getCommissionShare()), new BigDecimal(100)));
      String isFreeShipping = json.optString("isFreeShipping");
      if (!StringUtil.isNullOrEmpty(isFreeShipping)) {
         goods.setIsFreeShipping(Integer.parseInt(isFreeShipping));
      }
      
      goods.setCommissionInfo(commissionInfo);
      goods.setCouponInfo(null);
      goods.setGoodCommentsShare(null);
      List<String> imageList = new ArrayList<>();