From a0a5b70e0d0df9357d09542f20dc6633a986f328 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 25 六月 2019 11:06:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoKeApiUtil.java | 71 +++++++++++++++++++++++++++--------
1 files changed, 55 insertions(+), 16 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoKeApiUtil.java b/fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoKeApiUtil.java
index f02503e..3b7bcc4 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoKeApiUtil.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoKeApiUtil.java
@@ -12,6 +12,7 @@
import com.taobao.api.ApiException;
import com.yeshi.fanli.dto.taobao.TaoBaoShopInfoDTO;
import com.yeshi.fanli.dto.taobao.TaoLiJinDTO;
+import com.yeshi.fanli.entity.bus.tlj.UserTaoLiJinReport;
import com.yeshi.fanli.entity.taobao.RelateGoods;
import com.yeshi.fanli.entity.taobao.SearchFilter;
import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
@@ -1946,9 +1947,8 @@
}
// 娣樼ぜ閲戝垱寤�
-
public static TaoLiJinDTO createTaoLiJin(Long auctionId, String name, BigDecimal perface, int totalNum,
- int useDayLimit, Date sendStartTime, Date sendEndTime, Date useStartTime) {
+ Date sendStartTime, Date sendEndTime, Date useStartTime, Date useEndTime) {
Map<String, String> map = new HashMap<>();
map.put("method", "taobao.tbk.dg.vegas.tlj.create");
map.put("adzone_id", TaoBaoConstant.TAOBAO_RELATION_PID_DEFAULT.split("_")[3]);
@@ -1959,16 +1959,25 @@
map.put("security_switch", "false");
map.put("per_face", perface.toString());
map.put("send_start_time", TimeUtil.getGernalTime(sendStartTime.getTime(), "yyyy-MM-dd HH:mm:ss"));
- map.put("send_end_time", TimeUtil.getGernalTime(sendEndTime.getTime(), "yyyy-MM-dd HH:mm:ss"));
- map.put("use_end_time", useDayLimit + "");
- map.put("use_end_time_mode", "1");
- map.put("use_start_time", TimeUtil.getGernalTime(useStartTime.getTime(), "yyyy-MM-dd HH:mm:ss"));
+
+
+ if(sendEndTime != null)
+ map.put("send_end_time", TimeUtil.getGernalTime(sendEndTime.getTime(), "yyyy-MM-dd HH:mm:ss"));
+
+ if(useEndTime != null) {
+ map.put("use_end_time", TimeUtil.getGernalTime(useEndTime.getTime(), "yyyy-MM-dd"));
+ map.put("use_end_time_mode", "2");
+ }
+
+ if(useStartTime != null)
+ map.put("use_start_time", TimeUtil.getGernalTime(useStartTime.getTime(), "yyyy-MM-dd"));
TaoKeAppInfo app = new TaoKeAppInfo();
app.setAppKey(TaoBaoConstant.TAOBAO_AUTH_APPKEY);
app.setAppSecret(TaoBaoConstant.TAOBAO_AUTH_APPSECRET);
try {
- JSONObject json = TaoKeBaseUtil.baseRequest(map, app);
+ String result = TaoKeBaseUtil.baseRequestForThreeTimes(map, app);
+ JSONObject json = JSONObject.fromObject(result);
System.out.println(json);
JSONObject root = json.optJSONObject("tbk_dg_vegas_tlj_create_response");
if (root != null && root.optJSONObject("result") != null) {
@@ -1980,28 +1989,58 @@
return dto;
}
}
- } catch (TaoKeApiException e) {
- e.printStackTrace();
+ } catch (Exception e) {
+ LogHelper.errorDetailInfo(e);
}
return null;
}
- // lCj1Alo8b9L4Ed6yJLq6iqJ7%2BkHL3AEW
- public static void getTaoLiJinEffective() {
+ // 娣樼ぜ閲戞姤鍛�
+ public static UserTaoLiJinReport getTaoLiJinEffective(String rightsId) {
Map<String, String> map = new HashMap<>();
map.put("method", "taobao.tbk.dg.vegas.tlj.instance.report");
- map.put("rights_id", "ZrIIvF/nd7SlL5Bg59eTK6J7+kHL3AEW");
+ map.put("rights_id", rightsId);
TaoKeAppInfo app = new TaoKeAppInfo();
app.setAppKey(TaoBaoConstant.TAOBAO_AUTH_APPKEY);
app.setAppSecret(TaoBaoConstant.TAOBAO_AUTH_APPSECRET);
-
- String json = TaoKeBaseUtil.baseRequestForThreeTimes(map, app);
- System.out.println(json);
+
+ try {
+ String result = TaoKeBaseUtil.baseRequestForThreeTimes(map, app);
+ JSONObject json = JSONObject.fromObject(result);
+ System.out.println(json);
+
+ JSONObject root = json.optJSONObject("tbk_dg_vegas_tlj_instance_report_response");
+
+
+ if (root != null && root.optJSONObject("result") != null) {
+ if (root.optJSONObject("result").optBoolean("success")) {
+ JSONObject modelJson = root.optJSONObject("result").optJSONObject("model");
+
+ if (modelJson != null && modelJson.size() > 0) {
+ UserTaoLiJinReport report = new UserTaoLiJinReport();
+ report.setId(rightsId);
+ report.setUnfreezeAmount(new BigDecimal(modelJson.optString("unfreeze_amount")));
+ report.setUnfreezeNum(modelJson.optInt("unfreeze_num"));
+ report.setRefundAmount(new BigDecimal(modelJson.optString("refund_amount")));
+ report.setRefundNum(modelJson.optInt("refund_num"));
+ report.setAlipayAmount(new BigDecimal(modelJson.optString("alipay_amount")));
+ report.setUseAmount(new BigDecimal(modelJson.optString("use_amount")));
+ report.setUseNum(modelJson.optInt("use_num"));
+ report.setWinAmount(new BigDecimal(modelJson.optString("win_amount")));
+ report.setWinNum(modelJson.optInt("win_num"));
+ report.setPreCommissionAmount(new BigDecimal(modelJson.optString("pre_commission_amount")));
+ return report;
+ }
+ }
+ }
+ } catch (Exception e) {
+ LogHelper.errorDetailInfo(e);
+ }
+ return null;
}
-
}
class QuanInfo {
--
Gitblit v1.8.0