From eb78e9183005efa02064956cc9ef2299dc2d2bdd Mon Sep 17 00:00:00 2001 From: admin <weikou2014> Date: 星期四, 15 八月 2019 16:01:58 +0800 Subject: [PATCH] Merge branch 'mater-1.6.0' into div --- fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoKeOrderApiUtil.java | 24 +++++++++++++----------- 1 files changed, 13 insertions(+), 11 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 ca28f04..e3679dc 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 @@ -619,18 +619,20 @@ return orderList; } - public static WeiQuanOrderResult getTaoBaoRelationWeiQuanOrderList(Date startTime, int page, boolean third) { + public static WeiQuanOrderResult getTaoBaoRelationWeiQuanOrderList(Date startTime, int searchType, int page, + boolean third) { - return getRelationAndSpecialWeiQuanOrderList(startTime, page, third, 1); + return getRelationAndSpecialWeiQuanOrderList(startTime, searchType, page, third, 1); } - public static WeiQuanOrderResult getTaoBaoSpecialWeiQuanOrderList(Date startTime, int page, boolean third) { + public static WeiQuanOrderResult getTaoBaoSpecialWeiQuanOrderList(Date startTime, int searchType, int page, + boolean third) { - return getRelationAndSpecialWeiQuanOrderList(startTime, page, third, 2); + return getRelationAndSpecialWeiQuanOrderList(startTime, searchType, page, third, 2); } - private static WeiQuanOrderResult getRelationAndSpecialWeiQuanOrderList(Date startTime, int page, boolean third, - int bizType) { + private static WeiQuanOrderResult getRelationAndSpecialWeiQuanOrderList(Date startTime, int searchType, int page, + boolean third, int bizType) { WeiQuanOrderResult finalResult = new WeiQuanOrderResult(); List<TaoBaoWeiQuanOrder> list = new ArrayList<>(); @@ -639,7 +641,7 @@ map.put("method", "taobao.tbk.relation.refund"); JSONObject option = new JSONObject(); - option.put("search_type", 2); + option.put("search_type", searchType); option.put("refund_type", third ? 2 : 1); option.put("start_time", TimeUtil.getGernalTime(startTime.getTime(), "yyyy-MM-dd HH:mm:ss")); option.put("page_no", page); @@ -667,16 +669,16 @@ order.setGoodsName(item.optString("tb_auction_title")); BigDecimal fanMoney = new BigDecimal(0); if (!StringUtil.isNullOrEmpty(item.optString("tk_subsidy_fee_refund3rd_pub"))) { - fanMoney= fanMoney.add(new BigDecimal(item.optString("tk_subsidy_fee_refund3rd_pub"))); + fanMoney = fanMoney.add(new BigDecimal(item.optString("tk_subsidy_fee_refund3rd_pub"))); } if (!StringUtil.isNullOrEmpty(item.optString("tk_commission_fee_refund3rd_pub"))) { - fanMoney= fanMoney.add(new BigDecimal(item.optString("tk_commission_fee_refund3rd_pub"))); + fanMoney = fanMoney.add(new BigDecimal(item.optString("tk_commission_fee_refund3rd_pub"))); } if (!StringUtil.isNullOrEmpty(item.optString("tk_subsidy_fee_refund_pub"))) { - fanMoney= fanMoney.add(new BigDecimal(item.optString("tk_subsidy_fee_refund_pub"))); + fanMoney = fanMoney.add(new BigDecimal(item.optString("tk_subsidy_fee_refund_pub"))); } if (!StringUtil.isNullOrEmpty(item.optString("tk_commission_fee_refund_pub"))) { - fanMoney= fanMoney.add(new BigDecimal(item.optString("tk_commission_fee_refund_pub"))); + fanMoney = fanMoney.add(new BigDecimal(item.optString("tk_commission_fee_refund_pub"))); } if (fanMoney.compareTo(new BigDecimal(0)) == 0) -- Gitblit v1.8.0