fanli-server.git

			@@ -22,8 +22,10 @@
			import com.yeshi.fanli.entity.taobao.TaoKeAppInfo;
			import com.yeshi.fanli.exception.taobao.TaoKeApiException;
			import com.yeshi.fanli.exception.taobao.TaobaoGoodsDownException;
			import com.yeshi.fanli.log.LogHelper;
			import com.yeshi.fanli.log.TaoKeLogHelper;
			import com.yeshi.fanli.tag.PageEntity;
			import com.yeshi.fanli.util.Constant;
			import com.yeshi.fanli.util.MoneyBigDecimalUtil;
			import com.yeshi.fanli.util.StringUtil;
			import com.yeshi.fanli.util.TimeUtil;
			@@ -1594,6 +1596,7 @@
			.optString("relation_id");
			} catch (TaoKeApiException e) {
			e.printStackTrace();
			LogHelper.error("渠道ID申请出错:" + resultJSON);
			}

			return null;
			@@ -1616,6 +1619,7 @@
			.optString("special_id");
			} catch (TaoKeApiException e) {
			e.printStackTrace();
			LogHelper.error("会员运营ID申请出错:" + resultJSON);
			}

			return null;
			@@ -1624,22 +1628,22 @@
			/**
			* 获取会员订单
			*
			* @param startTime
			* @param startTime-开始时间
			* @param page-页码
			* @param appKey
			* @param appSecret
			* @return
			*/
			public static List<TaoBaoOrder> getTaoBaoSpecialOrder(String startTime, String appKey, String appSecret) {
			public static List<TaoBaoOrder> getTaoBaoSpecialOrder(String startTime, int page, String appKey, String appSecret) {
			Map<String, String> map = new HashMap<>();
			map.put("method", "taobao.tbk.order.get");
			map.put("fields",
			"tb_trade_parent_id,tb_trade_id,num_iid,item_title,item_num,price,pay_price,seller_nick,seller_shop_title,commission,commission_rate,unid,create_time,earning_time,tk_status,tk3rd_pub_id,tk3rd_site_id,tk3rd_adzone_id,relation_id,tb_trade_parent_id,tb_trade_id,num_iid,item_title,item_num,price,pay_price,seller_nick,seller_shop_title,commission,commission_rate,unid,create_time,earning_time,tk3rd_pub_id,tk3rd_site_id,tk3rd_adzone_id,special_id,click_time,relation_id,special_id");
			map.put("start_time", startTime);
			map.put("span", "1200");
			map.put("tk_status", "1");
			map.put("order_query_type", "create_time");
			map.put("order_scene", "3");
			map.put("page_no", 1 + "");
			map.put("page_no", page + "");
			map.put("page_size", 100 + "");

			TaoKeAppInfo app = new TaoKeAppInfo();
			@@ -1647,6 +1651,43 @@
			app.setAppSecret(appSecret);
			try {
			JSONObject json = TaoKeBaseUtil.baseRequest(map, app);
			System.out.println(json.toString());
			return parseTaoBaoOrder(json.toString());
			} catch (TaoKeApiException e) {
			e.printStackTrace();
			}
			return null;
			}

			/**
			* 获取第三方会员订单
			*
			* @param startTime
			* @param page
			* @param appKey
			* @param appSecret
			* @return
			*/
			public static List<TaoBaoOrder> getTaoBaoSpecialThirdOrder(String startTime, int page, String appKey,
			String appSecret) {
			Map<String, String> map = new HashMap<>();
			map.put("method", "taobao.tbk.order.get");
			map.put("fields",
			"tb_trade_parent_id,tb_trade_id,num_iid,item_title,item_num,price,pay_price,seller_nick,seller_shop_title,commission,commission_rate,unid,create_time,earning_time,tk_status,tk3rd_pub_id,tk3rd_site_id,tk3rd_adzone_id,relation_id,tb_trade_parent_id,tb_trade_id,num_iid,item_title,item_num,price,pay_price,seller_nick,seller_shop_title,commission,commission_rate,unid,create_time,earning_time,tk3rd_pub_id,tk3rd_site_id,tk3rd_adzone_id,special_id,click_time,relation_id,special_id");
			map.put("start_time", startTime);
			map.put("tk_status", "1");
			map.put("order_query_type", "create_time");
			map.put("order_scene", "3");
			map.put("page_no", page + "");
			map.put("page_size", 100 + "");
			map.put("order_count_type", "2");

			TaoKeAppInfo app = new TaoKeAppInfo();
			app.setAppKey(appKey);
			app.setAppSecret(appSecret);
			try {
			JSONObject json = TaoKeBaseUtil.baseRequest(map, app);
			System.out.println(json.toString());
			return parseTaoBaoOrder(json.toString());
			} catch (TaoKeApiException e) {
			e.printStackTrace();
			@@ -1662,7 +1703,8 @@
			* @param appSecret
			* @return
			*/
			public static List<TaoBaoOrder> getTaoBaoRelationOrder(String startTime, String appKey, String appSecret) {
			public static List<TaoBaoOrder> getTaoBaoRelationOrder(String startTime, int page, String appKey,
			String appSecret) {
			Map<String, String> map = new HashMap<>();
			map.put("method", "taobao.tbk.order.get");
			map.put("fields",
			@@ -1672,7 +1714,7 @@
			map.put("tk_status", "1");
			map.put("order_query_type", "create_time");
			map.put("order_scene", "2");
			map.put("page_no", 1 + "");
			map.put("page_no", page + "");
			map.put("page_size", 100 + "");

			TaoKeAppInfo app = new TaoKeAppInfo();
			@@ -1687,6 +1729,96 @@
			}

			return null;
			}

			/**
			* 第三方渠道订单
			*
			* @param startTime
			* @param page
			* @param appKey
			* @param appSecret
			* @return
			*/
			public static List<TaoBaoOrder> getTaoBaoRelationThirdOrder(String startTime, int page, String appKey,
			String appSecret) {
			Map<String, String> map = new HashMap<>();
			map.put("method", "taobao.tbk.order.get");
			map.put("fields",
			"tb_trade_parent_id,tb_trade_id,num_iid,item_title,item_num,price,pay_price,seller_nick,seller_shop_title,commission,commission_rate,unid,create_time,earning_time,tk_status,tk3rd_pub_id,tk3rd_site_id,tk3rd_adzone_id,relation_id,tb_trade_parent_id,tb_trade_id,num_iid,item_title,item_num,price,pay_price,seller_nick,seller_shop_title,commission,commission_rate,unid,create_time,earning_time,tk3rd_pub_id,tk3rd_site_id,tk3rd_adzone_id,special_id,click_time,relation_id,special_id");
			map.put("start_time", startTime);
			map.put("span", "1200");
			map.put("tk_status", "1");
			map.put("order_query_type", "create_time");
			map.put("order_scene", "2");
			map.put("page_no", page + "");
			map.put("page_size", 100 + "");
			map.put("order_count_type", "2");

			TaoKeAppInfo app = new TaoKeAppInfo();
			app.setAppKey(appKey);
			app.setAppSecret(appSecret);
			try {
			JSONObject json = TaoKeBaseUtil.baseRequest(map, app);
			return parseTaoBaoOrder(json.toString());
			} catch (TaoKeApiException e) {
			e.printStackTrace();
			}
			return null;
			}

			/**
			* 获取所有的订单（不带渠道信息与会员信息）
			*
			* @param startTime
			* @param appKey
			* @param appSecret
			* @return
			*/
			public static List<TaoBaoOrder> getTaoBaoAllOrder(String startTime, String appKey, String appSecret) {
			Map<String, String> map = new HashMap<>();
			map.put("method", "taobao.tbk.order.get");
			map.put("fields",
			"tb_trade_parent_id,tb_trade_id,num_iid,item_title,item_num,price,pay_price,seller_nick,seller_shop_title,commission,commission_rate,unid,create_time,earning_time,tk_status,tk3rd_pub_id,tk3rd_site_id,tk3rd_adzone_id,relation_id,tb_trade_parent_id,tb_trade_id,num_iid,item_title,item_num,price,pay_price,seller_nick,seller_shop_title,commission,commission_rate,unid,create_time,earning_time,tk3rd_pub_id,tk3rd_site_id,tk3rd_adzone_id,special_id,click_time,relation_id,special_id");
			map.put("start_time", startTime);
			map.put("span", "1200");
			map.put("tk_status", "1");
			map.put("order_query_type", "create_time");
			map.put("order_scene", "1");// 所有订单
			map.put("page_no", 1 + "");
			map.put("page_size", 100 + "");

			TaoKeAppInfo app = new TaoKeAppInfo();
			app.setAppKey(appKey);
			app.setAppSecret(appSecret);
			try {
			JSONObject json = TaoKeBaseUtil.baseRequest(map, app);
			return parseTaoBaoOrder(json.toString());
			} catch (TaoKeApiException e) {
			e.printStackTrace();
			}

			return null;
			}


			public static void punish()
			{
			Map<String, String> map = new HashMap<>();
			map.put("method", "taobao.tbk.dg.punish.order.get");
			map.put("span", "3600");
			map.put("page_no", "1");
			map.put("page_size", "20");
			map.put("start_time", "2019-01-01 00:00:00");
			// map.put("start_time", "2019-01-01 00:00:00");
			TaoKeAppInfo app = new TaoKeAppInfo();
			app.setAppKey(Constant.TAOBAO_AUTH_APPKEY);
			app.setAppSecret(Constant.TAOBAO_AUTH_APPSECRET);
			try {
			JSONObject json = TaoKeBaseUtil.baseRequest(map, app);
			} catch (TaoKeApiException e) {
			e.printStackTrace();
			}
			}

			private static List<TaoBaoOrder> parseTaoBaoOrder(String response) {
			@@ -1704,70 +1836,83 @@
			JSONArray array = data.optJSONObject("tbk_order_get_response").optJSONObject("results")
			.optJSONArray("n_tbk_order");
			for (int i = 0; i < array.size(); i++) {

			JSONObject item = array.optJSONObject(i);
			TaoBaoOrder taoBaoOrder = new TaoBaoOrder();
			taoBaoOrder.setAdPositionId(item.optString("adzone_id"));
			taoBaoOrder.setAdPositionName("");
			taoBaoOrder.setAuctionId(item.optLong("num_iid"));
			taoBaoOrder.setClassName(item.optString("auction_category"));
			taoBaoOrder.setClickTime(item.optString("click_time"));
			taoBaoOrder.setCount(item.optInt("item_num"));
			taoBaoOrder.setCreateTime(item.optString("create_time"));
			if (!StringUtil.isNullOrEmpty(item.optString("commission")))
			taoBaoOrder.seteIncome(new BigDecimal(item.optString("commission")));
			else
			taoBaoOrder.seteIncome(new BigDecimal(0));
			try {
			TaoBaoOrder taoBaoOrder = new TaoBaoOrder();
			taoBaoOrder.setAdPositionId(item.optString("adzone_id"));
			taoBaoOrder.setAdPositionName(item.optString("adzone_name"));
			taoBaoOrder.setAuctionId(item.optLong("num_iid"));
			taoBaoOrder.setClassName(item.optString("auction_category"));
			taoBaoOrder.setClickTime(item.optString("click_time"));
			taoBaoOrder.setCount(item.optInt("item_num"));
			taoBaoOrder.setCreateTime(item.optString("create_time"));
			if (!StringUtil.isNullOrEmpty(item.optString("total_commission_fee")))
			taoBaoOrder.seteIncome(new BigDecimal(item.optString("total_commission_fee")));
			else
			taoBaoOrder.seteIncome(new BigDecimal(0));

			if (!StringUtil.isNullOrEmpty(item.optString("pub_share_pre_fee")))
			taoBaoOrder.setEstimate(new BigDecimal(item.optString("pub_share_pre_fee")));
			else
			taoBaoOrder.setEstimate(new BigDecimal(0));
			taoBaoOrder.setiRatio(new BigDecimal(item.optString("income_rate")).multiply(new BigDecimal(100)));
			taoBaoOrder.setLatestUpdateTime(null);
			taoBaoOrder.setManagerWangWang(null);
			taoBaoOrder.setOrderBy(null);
			taoBaoOrder.setOrderId(item.optString("trade_id"));
			if (item.optInt("tk_status") == 12)
			taoBaoOrder.setOrderState("订单付款");
			else if (item.optInt("tk_status") == 3)
			taoBaoOrder.setOrderState("订单结算");
			else if (item.optInt("tk_status") == 13)
			taoBaoOrder.setOrderState("订单失效");
			else if (item.optInt("tk_status") == 14)
			taoBaoOrder.setOrderState("订单成功");
			if (!StringUtil.isNullOrEmpty(item.optString("pub_share_pre_fee")))
			taoBaoOrder.setEstimate(new BigDecimal(item.optString("pub_share_pre_fee")));
			else
			taoBaoOrder.setEstimate(new BigDecimal(0));
			taoBaoOrder.setiRatio(new BigDecimal(item.optString("income_rate")).multiply(new BigDecimal(100)));
			taoBaoOrder.setLatestUpdateTime(null);
			taoBaoOrder.setManagerWangWang(null);
			taoBaoOrder.setOrderBy(null);
			taoBaoOrder.setOrderId(item.optString("trade_parent_id"));
			if (item.optInt("tk_status") == 12)
			taoBaoOrder.setOrderState("订单付款");
			else if (item.optInt("tk_status") == 3)
			taoBaoOrder.setOrderState("订单结算");
			else if (item.optInt("tk_status") == 13)
			taoBaoOrder.setOrderState("订单失效");
			else if (item.optInt("tk_status") == 14)
			taoBaoOrder.setOrderState("订单成功");

			taoBaoOrder.setOrderType(item.optString("order_type"));
			if (!StringUtil.isNullOrEmpty(item.optString("pay_price")))
			taoBaoOrder.setPayment(new BigDecimal(item.optString("pay_price")));
			else
			taoBaoOrder.setPayment(new BigDecimal(0));
			taoBaoOrder.setPrice(new BigDecimal(item.optString("price")));
			if (!StringUtil.isNullOrEmpty(item.optString("alipay_total_price")))
			taoBaoOrder.setSettlement(new BigDecimal(item.optString("alipay_total_price")));
			else
			taoBaoOrder.setSettlement(new BigDecimal(0));
			taoBaoOrder.setSettlementTime(item.optString("earning_time"));
			taoBaoOrder.setShop(item.optString("seller_shop_title"));
			taoBaoOrder.setSourceMediaId(item.optString("site_id"));
			taoBaoOrder.setSourceMediaName(item.optString("site_name"));
			taoBaoOrder.setsRatio(null);
			taoBaoOrder.setSubsidy(null);
			if (!StringUtil.isNullOrEmpty(item.optString("subsidy_rate")))
			taoBaoOrder
			.setSubsidyRatio(new BigDecimal(item.optString("subsidy_rate")).multiply(new BigDecimal(100)));
			taoBaoOrder.setSubsidyType(item.optString("subsidy_type"));
			taoBaoOrder.setTechnologySupportPercent(null);
			taoBaoOrder.setThirdService(null);
			taoBaoOrder.setTitle(item.optString("item_title"));
			if (!StringUtil.isNullOrEmpty(item.optString("total_commission_fee")))
			taoBaoOrder.setTkMoney(new BigDecimal(item.optString("total_commission_fee")));
			else
			taoBaoOrder.setTkMoney(new BigDecimal(0));
			taoBaoOrder.setTkRate(new BigDecimal(item.optString("commission_rate")));
			taoBaoOrder.setTransactionPlatform(item.optString("terminal_type"));
			taoBaoOrder.setRelationId(item.optString("relation_id"));
			taoBaoOrder.setSpecialId(item.optString("special_id"));
			orderList.add(taoBaoOrder);
			taoBaoOrder.setOrderType(item.optString("order_type"));
			if (!StringUtil.isNullOrEmpty(item.optString("alipay_total_price")))
			taoBaoOrder.setPayment(new BigDecimal(item.optString("alipay_total_price")));
			else
			taoBaoOrder.setPayment(new BigDecimal(0));
			taoBaoOrder.setPrice(new BigDecimal(item.optString("price")));
			if (!StringUtil.isNullOrEmpty(item.optString("alipay_total_price")))
			taoBaoOrder.setSettlement(new BigDecimal(item.optString("alipay_total_price")));
			else
			taoBaoOrder.setSettlement(new BigDecimal(0));
			taoBaoOrder.setSettlementTime(item.optString("earning_time"));
			taoBaoOrder.setShop(item.optString("seller_shop_title"));
			taoBaoOrder.setSourceMediaId(item.optString("site_id"));
			taoBaoOrder.setSourceMediaName(item.optString("site_name"));
			taoBaoOrder.setsRatio(null);
			taoBaoOrder.setSubsidy(null);
			if (!StringUtil.isNullOrEmpty(item.optString("subsidy_rate")))
			taoBaoOrder.setSubsidyRatio(
			new BigDecimal(item.optString("subsidy_rate")).multiply(new BigDecimal(100)));
			taoBaoOrder.setSubsidyType(item.optString("subsidy_type"));
			taoBaoOrder.setTechnologySupportPercent(null);
			taoBaoOrder.setThirdService(null);
			taoBaoOrder.setTitle(item.optString("item_title"));
			if (!StringUtil.isNullOrEmpty(item.optString("total_commission_fee")))
			taoBaoOrder.setTkMoney(new BigDecimal(item.optString("total_commission_fee")));
			else
			taoBaoOrder.setTkMoney(new BigDecimal(0));
			if (!StringUtil.isNullOrEmpty(item.optString("commission_rate")))
			taoBaoOrder
			.setTkRate(new BigDecimal(item.optString("commission_rate")).multiply(new BigDecimal(100)));
			else if (!StringUtil.isNullOrEmpty(item.optString("total_commission_rate")))
			taoBaoOrder.setTkRate(
			new BigDecimal(item.optString("total_commission_rate")).multiply(new BigDecimal(100)));
			taoBaoOrder.setTransactionPlatform(item.optString("terminal_type"));
			taoBaoOrder.setRelationId(item.optString("relation_id"));
			taoBaoOrder.setSpecialId(item.optString("special_id"));
			orderList.add(taoBaoOrder);
			} catch (Exception e) {
			try {
			LogHelper.errorDetailInfo(e, "订单号信息:" + item.toString(), "订单解析出错");
			} catch (Exception e1) {
			}
			}
			}

			return orderList;
			@@ -1805,7 +1950,8 @@
			String itemLink = resultJSON.optString("item_url");
			TaoBaoGoodsBrief goods = new TaoBaoGoodsBrief();
			goods.setAuctionUrl(itemLink);
			goods.setCouponLink(couponLink);
			if (!StringUtil.isNullOrEmpty(resultJSON.optString("coupon_info")))
			goods.setCouponLink(couponLink);
			return goods;
			} catch (TaoKeApiException e) {
			e.printStackTrace();
			@@ -1814,6 +1960,26 @@
			return null;
			}

			public static void juHuaSuan() {
			Map<String, String> map = new HashMap<>();
			map.put("method", "taobao.ju.items.search");
			map.put("current_page", 1 + "");
			map.put("page_size", 100+"");
			map.put("pid", "mm_124933865_43788020_381938426");

			TaoKeAppInfo app = new TaoKeAppInfo();
			app.setAppKey("24838852");
			app.setAppSecret("bc8265e2bf8d8115329d652f9d3d4cd8");

			try {
			JSONObject json = TaoKeBaseUtil.baseRequest(map, app);
			System.out.println(json);
			} catch (TaoKeApiException e) {
			e.printStackTrace();
			}

			}

			// AA5ISJ

			private static TaoBaoGoodsBrief parseWuLiaoItemFromMaterialId(JSONObject item) {