Merge remote-tracking branch 'origin/master'

admin

2019-07-30 573c491b4a1ba60e12a5678a01c1546c0077c1ee

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

@@ -2,6 +2,7 @@


import java.io.UnsupportedEncodingException;

import java.lang.reflect.Type;

import java.math.BigDecimal;

import java.net.URLEncoder;

import java.util.ArrayList;

import java.util.Collections;

@@ -15,9 +16,13 @@


import com.google.gson.Gson;

import com.google.gson.reflect.TypeToken;

import com.yeshi.fanli.dto.jd.JDCategoryInfo;

import com.yeshi.fanli.dto.jd.JDCommissionInfo;

import com.yeshi.fanli.dto.jd.JDOrderResult;

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.util.MoneyBigDecimalUtil;

import com.yeshi.fanli.util.StringUtil;

import com.yeshi.fanli.util.TimeUtil;



@@ -132,7 +137,7 @@
         JSONArray array = resultJson.optJSONArray("data");

         if (array != null)

            for (int i = 0; i < array.size(); i++) {

               JDGoods goods = parseJDGoods(array.optJSONObject(i));

               JDGoods goods = parseSimpleJDGoods(array.optJSONObject(i));

               if (goods != null)

                  list.add(goods);

            }

@@ -140,27 +145,46 @@
      return list;

   }



   private static JDGoods parseJDGoods(JSONObject json) {

   private static JDGoods parseSimpleJDGoods(JSONObject json) {

      JDGoods goods = new JDGoods();

      // goods.setBrandCode(brandCode);

      // goods.setBrandName(brandName);

      // goods.setCategoryInfo(categoryInfo);

      // goods.setComments(comments);

      // goods.setCommissionInfo(commissionInfo);

      // goods.setCouponInfo(couponInfo);

      // goods.setGoodCommentsShare(goodCommentsShare);

      // goods.setImageList(imageList);

      // goods.setInOrderCount30Days(inOrderCount30Days);

      // goods.setIsHot(isHot);

      // goods.setMaterialUrl(materialUrl);

      // goods.setOwner(owner);

      // goods.setPinGouInfo(pinGouInfo);

      // goods.setPrice(price);

      // goods.setShopInfo(shopInfo);

      // goods.setSkuId(skuId);

      // goods.setSkuName(skuName);

      // goods.setSpuid(spuid);

      // goods.setTotalCount(totalCount);



      JDCategoryInfo categoryInfo = new JDCategoryInfo();

      categoryInfo.setCid1(json.optLong("cid1"));

      categoryInfo.setCid1Name(json.optString("cid1Name"));

      categoryInfo.setCid2(json.optLong("cid2"));

      categoryInfo.setCid2Name(json.optString("cid2Name"));

      categoryInfo.setCid3(json.optLong("cid3"));

      categoryInfo.setCid3Name(json.optString("cid3Name"));



      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)));



      goods.setCommissionInfo(commissionInfo);

      goods.setCouponInfo(null);

      goods.setGoodCommentsShare(null);

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

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

      goods.setImageList(imageList);

      goods.setInOrderCount30Days(0L);

      goods.setIsHot(null);

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

      goods.setOwner(null);

      goods.setPinGouInfo(null);



      JDShopInfo shopInfo = new JDShopInfo();

      shopInfo.setShopId(json.optInt("shopId"));

      shopInfo.setShopName(null);

      goods.setShopInfo(shopInfo);

      goods.setSkuId(json.optLong("skuId"));

      goods.setSkuName(json.optString("goodsName"));

      goods.setTotalCount(null);



      return goods;

   }