From 457f4881a89c03984c7b46ed10e8919d3294976c Mon Sep 17 00:00:00 2001 From: admin <weikou2014> Date: 星期一, 08 六月 2020 16:45:29 +0800 Subject: [PATCH] 淘宝好物圈修改 --- fanli/src/main/java/com/yeshi/fanli/util/factory/goods/CommonOrderFactory.java | 86 +++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 86 insertions(+), 0 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 1224e9b..5553bbf 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,11 +6,14 @@ 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.suning.SuningOrderInfo; import com.yeshi.fanli.entity.taobao.TaoBaoOrder; +import com.yeshi.fanli.entity.vipshop.VipShopOrderDetail; import com.yeshi.fanli.util.Constant; import com.yeshi.fanli.util.MoneyBigDecimalUtil; import com.yeshi.fanli.util.StringUtil; import com.yeshi.fanli.util.TimeUtil; +import com.yeshi.fanli.util.taobao.TaoBaoUtil; public class CommonOrderFactory { @@ -68,6 +71,7 @@ commonOrder.setThirdCreateTime(new Date(order.getOrderCreateTime() * 1000)); commonOrder.setUpdateTime(new Date()); commonOrder.setTradeId(order.getOrderId()); + commonOrder.setChildSourceType("鎷煎澶�"); return commonOrder; } @@ -123,6 +127,7 @@ commonOrder.setUpdateTime(new Date()); commonOrder.setTradeId(order.getTradeId()); commonOrder.setEstimate(order.getEstimateFee()); + commonOrder.setChildSourceType("浜笢"); return commonOrder; } @@ -130,11 +135,15 @@ CommonOrder commonOrder = new CommonOrder(); commonOrder.setCount(taoBaoOrder.getCount()); commonOrder.setCreateTime(new Date()); + + // 濡傛灉relationId涓嶄负绌� + 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()); @@ -162,6 +171,83 @@ commonOrder.setTradeId(taoBaoOrder.getTradeId()); commonOrder.setChildSourceType(taoBaoOrder.getOrderType()); + if (!StringUtil.isNullOrEmpty(taoBaoOrder.getRelationId())) { + commonOrder.setEstimate( + TaoBaoUtil.getCanShareMoney(commonOrder.getThirdCreateTime(), commonOrder.getEstimate())); + commonOrder.seteIncome( + TaoBaoUtil.getCanShareMoney(commonOrder.getThirdCreateTime(), commonOrder.geteIncome())); + } + + return commonOrder; + } + + public static CommonOrder create(VipShopOrderDetail order) { + if (order.getOrder() == null) + return null; + CommonOrder commonOrder = new CommonOrder(); + commonOrder.setCount(order.getGoodsCount()); + commonOrder.setCreateTime(new Date()); + if (order.getStatus() == VipShopOrderDetail.STATUS_FINISH) { + commonOrder.seteIncome(order.getCommission()); + commonOrder.setSettlement(order.getCommissionTotalCost()); + commonOrder.setSettleTime(new Date(order.getOrder().getCommissionEnterTime())); + } + commonOrder.setOrderNo(order.getOrderSn() + ""); + commonOrder.setPayment(order.getCommissionTotalCost()); + commonOrder.setSourcePosition(order.getOrder().getChannelTag()); + commonOrder.setSourceType(Constant.SOURCE_TYPE_VIP); + int state = 0; + if (order.getStatus() == VipShopOrderDetail.STATUS_FINISH) + state = CommonOrder.STATE_JS; + else if (order.getStatus() == VipShopOrderDetail.STATUS_INVALID) + state = CommonOrder.STATE_SX; + else if (order.getStatus() == VipShopOrderDetail.STATUS_UNKOWN) + state = CommonOrder.STATE_FK; + + commonOrder.setOrderBy(1); + commonOrder.setState(state); + commonOrder.setThirdCreateTime(new Date(order.getOrder().getOrderTime())); + commonOrder.setUpdateTime(new Date()); + commonOrder.setTradeId(order.getIdentifyCode()); + commonOrder.setEstimate(order.getCommission()); + commonOrder.setChildSourceType("鍞搧浼�"); + return commonOrder; + } + + public static CommonOrder create(SuningOrderInfo order) { + CommonOrder commonOrder = new CommonOrder(); + commonOrder.setCount(Integer.parseInt(order.getSaleNum())); + commonOrder.setCreateTime(new Date()); + if ("纭鏀惰揣".equalsIgnoreCase(order.getOrderLineStatusDesc())) { + commonOrder.seteIncome(new BigDecimal(order.getPrePayCommission())); + commonOrder.setSettlement(new BigDecimal(order.getPayAmount())); + commonOrder.setSettleTime( + new Date(TimeUtil.convertToTimeTemp(order.getOrderLineStatusChangeTime(), "yyyy-MM-dd HH:mm:ss"))); + } + commonOrder.setOrderNo(order.getOrderCode() + ""); + commonOrder.setPayment(new BigDecimal(order.getPayAmount())); + commonOrder.setSourcePosition(order.getPositionId()); + commonOrder.setSourceType(Constant.SOURCE_TYPE_SUNING); + int state = 0; + if ("绛夊緟浠樻".equalsIgnoreCase(order.getOrderLineStatusDesc())) + state = CommonOrder.STATE_FK; + else if ("鏀粯瀹屾垚".equalsIgnoreCase(order.getOrderLineStatusDesc())) + state = CommonOrder.STATE_FK; + else if ("閫�娆�".equalsIgnoreCase(order.getOrderLineStatusDesc())) + state = CommonOrder.STATE_SX; + else if ("璁㈠崟宸插彇娑�".equalsIgnoreCase(order.getOrderLineStatusDesc())) + state = CommonOrder.STATE_SX; + else if ("纭鏀惰揣".equalsIgnoreCase(order.getOrderLineStatusDesc())) + state = CommonOrder.STATE_JS; + + commonOrder.setOrderBy(1); + commonOrder.setState(state); + commonOrder.setThirdCreateTime( + new Date(TimeUtil.convertToTimeTemp(order.getOrderSubmitTime(), "yyyy-MM-dd HH:mm:ss"))); + commonOrder.setUpdateTime(new Date()); + commonOrder.setTradeId(order.getOrderLineNumber()); + commonOrder.setEstimate(new BigDecimal(order.getPrePayCommission())); + commonOrder.setChildSourceType("鑻忓畞"); return commonOrder; } } -- Gitblit v1.8.0