From 31f6921d1ac3b43e9837baba5d079255c6b9f221 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 02 一月 2019 10:10:24 +0800
Subject: [PATCH] 淘宝商品详情请求增加代理IP
---
fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java | 98 ++++++++++++++++++++++++++++++++++---------------
1 files changed, 68 insertions(+), 30 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java
index 4ce1d0a..6e2da6e 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java
@@ -126,11 +126,12 @@
}
@Override
- public Map<String, BigDecimal> countByUidAndOrderState(Long uid, Integer type, String startTime,String endTime) {
- return commonOrderMapper.countByUidAndOrderState(uid, type, startTime, endTime);
+ public Map<String, BigDecimal> countByUidAndOrderState(Long uid, Integer type, String startTime,
+ String endTime, Integer day) {
+ return commonOrderMapper.countByUidAndOrderState(uid, type, startTime, endTime, day);
}
- public void listDataFactory (List<CommonOrderVO> listOrder, List<CommonOrderVO> listGoods ) {
+public void listDataFactory (List<CommonOrderVO> listOrder, List<CommonOrderVO> listGoods ) {
/* 缁勫悎鍟嗗搧淇℃伅 */
for (CommonOrderVO commonOrder: listGoods) {
@@ -159,10 +160,34 @@
e.printStackTrace();
}
- commonGoodsVO.setActualCount(commonOrder.getTotalCount());
- commonGoodsVO.setActualPay(commonOrder.getTotalSettlement());
+ Integer hongBaoType = order.getHongBaoType();
+ // 閭�璇疯鍗曚俊鎭繚鎶�
+ if (HongBaoV2.TYPE_YAOQING == hongBaoType || HongBaoV2.TYPE_YIJI == hongBaoType
+ || HongBaoV2.TYPE_ERJI == hongBaoType) {
+ Map<String, String> titleMap = new HashMap<String, String>();
+ titleMap.put("content", "涓轰繚闅滅敤鎴烽殣绉侊紝鍟嗗搧淇℃伅宸查殣钘�!");
+ titleMap.put("fontColor", "#888888");
+ titleMap.put("bottomColor", "#E9E9E9");
+ commonGoodsVO.setTitle(null);
+ commonGoodsVO.setGoodsTitle(titleMap);
+ }
+
+
+ commonGoodsVO.setActualCount(commonOrder.getTotalCount() + "浠�");
+ String settlement = commonOrder.getTotalSettlement().setScale(2, BigDecimal.ROUND_DOWN).toString();
+ commonGoodsVO.setActualPay("瀹炰粯娆撅細楼" + settlement);
listOrderGoods.add(commonGoodsVO);
+
+ Integer orderType = commonOrder.getOrderType();
+ if (orderType == null) {
+ String shopType = commonGoodsVO.getShopType();
+ if (CommonOrderGoodsVO.TYPE_TAOBAO.equalsIgnoreCase(shopType)) {
+ commonOrder.setOrderType(1);
+ } else if (CommonOrderGoodsVO.TYPE_TMALL.equalsIgnoreCase(shopType)) {
+ commonOrder.setOrderType(2);
+ }
+ }
break;
}
@@ -180,17 +205,19 @@
Date thirdCreateTime = order.getThirdCreateTime();
if (thirdCreateTime != null) {
- order.setDownTime(format.format(thirdCreateTime));
+ order.setDownTime("涓嬪崟鏃堕棿锛�" + format.format(thirdCreateTime));
}
Date settleTime = order.getSettleTime();
if (settleTime != null) {
- order.setReceiveTime(format.format(settleTime));
+ order.setReceiveTime("鏀惰揣鏃堕棿锛�" + format.format(settleTime));
}
/* 璁㈠崟鐘舵�� 杞崲澶勭悊*/
String orderStateContent = "";
Map<String, String> orderStateMap = new HashMap<String, String>();
+
+ Integer hongBaoState = order.getHongBaoState();
Integer orderState = order.getState();
if (CommonOrder.STATE_FK == orderState ) {
@@ -198,7 +225,7 @@
} else if (CommonOrder.STATE_JS == orderState) {
orderStateContent = "宸叉敹璐�";
} else if (CommonOrder.STATE_SX == orderState) {
- orderStateContent = "宸查��娆�";
+ orderStateContent = "鏈粯娆�/宸查��娆�";
} else if (CommonOrder.STATE_WQ == orderState) {
orderStateContent = "宸茬淮鏉�";
@@ -206,7 +233,8 @@
List<TaoBaoWeiQuanOrder> listWQ =
taoBaoWeiQuanOrderMapper.selectListByOrderIdAndState(order.getOrderNo(), "缁存潈鎴愬姛");
- boolean isPart = true;
+ boolean isPart = false;// 榛樿澶辨晥
+
if (listWQ != null && listWQ.size() > 0) {
BigDecimal fanTotalMoney = new BigDecimal(0);
for (TaoBaoWeiQuanOrder weiQuanOrder: listWQ) {
@@ -216,15 +244,15 @@
}
}
- if (fanTotalMoney.compareTo(order.getHongBao()) >= 0) {
- isPart = false;
+ if (fanTotalMoney.compareTo(order.getHongBao()) < 0) {
+ isPart = true;
}
}
if (isPart) {
- order.setHongBaoState(HongBaoV2.STATE_BUFENSHIXIAO); // 閮ㄥ垎澶辨晥
+ hongBaoState = HongBaoV2.STATE_BUFENSHIXIAO; // 閮ㄥ垎澶辨晥
} else {
- order.setHongBaoState(HongBaoV2.STATE_SHIXIAO); // 鍏ㄩ儴澶辨晥
+ hongBaoState = HongBaoV2.STATE_SHIXIAO; // 鍏ㄩ儴澶辨晥
}
}
orderStateMap.put("content", orderStateContent);
@@ -237,42 +265,42 @@
if (HongBaoV2.TYPE_ZIGOU == hongBaoType || 2 == hongBaoType) {
// 鑷喘
hongbaoInfo = "杩斿埄";
- order.setHongBaoType(1);
+ order.setOrderOrigin("1");
order.setHongBaoTypePic(CommonOrder.TYPE_FANLI);
} else if (HongBaoV2.TYPE_SHARE_GOODS == hongBaoType || HongBaoV2.TYPE_SHARE_YIJI == hongBaoType
|| HongBaoV2.TYPE_SHARE_ERJI == hongBaoType) {
// 鍒嗕韩
hongbaoInfo = "濂栭噾";
- order.setHongBaoType(2);
+ order.setOrderOrigin("2");
order.setHongBaoTypePic(CommonOrder.TYPE_SHARE);
} else if (HongBaoV2.TYPE_YAOQING == hongBaoType || HongBaoV2.TYPE_YIJI == hongBaoType
|| HongBaoV2.TYPE_ERJI == hongBaoType) {
// 閭�璇�
hongbaoInfo = "濂栭噾";
- order.setHongBaoType(3);
+ order.setOrderOrigin("3");
order.setHongBaoTypePic(CommonOrder.TYPE_INVITE);
}
- String hongBaoDate = "";
+ String hongBaoDate = null;
String hongBaoState_Str = "";
String hongbaoInfoFontColor = "#E5005C";
-
/* 绾㈠寘鐘舵�� 杞崲 */
String stateContent = "";
+ String stateFontColor = "#E5005C";
Integer orderHongBaoState = null;
- Integer hongBaoState = order.getHongBaoState();
+
if (HongBaoV2.STATE_KELINGQU == hongBaoState || HongBaoV2.STATE_BUKELINGQU == hongBaoState) {
orderHongBaoState = 1;
stateContent = "鏈埌璐�";
hongBaoState_Str = "棰勪及";
- hongbaoInfoFontColor = "#888888";
Date preAccountTime = order.getPreAccountTime();
if (preAccountTime != null) {
- hongBaoDate = "棰勮鍒拌处鏃堕棿" + formatday.format(preAccountTime);
+ hongBaoDate = "棰勮鍒拌处鏃堕棿锛�" + formatday.format(preAccountTime);
}
+
} else if (HongBaoV2.STATE_YILINGQU == hongBaoState) {
orderHongBaoState = 3;
@@ -280,7 +308,7 @@
Date accountTime = order.getAccountTime();
if (accountTime != null) {
- hongBaoDate = "鍒拌处鏃堕棿" + formatday.format(accountTime);
+ hongBaoDate = "鍒拌处鏃堕棿锛�" + formatday.format(accountTime);
}
} else if (HongBaoV2.STATE_BUFENSHIXIAO == hongBaoState) {
@@ -288,30 +316,40 @@
orderHongBaoState = 3;
Date accountTime = order.getAccountTime();
if (accountTime != null) {
- hongBaoDate = "鍒拌处鏃堕棿" + formatday.format(accountTime);
+ hongBaoDate = "鍒拌处鏃堕棿锛�" + formatday.format(accountTime);
}
} else if (HongBaoV2.STATE_SHIXIAO == hongBaoState) {
orderHongBaoState = 4;
stateContent = "宸插け鏁�";
- hongBaoDate = " ";
+ hongbaoInfoFontColor = "#888888";
}
order.setHongBaoState(orderHongBaoState);
- order.setAccountState(stateContent);
order.setHongBaoDate(hongBaoDate);
- if ("濂栭噾".equals(hongbaoInfo) && hongBaoState_Str.trim().length() > 0) {
- hongbaoInfo = hongBaoState_Str + hongbaoInfo;
- }
+ Map<String, String> stateMap = new HashMap<String, String>();
+ stateMap.put("content", stateContent);
+ stateMap.put("fontColor", stateFontColor);
+ order.setAccountState(stateMap);
+
+ hongbaoInfo = hongBaoState_Str + hongbaoInfo;
+
BigDecimal hongBao = order.getHongBao();
if (hongBao == null) {
hongBao = new BigDecimal(0);
}
Map<String, String> hongBaoMap = new HashMap<String, String>();
- hongBaoMap.put("content", hongbaoInfo + " 楼" + hongBao);
+ hongBaoMap.put("content", hongbaoInfo + " 楼" + hongBao.setScale(2, BigDecimal.ROUND_DOWN).toString());
hongBaoMap.put("fontColor", hongbaoInfoFontColor);
order.setHongBaoInfo(hongBaoMap);
}
+ }
+
+ @Override
+ public List<CommonOrder> listBySourceTypeAndOrderId(int sourceType, String orderId) {
- }
+
+
+ return null;
+ }
}
--
Gitblit v1.8.0