admin
2019-11-16 a6f34b99ee20e528b766c8ed5a61bd9c5aa0e7ae
fanli/src/main/java/com/yeshi/fanli/util/jd/JDApiUtil.java
@@ -28,6 +28,8 @@
import com.yeshi.fanli.dto.jd.JDShopInfo;
import com.yeshi.fanli.entity.jd.JDGoods;
import com.yeshi.fanli.entity.jd.JDOrder;
import com.yeshi.fanli.entity.jd.JDOrderItem;
import com.yeshi.fanli.log.LogHelper;
import com.yeshi.fanli.tag.PageEntity;
import com.yeshi.fanli.util.MoneyBigDecimalUtil;
import com.yeshi.fanli.util.StringUtil;
@@ -131,6 +133,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;
      }
@@ -150,9 +153,10 @@
    */
   public static String convertShortLink(String materialId, String couponUrl, String positionId, String ext1) {
      String url = convertLink(materialId, couponUrl, positionId, ext1);
      if (!StringUtil.isNullOrEmpty(url)) {
         url = HttpUtil.getShortLink(url);
      }
//暂时注释
//      if (!StringUtil.isNullOrEmpty(url)) {
//         url = HttpUtil.getShortLink(url);
//      }
      return url;
   }
@@ -397,8 +401,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) {
@@ -483,14 +487,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);
@@ -521,6 +528,7 @@
      jsonDTO.put("goodsReq", json);
      String result = baseRequest2("jd.union.open.goods.jingfen.query", null, jsonDTO);
      LogHelper.test(result);
      System.out.println(result);
      JSONObject resultJson = JSONObject.fromObject(result);
      resultJson = resultJson.optJSONObject("jd_union_open_goods_jingfen_query_response");
@@ -617,6 +625,7 @@
      json.put("orderReq", orderReq);
      String result = baseRequest2("jd.union.open.order.query", null, json);
      System.out.println(result);
      JSONObject root = JSONObject.fromObject(result).optJSONObject("jd_union_open_order_query_response");
      if (root.optInt("code") == 0) {
         boolean hasMore = root.optBoolean("hasMore");
@@ -629,12 +638,33 @@
            List<JDOrder> orderList = new Gson().fromJson(date, typeToken);
            if (orderList != null)
               for (JDOrder order : orderList) {
                  Map<Long, List<JDOrderItem>> map = new HashMap<>();
                  for (int i = 0; i < order.getOrderItemList().size(); i++) {
                     JDOrderItem orderItem = order.getOrderItemList().get(i);
                     if (map.get(orderItem.getSkuId()) == null)
                        map.put(orderItem.getSkuId(), new ArrayList<>());
                     map.get(orderItem.getSkuId()).add(orderItem);
                     order.getOrderItemList().get(i)
                           .setTradeId(order.getOrderId() + "-" + order.getOrderItemList().get(i).getSkuId());
                     order.getOrderItemList().get(i).setOrderId(order.getOrderId());
                     order.getOrderItemList().get(i).setOrderBy(i + 1);
                  }
                  // 查询商品ID相同的子订单
                  for (Iterator<Long> its = map.keySet().iterator(); its.hasNext();) {
                     Long skuId = its.next();
                     if (map.get(skuId).size() > 1) {
                        int skuOrderBy = 1;
                        for (int i = 0; i < order.getOrderItemList().size(); i++) {
                           JDOrderItem orderItem = order.getOrderItemList().get(i);
                           if (orderItem.getSkuId().longValue() == skuId) {
                              order.getOrderItemList().get(i).setTradeId(order.getOrderId() + "-"
                                    + order.getOrderItemList().get(i).getSkuId() + "-" + skuOrderBy++);
                           }
                        }
                     }
                  }
               }
            return new JDOrderResult(hasMore, orderList);
         }