From 24a8d17e007545f7426c48352109aa1a9c6587ee Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 06 五月 2020 12:02:09 +0800
Subject: [PATCH] IOS上线隐藏我的界面的banner与超级会员升级信息
---
fanli/src/main/java/com/yeshi/fanli/util/factory/goods/CommonOrderFactory.java | 72 +++++++++++++++++++++++++++++++++++-
1 files changed, 70 insertions(+), 2 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/util/factory/goods/CommonOrderFactory.java b/fanli/src/main/java/com/yeshi/fanli/util/factory/goods/CommonOrderFactory.java
index 8a69b3c..1224e9b 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/factory/goods/CommonOrderFactory.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/factory/goods/CommonOrderFactory.java
@@ -6,8 +6,11 @@
import com.yeshi.fanli.entity.jd.JDOrderItem;
import com.yeshi.fanli.entity.order.CommonOrder;
import com.yeshi.fanli.entity.pdd.PDDOrder;
+import com.yeshi.fanli.entity.taobao.TaoBaoOrder;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.MoneyBigDecimalUtil;
+import com.yeshi.fanli.util.StringUtil;
+import com.yeshi.fanli.util.TimeUtil;
public class CommonOrderFactory {
@@ -15,16 +18,23 @@
CommonOrder commonOrder = new CommonOrder();
commonOrder.setCount(order.getGoodsQuantity());
commonOrder.setCreateTime(new Date());
- if (order.getOrderStatus() == 3) {
+ if (order.getOrderStatus() == 3) {// 瀹℃牳閫氳繃
commonOrder.seteIncome(
MoneyBigDecimalUtil.div(new BigDecimal(order.getPromotionAmount()), new BigDecimal(100)));
commonOrder.setSettlement(
MoneyBigDecimalUtil.div(new BigDecimal(order.getOrderAmount()), new BigDecimal(100)));// 缁撶畻閲戦
commonOrder.setSettleTime(new Date(order.getOrderVerifyTime() * 1000));
+ } else if (order.getOrderStatus() == 2) {// 纭鏀惰揣褰掍负瀹℃牳閫氳繃
+ commonOrder.seteIncome(
+ MoneyBigDecimalUtil.div(new BigDecimal(order.getPromotionAmount()), new BigDecimal(100)));
+ commonOrder.setSettlement(
+ MoneyBigDecimalUtil.div(new BigDecimal(order.getOrderAmount()), new BigDecimal(100)));// 缁撶畻閲戦
+ commonOrder.setSettleTime(new Date(order.getOrderReceiveTime() * 1000));
} else {
commonOrder.seteIncome(new BigDecimal(0));
commonOrder.setSettlement(new BigDecimal(0));
}
+
commonOrder
.setEstimate(MoneyBigDecimalUtil.div(new BigDecimal(order.getPromotionAmount()), new BigDecimal(100)));
commonOrder.setOrderNo(order.getOrderSn());
@@ -39,7 +49,7 @@
state = CommonOrder.STATE_FK;
} else if (1 == order.getOrderStatus()) {
state = CommonOrder.STATE_FK;
- } else if (2 == order.getOrderStatus()) {//纭鏀惰揣
+ } else if (2 == order.getOrderStatus()) {// 纭鏀惰揣
state = CommonOrder.STATE_JS;
} else if (3 == order.getOrderStatus()) {
state = CommonOrder.STATE_FK;
@@ -82,6 +92,26 @@
int state = 0;
if (order.getValidCode() < 16) {
state = CommonOrder.STATE_SX;
+ String stateDesc = null;
+ if (order.getValidCode() == 4)
+ stateDesc = "浜笢甯富璁㈠崟";
+ else if (order.getValidCode() == 5)
+ stateDesc = "璐﹀彿寮傚父";
+ else if (order.getValidCode() == 6)
+ stateDesc = "璧犲搧绫荤洰";
+ else if (order.getValidCode() == 7)
+ stateDesc = "鏍″洯璁㈠崟";
+ else if (order.getValidCode() == 8)
+ stateDesc = "浼佷笟璁㈠崟";
+ else if (order.getValidCode() == 9)
+ stateDesc = "鍥㈣喘璁㈠崟";
+ else if (order.getValidCode() == 10)
+ stateDesc = "涓撶敤鍙戠エ";
+ else if (order.getValidCode() == 11)
+ stateDesc = "涔℃潙鎺ㄥ箍鍛�";
+ else if (order.getValidCode() == 13)
+ stateDesc = "杩濊璁㈠崟";
+ commonOrder.setStateDesc(stateDesc);
} else if (order.getValidCode() == 16) {
state = CommonOrder.STATE_FK;
} else if (order.getValidCode() == 17) {
@@ -96,4 +126,42 @@
return commonOrder;
}
+ public static CommonOrder create(TaoBaoOrder taoBaoOrder) {
+ CommonOrder commonOrder = new CommonOrder();
+ commonOrder.setCount(taoBaoOrder.getCount());
+ commonOrder.setCreateTime(new Date());
+ if (taoBaoOrder.geteIncome() != null && taoBaoOrder.getSubsidy() != null)
+ commonOrder.seteIncome(taoBaoOrder.geteIncome().add(taoBaoOrder.getSubsidy()));
+ else
+ 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());
+ commonOrder.setTradeId(taoBaoOrder.getTradeId());
+ commonOrder.setChildSourceType(taoBaoOrder.getOrderType());
+
+ return commonOrder;
+ }
}
--
Gitblit v1.8.0