From 3824cbcaec6e6c67418d5280a53e9c2fedeef6f9 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 11 七月 2019 16:34:13 +0800
Subject: [PATCH] 订单bug，分享爆款自购修改
---
fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoBaoOrderUtil.java | 52 ++++++++--------------------------------------------
1 files changed, 8 insertions(+), 44 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 56f34d3..199b249 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
@@ -11,17 +11,14 @@
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
-import javax.annotation.PostConstruct;
-import javax.annotation.Resource;
-
import org.apache.commons.httpclient.HttpClient;
import org.apache.commons.httpclient.HttpException;
import org.apache.commons.httpclient.methods.GetMethod;
import org.springframework.stereotype.Component;
import org.yeshi.utils.HttpUtil;
+import com.yeshi.fanli.dto.order.OrderItem;
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.TaoBaoOrder;
@@ -29,12 +26,6 @@
import com.yeshi.fanli.entity.taobao.TaoBaoWeiQuanOrder;
import com.yeshi.fanli.exception.TaoBaoOrderException;
import com.yeshi.fanli.log.LogHelper;
-import com.yeshi.fanli.service.inter.config.ConfigService;
-import com.yeshi.fanli.service.inter.hongbao.HongBaoManageService;
-import com.yeshi.fanli.service.inter.hongbao.HongBaoService;
-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;
@@ -47,40 +38,10 @@
@Component
public class TaoBaoOrderUtil {
- private final static String CACHENAME = "tbCookie";
-
private static final String ORDERFAILURE = "璁㈠崟澶辨晥";
private static final String ORDERPAYMENT = "璁㈠崟浠樻";
private static final String ORDERSETTLEMENT = "璁㈠崟缁撶畻";
private static final String ORDERSUCCESS = "璁㈠崟鎴愬姛";
-
- @Resource
- private OrderService orderService;
- @Resource
- private HongBaoService hongBaoService;
- @Resource
- private ConfigService configService;
-
- @Resource
- private OrderItemServcie orderItemServcie;
-
- @Resource
- private HongBaoManageService hongBaoManageService;
-
- @Resource
- private ThreeSaleSerivce threeSaleSerivce;
-
- private static TaoBaoOrderUtil taoBaoOrderUtil;
-
- @PostConstruct
- public void init() {
- taoBaoOrderUtil = this;
- taoBaoOrderUtil.orderService = this.orderService;
- taoBaoOrderUtil.hongBaoService = this.hongBaoService;
- taoBaoOrderUtil.configService = this.configService;
- taoBaoOrderUtil.hongBaoManageService = this.hongBaoManageService;
- taoBaoOrderUtil.orderItemServcie = this.orderItemServcie;
- }
/**
* 鑾峰彇娣樺疂鑱旂洘鐨凜ookie
@@ -595,7 +556,6 @@
}
-
/**
* 瑙ｆ瀽缁存潈璁㈠崟
*
@@ -750,7 +710,10 @@
CommonOrder commonOrder = new CommonOrder();
commonOrder.setCount(taoBaoOrder.getCount());
commonOrder.setCreateTime(new Date());
- commonOrder.seteIncome(taoBaoOrder.geteIncome());
+ 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());
@@ -758,8 +721,8 @@
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.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())) {
@@ -776,6 +739,7 @@
commonOrder.setThirdCreateTime(
new Date(TimeUtil.convertToTimeTemp(taoBaoOrder.getCreateTime(), "yyyy-MM-dd HH:mm:ss")));
commonOrder.setUpdateTime(new Date());
+ commonOrder.setTradeId(taoBaoOrder.getTradeId());
return commonOrder;
--
Gitblit v1.8.0