Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

yujian

2019-08-27 d8359ddb48dab5cc797a9d552e11fde571f4920c

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

@@ -28,6 +28,7 @@
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.tag.PageEntity;

import com.yeshi.fanli.util.MoneyBigDecimalUtil;

import com.yeshi.fanli.util.StringUtil;

@@ -131,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;

      }

@@ -617,6 +619,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 +632,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);

         }