From 0ec22dcf4fd9c4496e6f681e7fab89f56c6e4e8a Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期四, 02 四月 2020 14:45:20 +0800
Subject: [PATCH] vip 消息
---
fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java | 55 ++++++++++++++++++++++++++++++++++---------------------
1 files changed, 34 insertions(+), 21 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 b4e7db2..515a8bc 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
@@ -920,9 +920,18 @@
for (TaoBaoOrder taoBaoOrder : taoBaoOrders) {
CommonOrder newCommonOrder = CommonOrderFactory.create(taoBaoOrder);
CommonOrderGoods cog = new CommonOrderGoods();
- cog.setGoodsId(taoBaoOrder.getAuctionId() + "");
- cog.setGoodsType(Constant.SOURCE_TYPE_TAOBAO);
- newCommonOrder.setCommonOrderGoods(cog);
+
+ if ("楗夸簡涔�".equalsIgnoreCase(taoBaoOrder.getOrderType())) {
+ cog.setGoodsId(taoBaoOrder.getTradeId() + "");
+ cog.setGoodsType(Constant.SOURCE_TYPE_ELME);
+ cog.setPicture("http://img.flqapp.com/resource/goods/elme_picture_demo.png");
+ cog.setTitle(taoBaoOrder.getTitle());
+ newCommonOrder.setCommonOrderGoods(cog);
+ } else {
+ cog.setGoodsId(taoBaoOrder.getAuctionId() + "");
+ cog.setGoodsType(Constant.SOURCE_TYPE_TAOBAO);
+ newCommonOrder.setCommonOrderGoods(cog);
+ }
newCommonOrder.setStateWholeOrder(wholeOrderState);
// 璁㈠崟鍟嗗搧鎻掑叆
List<CommonOrderGoods> commonGoodsList = commonOrderGoodsMapper.listByGoodsIdAndGoodsType(cog.getGoodsId(),
@@ -930,22 +939,25 @@
if (commonGoodsList.size() <= 0)// 涓嶅瓨鍦ㄥ氨鎻掑叆鍟嗗搧
{
TaoBaoGoodsBrief taoBaoGoods = null;
- try {
- taoBaoGoods = TaoKeApiUtil.getSimpleGoodsInfo(taoBaoOrder.getAuctionId());
- LogManager.getLogger(LogType.taobaoGoods).info(String.format("璁㈠崟鍟嗗搧鍒嗙被:%s#%s#%s",
- taoBaoGoods.getAuctionId(), taoBaoGoods.getRootCategoryName(), taoBaoGoods.getLeafName()));
- } catch (TaobaoGoodsDownException e) {
- e.printStackTrace();
- LogHelper.errorDetailInfo(e, "AUCTIONID:" + taoBaoOrder.getAuctionId(), "");
+ if (cog.getGoodsType() != Constant.SOURCE_TYPE_ELME) {
try {
- taoBaoGoods = TaoBaoUtil.getSimpleGoodsBrief(taoBaoOrder.getAuctionId());
- // 璁板綍鍟嗗搧鍒嗙被
+ taoBaoGoods = TaoKeApiUtil.getSimpleGoodsInfo(taoBaoOrder.getAuctionId());
+ LogManager.getLogger(LogType.taobaoGoods)
+ .info(String.format("璁㈠崟鍟嗗搧鍒嗙被:%s#%s#%s", taoBaoGoods.getAuctionId(),
+ taoBaoGoods.getRootCategoryName(), taoBaoGoods.getLeafName()));
+ } catch (TaobaoGoodsDownException e) {
+ e.printStackTrace();
+ LogHelper.errorDetailInfo(e, "AUCTIONID:" + taoBaoOrder.getAuctionId(), "");
+ try {
+ taoBaoGoods = TaoBaoUtil.getSimpleGoodsBrief(taoBaoOrder.getAuctionId());
+ // 璁板綍鍟嗗搧鍒嗙被
- } catch (Exception e1) {
- CommonGoods commonGoods = commonGoodsService.getCommonGoodsByGoodsIdAndGoodsType(
- taoBaoOrder.getAuctionId(), Constant.SOURCE_TYPE_TAOBAO);
- if (commonGoods != null)
- taoBaoGoods = TaoBaoUtil.convert(commonGoods);
+ } catch (Exception e1) {
+ CommonGoods commonGoods = commonGoodsService.getCommonGoodsByGoodsIdAndGoodsType(
+ taoBaoOrder.getAuctionId(), Constant.SOURCE_TYPE_TAOBAO);
+ if (commonGoods != null)
+ taoBaoGoods = TaoBaoUtil.convert(commonGoods);
+ }
}
}
if (taoBaoGoods != null) {
@@ -958,6 +970,7 @@
newCommonOrder.setUserInfo(new UserInfo(uid));
commonOrderList.add(addCommonOrder(newCommonOrder));
}
+ addConfirmMQMsg(commonOrderList);
return commonOrderList;
}
@@ -1119,6 +1132,7 @@
newCommonOrder.setUserInfo(new UserInfo(uid));
commonOrderList.add(addCommonOrder(newCommonOrder));
}
+ addConfirmMQMsg(commonOrderList);
return commonOrderList;
}
@@ -1953,15 +1967,14 @@
}
- // 2.1鏄剧ず杩斿埄璇存槑杩炴帴>
+ // 2.1鏄剧ず杩斿埄璇存槑杩炴帴> 鏈け鏁�-鑷喘-鍒嗕韩
if (VersionUtil.greaterThan_2_1(acceptData.getPlatform(), acceptData.getVersion())) {
- if (CommonOrder.STATE_SX != orderState && thirdCreateTime.getTime() > TimeUtil.convertDateToTemp(Constant.ORDER_SHOW_BRACE_TIME)) {
+ if (CommonOrder.STATE_SX != orderState && thirdCreateTime.getTime() > TimeUtil.convertDateToTemp(Constant.ORDER_SHOW_BRACE_TIME)
+ && ((HongBaoV2.TYPE_ZIGOU == hongBaoType || 2 == hongBaoType) || HongBaoV2.TYPE_SHARE_GOODS == hongBaoType) ) {
String rebateLink = configService.get(ConfigKeyEnum.orderRebateDescLink.getKey());
order.setRebateLink(rebateLink + "?orderNo=" + orderNo +"&sourceType=" + sourceType);
}
}
-
-
BigDecimal hongBao = order.getHongBao();
if (hongBao == null) {
--
Gitblit v1.8.0