From 88b54772dbcf5ecab1e2316e4e4626ac901b8908 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期二, 22 一月 2019 15:58:24 +0800
Subject: [PATCH] 邀请码添加返回状态
---
fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoBaoOrderUtil.java | 83 ++++++++++++++++++++++++++++++++++-------
1 files changed, 69 insertions(+), 14 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoBaoOrderUtil.java b/fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoBaoOrderUtil.java
index 894a4bd..a1c6dda 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoBaoOrderUtil.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoBaoOrderUtil.java
@@ -21,6 +21,7 @@
import com.yeshi.fanli.entity.bus.user.Order;
import com.yeshi.fanli.entity.bus.user.OrderItem;
import com.yeshi.fanli.entity.bus.user.UserInfo;
+import com.yeshi.fanli.entity.order.CommonOrder;
import com.yeshi.fanli.entity.taobao.PidOrder;
import com.yeshi.fanli.entity.taobao.TaoBaoOrder;
import com.yeshi.fanli.entity.taobao.TaoBaoUnionConfig;
@@ -33,6 +34,7 @@
import com.yeshi.fanli.service.inter.hongbao.ThreeSaleSerivce;
import com.yeshi.fanli.service.inter.order.OrderItemServcie;
import com.yeshi.fanli.service.inter.order.OrderService;
+import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.MoneyBigDecimalUtil;
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.TimeUtil;
@@ -357,7 +359,7 @@
String startTimeStr = TimeUtil.getGernalTime(startTime, "yyyy-MM-dd");
String endTimeStr = TimeUtil.getGernalTime(endTime, "yyyy-MM-dd");
String url = String.format(
- "http://pub.alimama.com/report/getNewTbkRefundPaymentDetails.json?spm=a219t.7664554.1998457203.105.49cc35d9eDSunp&refundType=1&searchType=3&DownloadID=DOWNLOAD_EXPORT_CPSPAYMENT_REFUND_OVERVIEW&startTime=%s&endTime=%s",
+ "http://pub.alimama.com/report/getNewTbkRefundPaymentDetails.json?spm=a219t.7664554.1998457203.105.49cc35d9eDSunp&refundType=1&searchType=1&DownloadID=DOWNLOAD_EXPORT_CPSPAYMENT_REFUND_OVERVIEW&startTime=%s&endTime=%s",
startTimeStr, endTimeStr);
Map<String, String> headers = new HashMap<>();
headers.put("User-Agent",
@@ -372,13 +374,13 @@
list.addAll(getThirdWeiQuanOrders(cookies, startTime, endTime));
- if (list != null)
- for (int i = 0; i < list.size(); i++) {
- if (!list.get(i).getState().equalsIgnoreCase("缁存潈鎴愬姛")) {
- list.remove(i);
- i--;
- }
- }
+ // if (list != null)
+ // for (int i = 0; i < list.size(); i++) {
+ // if (!list.get(i).getState().equalsIgnoreCase("缁存潈鎴愬姛")) {
+ // list.remove(i);
+ // i--;
+ // }
+ // }
return list;
}
@@ -646,13 +648,19 @@
orderRecord.setState(content);
break;
case 6://
- orderRecord.setJieSuanTime(content);
+ if (!StringUtil.isNullOrEmpty(content))
+ orderRecord.setJieSuanTime(
+ new Date(TimeUtil.convertToTimeTemp(content, "yyyy-MM-dd HH:mm:ss")));
break;
case 7://
- orderRecord.setWeiQuanTime(content);
+ if (!StringUtil.isNullOrEmpty(content))
+ orderRecord.setWeiQuanTime(
+ new Date(TimeUtil.convertToTimeTemp(content, "yyyy-MM-dd HH:mm:ss")));
break;
case 8://
- orderRecord.setWeiQuanFinishTime(content);
+ if (!StringUtil.isNullOrEmpty(content))
+ orderRecord.setWeiQuanFinishTime(
+ new Date(TimeUtil.convertToTimeTemp(content, "yyyy-MM-dd HH:mm:ss")));
break;
}
}
@@ -674,8 +682,15 @@
orderItem.setSettlementTime(0L);
String createTime = tbo.getCreateTime();
orderItem.setCreateTime(TimeUtil.convertDateToTemp2(createTime));
- orderItem.setFanMoney(MoneyBigDecimalUtil.mul(rate.divide(BigDecimal.valueOf(100)), tbo.getEstimate()));
- orderItem.setPayMoney(tbo.getPayment());
+ if ("璁㈠崟缁撶畻".equalsIgnoreCase(tbo.getOrderState()))
+ orderItem.setFanMoney(MoneyBigDecimalUtil.mul(rate.divide(BigDecimal.valueOf(100)), tbo.geteIncome()));
+ else
+ orderItem.setFanMoney(MoneyBigDecimalUtil.mul(rate.divide(BigDecimal.valueOf(100)), tbo.getEstimate()));
+ if ("璁㈠崟缁撶畻".equalsIgnoreCase(tbo.getOrderState()))
+ orderItem.setPayMoney(tbo.getSettlement());
+ else
+ orderItem.setPayMoney(tbo.getPayment());
+
orderItem.setOrder(order);
orderItem.setOrderId(tbo.getOrderId());
@@ -787,6 +802,8 @@
for (TaoBaoOrder order : orderList) {
if (map.get(order.getOrderId()) == null)
map.put(order.getOrderId(), new ArrayList<>());
+ // 璁剧疆鎺掑簭鍊硷紝浠�1寮�濮�
+ order.setOrderBy(map.get(order.getOrderId()).size() + 1);
map.get(order.getOrderId()).add(order);
}
return map;
@@ -809,7 +826,10 @@
pidOrder.setOrderType(taoBaoOrder.getOrderType());
pidOrder.setRate(taoBaoOrder.getiRatio());
pidOrder.setPayMoney(taoBaoOrder.getPayment());
- pidOrder.setPreMoney(taoBaoOrder.getEstimate());
+ if ("璁㈠崟缁撶畻".equalsIgnoreCase(taoBaoOrder.getOrderState()))
+ pidOrder.setPreMoney(taoBaoOrder.geteIncome());
+ else
+ pidOrder.setPreMoney(taoBaoOrder.getEstimate());
pidOrder.setFinalMoney(taoBaoOrder.getSettlement());
if (!StringUtil.isNullOrEmpty(taoBaoOrder.getSettlementTime()))
pidOrder.setBalanceTime(new Date(TimeUtil.convertDateToTemp2(taoBaoOrder.getSettlementTime())));
@@ -841,4 +861,39 @@
// TimeUtil.getGernalTime(balanceTime, "HH:mm:ss");
return TimeUtil.convertToTimeTemp(time, "yyyy-M-dd HH:mm:ss");
}
+
+ public static CommonOrder convert(TaoBaoOrder taoBaoOrder) {
+ CommonOrder commonOrder = new CommonOrder();
+ commonOrder.setCount(taoBaoOrder.getCount());
+ commonOrder.setCreateTime(new Date());
+ commonOrder.seteIncome(taoBaoOrder.geteIncome());
+ commonOrder.setEstimate(taoBaoOrder.getEstimate());
+ commonOrder.setOrderNo(taoBaoOrder.getOrderId());
+ commonOrder.setPayment(taoBaoOrder.getPayment());
+ commonOrder.setSettlement(taoBaoOrder.getSettlement());
+ if (!StringUtil.isNullOrEmpty(taoBaoOrder.getSettlementTime()))
+ commonOrder.setSettleTime(
+ new Date(TimeUtil.convertToTimeTemp(taoBaoOrder.getSettlementTime(), "yyyy-MM-dd HH:mm:ss")));
+ commonOrder.setSourcePosition(
+ String.format("mm_%s_%s_%s", "124933865", taoBaoOrder.getSourceMediaId(), taoBaoOrder.getAdPositionId()));
+ commonOrder.setSourceType(Constant.SOURCE_TYPE_TAOBAO);
+ int state = 0;
+ if ("璁㈠崟浠樻".equalsIgnoreCase(taoBaoOrder.getOrderState())) {
+ state = CommonOrder.STATE_FK;
+ } else if ("璁㈠崟鎴愬姛".equalsIgnoreCase(taoBaoOrder.getOrderState())) {
+ state = CommonOrder.STATE_FK;
+ } else if ("璁㈠崟澶辨晥".equalsIgnoreCase(taoBaoOrder.getOrderState())) {
+ state = CommonOrder.STATE_SX;
+ } else if ("璁㈠崟缁撶畻".equalsIgnoreCase(taoBaoOrder.getOrderState())) {
+ state = CommonOrder.STATE_JS;
+ }
+ commonOrder.setOrderBy(taoBaoOrder.getOrderBy());
+ commonOrder.setState(state);
+ commonOrder.setThirdCreateTime(
+ new Date(TimeUtil.convertToTimeTemp(taoBaoOrder.getCreateTime(), "yyyy-MM-dd HH:mm:ss")));
+ commonOrder.setUpdateTime(new Date());
+
+ return commonOrder;
+
+ }
}
--
Gitblit v1.8.0