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 | 39 +++++++++++++++++++++++++++++++++++++++
1 files changed, 39 insertions(+), 0 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 f67466c..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;
@@ -800,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;
@@ -857,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