From d1d0b4b9f4452fb6e9b6e39168f503d5b302c999 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 11 一月 2022 11:26:35 +0800
Subject: [PATCH] 部分功能添加
---
fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoKeOrderApiUtil.java | 179 ++++++++++++++++++++++++++++++-----------------------------
1 files changed, 92 insertions(+), 87 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoKeOrderApiUtil.java b/fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoKeOrderApiUtil.java
index 05880d5..ad60410 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoKeOrderApiUtil.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoKeOrderApiUtil.java
@@ -123,91 +123,7 @@
JSONObject item = array.optJSONObject(i);
try {
- TaoBaoOrder taoBaoOrder = new TaoBaoOrder();
- taoBaoOrder.setAdPositionId(item.optString("adzone_id"));
- taoBaoOrder.setAdPositionName(item.optString("adzone_name"));
- taoBaoOrder.setAuctionId(item.optLong("item_id"));
- taoBaoOrder.setClassName(item.optString("item_category_name"));
- taoBaoOrder.setClickTime(item.optString("click_time"));
- taoBaoOrder.setPayTime(item.optString("tb_paid_time"));
- taoBaoOrder.setCount(item.optInt("item_num"));
- taoBaoOrder.setCreateTime(item.optString("tk_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")));
- 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("alipay_total_price")))
- taoBaoOrder.setPayment(new BigDecimal(item.optString("alipay_total_price")));
- else
- taoBaoOrder.setPayment(new BigDecimal(0));
- if (StringUtil.isNullOrEmpty(item.optString("item_price")))
- taoBaoOrder.setPrice(new BigDecimal(0));
- else
- taoBaoOrder.setPrice(new BigDecimal(item.optString("item_price")));
- if (!StringUtil.isNullOrEmpty(item.optString("pay_price")))
- taoBaoOrder.setSettlement(new BigDecimal(item.optString("pay_price")));
- else
- taoBaoOrder.setSettlement(taoBaoOrder.getPayment());
- taoBaoOrder.setSettlementTime(item.optString("tk_earning_time"));
- taoBaoOrder.setShop(item.optString("seller_shop_title"));
- taoBaoOrder.setSourceMediaId(item.optString("site_id"));
- taoBaoOrder.setSourceMediaName(item.optString("site_name"));
- taoBaoOrder.setsRatio(null);
- if (!StringUtil.isNullOrEmpty(item.optString("subsidy_fee")))// 琛ヨ创閲戦
- taoBaoOrder.setSubsidy(new BigDecimal(item.optString("subsidy_fee")));
- if (!StringUtil.isNullOrEmpty(item.optString("subsidy_rate")))
- taoBaoOrder.setSubsidyRatio(new BigDecimal(item.optString("subsidy_rate")));
- 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")));
- else if (!StringUtil.isNullOrEmpty(item.optString("total_commission_rate")))
- taoBaoOrder.setTkRate(new BigDecimal(item.optString("total_commission_rate")));
- taoBaoOrder.setTransactionPlatform(item.optString("terminal_type"));
- taoBaoOrder.setRelationId(item.optString("relation_id"));
- taoBaoOrder.setSpecialId(item.optString("special_id"));
- taoBaoOrder.setTradeId(item.optString("trade_id"));
- // 瑙ｆ瀽鍟嗗搧淇℃伅
- TaoBaoOrderGoods goods = new TaoBaoOrderGoods();
- goods.setCategoryName(item.optString("item_category_name"));
- goods.setCreateTime(new Date());
- goods.setGoodsId(item.optLong("item_id"));
- goods.setImg(item.optString("item_img"));
- goods.setLink(item.optString("item_link"));
- goods.setPrice(item.optString("item_price"));
- goods.setTitle(item.optString("item_title"));
- goods.setTradeId(item.optString("trade_id"));
- if (goods.getImg() != null && !goods.getImg().startsWith("http")) {
- goods.setImg("http:" + goods.getImg());
- }
-
- taoBaoOrder.setGoods(goods);
+ TaoBaoOrder taoBaoOrder = parseTaoBaoOrderNew(item);
orderList.add(taoBaoOrder);
} catch (Exception e) {
try {
@@ -425,8 +341,8 @@
*
* @param startTime
* @param endTime
- * @param status 12-浠樻锛�13-鍏抽棴锛�14-纭鏀惰揣锛�3-缁撶畻鎴愬姛;涓嶄紶
- * @param queryType 1锛氭寜鐓ц鍗曟窐瀹㈠垱寤烘椂闂存煡璇紝2:鎸夌収璁㈠崟娣樺浠樻鏃堕棿鏌ヨ锛�3:鎸夌収璁㈠崟娣樺缁撶畻鏃堕棿鏌ヨ
+ * @param status 12-浠樻锛�13-鍏抽棴锛�14-纭鏀惰揣锛�3-缁撶畻鎴愬姛;涓嶄紶
+ * @param queryType 1锛氭寜鐓ц鍗曟窐瀹㈠垱寤烘椂闂存煡璇紝2:鎸夌収璁㈠崟娣樺浠樻鏃堕棿鏌ヨ锛�3:鎸夌収璁㈠崟娣樺缁撶畻鏃堕棿鏌ヨ
* @param orderScene 1:甯歌璁㈠崟锛�2:娓犻亾璁㈠崟锛�3:浼氬憳杩愯惀璁㈠崟
* @return
*/
@@ -515,6 +431,95 @@
}
+ public static TaoBaoOrder parseTaoBaoOrderNew(JSONObject item) {
+ TaoBaoOrder taoBaoOrder = new TaoBaoOrder();
+ taoBaoOrder.setAdPositionId(item.optString("adzone_id"));
+ taoBaoOrder.setAdPositionName(item.optString("adzone_name"));
+ taoBaoOrder.setAuctionId(item.optLong("item_id"));
+ taoBaoOrder.setClassName(item.optString("item_category_name"));
+ taoBaoOrder.setClickTime(item.optString("click_time"));
+ taoBaoOrder.setPayTime(item.optString("tb_paid_time"));
+ taoBaoOrder.setCount(item.optInt("item_num"));
+ taoBaoOrder.setCreateTime(item.optString("tk_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")));
+ 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("alipay_total_price")))
+ taoBaoOrder.setPayment(new BigDecimal(item.optString("alipay_total_price")));
+ else
+ taoBaoOrder.setPayment(new BigDecimal(0));
+ if (StringUtil.isNullOrEmpty(item.optString("item_price")))
+ taoBaoOrder.setPrice(new BigDecimal(0));
+ else
+ taoBaoOrder.setPrice(new BigDecimal(item.optString("item_price")));
+ if (!StringUtil.isNullOrEmpty(item.optString("pay_price")))
+ taoBaoOrder.setSettlement(new BigDecimal(item.optString("pay_price")));
+ else
+ taoBaoOrder.setSettlement(taoBaoOrder.getPayment());
+ taoBaoOrder.setSettlementTime(item.optString("tk_earning_time"));
+ taoBaoOrder.setShop(item.optString("seller_shop_title"));
+ taoBaoOrder.setSourceMediaId(item.optString("site_id"));
+ taoBaoOrder.setSourceMediaName(item.optString("site_name"));
+ taoBaoOrder.setsRatio(null);
+ if (!StringUtil.isNullOrEmpty(item.optString("subsidy_fee")))// 琛ヨ创閲戦
+ taoBaoOrder.setSubsidy(new BigDecimal(item.optString("subsidy_fee")));
+ if (!StringUtil.isNullOrEmpty(item.optString("subsidy_rate")))
+ taoBaoOrder.setSubsidyRatio(new BigDecimal(item.optString("subsidy_rate")));
+ 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")));
+ else if (!StringUtil.isNullOrEmpty(item.optString("total_commission_rate")))
+ taoBaoOrder.setTkRate(new BigDecimal(item.optString("total_commission_rate")));
+ taoBaoOrder.setTransactionPlatform(item.optString("terminal_type"));
+ taoBaoOrder.setRelationId(item.optString("relation_id"));
+ taoBaoOrder.setSpecialId(item.optString("special_id"));
+ taoBaoOrder.setTradeId(item.optString("trade_id"));
+ // 瑙ｆ瀽鍟嗗搧淇℃伅
+ TaoBaoOrderGoods goods = new TaoBaoOrderGoods();
+ goods.setCategoryName(item.optString("item_category_name"));
+ goods.setCreateTime(new Date());
+ goods.setGoodsId(item.optLong("item_id"));
+ goods.setImg(item.optString("item_img"));
+ goods.setLink(item.optString("item_link"));
+ goods.setPrice(item.optString("item_price"));
+ goods.setTitle(item.optString("item_title"));
+ goods.setTradeId(item.optString("trade_id"));
+ if (goods.getImg() != null && !goods.getImg().startsWith("http")) {
+ goods.setImg("http:" + goods.getImg());
+ }
+ taoBaoOrder.setGoods(goods);
+ return taoBaoOrder;
+ }
+
+
@Deprecated
public static List<TaoBaoOrder> queryTaoBaoOrder(OrderQuery orderQuery, String appKey, String appSecret) {
--
Gitblit v1.8.0