From bd331a582851cffcce54316e677e23760de4f384 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期一, 24 六月 2019 11:36:49 +0800
Subject: [PATCH] 冲突文件
---
fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java | 280 +++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 209 insertions(+), 71 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 b2a1d45..208c811 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
@@ -19,13 +19,18 @@
import com.yeshi.fanli.dao.mybatis.order.CommonOrderMapper;
import com.yeshi.fanli.dao.mybatis.order.CommonOrderTradeIdMapMapper;
import com.yeshi.fanli.dao.mybatis.taobao.TaoBaoWeiQuanOrderMapper;
+import com.yeshi.fanli.dto.pdd.PDDGoodsDetail;
import com.yeshi.fanli.entity.bus.user.HongBaoV2;
import com.yeshi.fanli.entity.bus.user.UserInfo;
import com.yeshi.fanli.entity.bus.user.UserSystemCouponRecord;
import com.yeshi.fanli.entity.goods.CommonGoods;
+import com.yeshi.fanli.entity.jd.JDGoods;
+import com.yeshi.fanli.entity.jd.JDOrder;
+import com.yeshi.fanli.entity.jd.JDOrderItem;
import com.yeshi.fanli.entity.order.CommonOrder;
import com.yeshi.fanli.entity.order.CommonOrderGoods;
import com.yeshi.fanli.entity.order.CommonOrderTradeIdMap;
+import com.yeshi.fanli.entity.pdd.PDDOrder;
import com.yeshi.fanli.entity.system.SystemCoupon.CouponTypeEnum;
import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
import com.yeshi.fanli.entity.taobao.TaoBaoOrder;
@@ -45,6 +50,9 @@
import com.yeshi.fanli.util.MoneyBigDecimalUtil;
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.factory.CommonOrderGoodsFactory;
+import com.yeshi.fanli.util.factory.goods.CommonOrderFactory;
+import com.yeshi.fanli.util.jd.JDApiUtil;
+import com.yeshi.fanli.util.pinduoduo.PinDuoDuoApiUtil;
import com.yeshi.fanli.util.taobao.TaoBaoOrderUtil;
import com.yeshi.fanli.util.taobao.TaoBaoUtil;
import com.yeshi.fanli.util.taobao.TaoKeApiUtil;
@@ -589,84 +597,213 @@
wholeOrderState = CommonOrder.STATE_WHOLE_ORDER_BUFENYOUXIAO;
for (TaoBaoOrder taoBaoOrder : taoBaoOrders) {
- CommonOrder commonOrder = commonOrderMapper.selectByOrderNoAndOrderTypeAndOrderBy(taoBaoOrder.getOrderId(),
- Constant.SOURCE_TYPE_TAOBAO, taoBaoOrder.getOrderBy());
- if (commonOrder == null)// 鏂板
+ CommonOrder newCommonOrder = TaoBaoOrderUtil.convert(taoBaoOrder);
+ CommonOrderGoods cog = new CommonOrderGoods();
+ cog.setGoodsId(taoBaoOrder.getAuctionId() + "");
+ cog.setGoodsType(Constant.SOURCE_TYPE_TAOBAO);
+ newCommonOrder.setCommonOrderGoods(cog);
+ newCommonOrder.setStateWholeOrder(wholeOrderState);
+ // 璁㈠崟鍟嗗搧鎻掑叆
+ List<CommonOrderGoods> commonGoodsList = commonOrderGoodsMapper.listByGoodsIdAndGoodsType(cog.getGoodsId(),
+ cog.getGoodsType());
+ if (commonGoodsList.size() <= 0)// 涓嶅瓨鍦ㄥ氨鎻掑叆鍟嗗搧
{
- commonOrder = TaoBaoOrderUtil.convert(taoBaoOrder);
- CommonOrderGoods goods = new CommonOrderGoods();
- goods.setGoodsId(taoBaoOrder.getAuctionId() + "");
- goods.setGoodsType(Constant.SOURCE_TYPE_TAOBAO);
-
- // 鍟嗗搧鏄惁宸茬粡鎻掑叆
- List<CommonOrderGoods> commonGoodsList = commonOrderGoodsMapper
- .listByGoodsIdAndGoodsType(goods.getGoodsId(), goods.getGoodsType());
- if (commonGoodsList.size() <= 0)// 涓嶅瓨鍦ㄥ氨鎻掑叆鍟嗗搧
- {
- TaoBaoGoodsBrief taoBaoGoods = null;
+ TaoBaoGoodsBrief taoBaoGoods = null;
+ try {
+ taoBaoGoods = TaoKeApiUtil.getSimpleGoodsInfo(taoBaoOrder.getAuctionId());
+ } catch (TaobaoGoodsDownException e) {
+ e.printStackTrace();
+ LogHelper.errorDetailInfo(e, "AUCTIONID:" + taoBaoOrder.getAuctionId(), "");
try {
- taoBaoGoods = TaoKeApiUtil.getSimpleGoodsInfo(taoBaoOrder.getAuctionId());
- } 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);
- }
+ 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);
}
- if (taoBaoGoods != null) {
- goods = CommonOrderGoodsFactory.create(taoBaoGoods);
- }
- goods.setCreateTime(new Date());
- goods.setUpdateTime(new Date());
- commonOrderGoodsMapper.insertSelective(goods);
- } else
- goods.setId(commonGoodsList.get(commonGoodsList.size() - 1).getId());
- commonOrder.setCommonOrderGoods(goods);
- commonOrder.setUserInfo(new UserInfo(uid));
- commonOrder.setCreateTime(new Date());
- commonOrder.setStateWholeOrder(wholeOrderState);
- commonOrderMapper.insertSelective(commonOrder);
-
- // 鎻掑叆鏄犲皠锛屼繚璇佷氦鏄揑D鐨勫畬鏁存��
- commonOrderTradeIdMapMapper.insertSelective(new CommonOrderTradeIdMap(commonOrder.getId(),
- commonOrder.getTradeId(), new Date(), commonOrder.getSourceType()));
-
- commonOrderList.add(commonOrder);
- continue;
- } else {// 淇敼
- // 宸茬粡缁撶畻鎴栬�呭凡缁忓け鏁堢殑璁㈠崟涓嶅鐞�
- if (commonOrder.getState() == CommonOrder.STATE_JS || commonOrder.getState() == CommonOrder.STATE_SX) {
- commonOrderList.add(commonOrder);
- continue;
}
- CommonOrder newCommonOrder = TaoBaoOrderUtil.convert(taoBaoOrder);
-
- // 浜ゆ槗ID涓�鑷存墠淇敼
- if (commonOrder.getTradeId() != null
- && commonOrder.getTradeId().equalsIgnoreCase(newCommonOrder.getTradeId())) {
-
- CommonOrder updateCommonOrder = new CommonOrder(commonOrder.getId());
- updateCommonOrder.seteIncome(newCommonOrder.geteIncome());
- updateCommonOrder.setEstimate(newCommonOrder.getEstimate());
- updateCommonOrder.setPayment(newCommonOrder.getPayment());
- updateCommonOrder.setSettlement(newCommonOrder.getSettlement());
- updateCommonOrder.setSettleTime(newCommonOrder.getSettleTime());
- updateCommonOrder.setState(newCommonOrder.getState());
- updateCommonOrder.setStateWholeOrder(wholeOrderState);
- updateCommonOrder.setUpdateTime(new Date());
- updateCommonOrder.setTradeId(newCommonOrder.getTradeId());
- commonOrderMapper.updateByPrimaryKeySelective(updateCommonOrder);
- commonOrderList.add(commonOrderMapper.selectByPrimaryKey(updateCommonOrder.getId()));
- } else
- commonOrderList.add(commonOrder);
+ if (taoBaoGoods != null) {
+ cog = CommonOrderGoodsFactory.create(taoBaoGoods);
+ }
+ cog.setCreateTime(new Date());
+ cog.setUpdateTime(new Date());
+ commonOrderGoodsMapper.insertSelective(cog);
}
+ newCommonOrder.setUserInfo(new UserInfo(uid));
+ commonOrderList.add(addCommonOrder(newCommonOrder));
}
return commonOrderList;
+ }
+
+ @Transactional
+ @Override
+ public List<CommonOrder> addPDDOrder(List<PDDOrder> pddOrderList, Long uid) throws CommonOrderException {
+ List<CommonOrder> commonOrderList = new ArrayList<>();
+ // 鍒ゆ柇鎵�鏈夌殑璁㈠崟鐘舵��
+ int invalidCount = 0;
+ for (PDDOrder order : pddOrderList) {
+ if (order.getOrderStatus() == -1 || order.getOrderStatus() == 4 || order.getOrderStatus() == 8) {
+ invalidCount++;
+ }
+ }
+ // 鑾峰彇鏁翠綋璁㈠崟鐨勭姸鎬�
+ int wholeOrderState = 0;
+ if (pddOrderList.size() == invalidCount)
+ wholeOrderState = CommonOrder.STATE_WHOLE_ORDER_SHIXIAO;
+ else if (invalidCount == 0)
+ wholeOrderState = CommonOrder.STATE_WHOLE_ORDER_YOUXIAO;
+ else
+ wholeOrderState = CommonOrder.STATE_WHOLE_ORDER_BUFENYOUXIAO;
+
+ for (PDDOrder pddOrder : pddOrderList) {
+ CommonOrder newCommonOrder = CommonOrderFactory.create(pddOrder);
+ CommonOrderGoods cog = new CommonOrderGoods();
+ cog.setGoodsId(pddOrder.getGoodsId() + "");
+ cog.setGoodsType(Constant.SOURCE_TYPE_PDD);
+ newCommonOrder.setCommonOrderGoods(cog);
+ newCommonOrder.setStateWholeOrder(wholeOrderState);
+ // 璁㈠崟鍟嗗搧鎻掑叆
+ List<CommonOrderGoods> commonGoodsList = commonOrderGoodsMapper.listByGoodsIdAndGoodsType(cog.getGoodsId(),
+ cog.getGoodsType());
+ if (commonGoodsList.size() <= 0)// 涓嶅瓨鍦ㄥ氨鎻掑叆鍟嗗搧
+ {
+ PDDGoodsDetail pddGoods = null;
+ pddGoods = PinDuoDuoApiUtil.getGoodsDetail(Long.parseLong(cog.getGoodsId()));
+ if (pddGoods != null) {
+ cog = CommonOrderGoodsFactory.create(pddGoods);
+ }
+ cog.setCreateTime(new Date());
+ cog.setUpdateTime(new Date());
+ commonOrderGoodsMapper.insertSelective(cog);
+ newCommonOrder.setCommonOrderGoods(cog);
+ }
+ newCommonOrder.setUserInfo(new UserInfo(uid));
+ commonOrderList.add(addCommonOrder(newCommonOrder));
+ }
+ return commonOrderList;
+ }
+
+ @Transactional
+ @Override
+ public List<CommonOrder> addJDOrder(JDOrder jdOrder, Long uid) throws CommonOrderException {
+ List<CommonOrder> commonOrderList = new ArrayList<>();
+ // 鍒ゆ柇鎵�鏈夌殑璁㈠崟鐘舵��
+ int invalidCount = 0;
+ for (JDOrderItem tb : jdOrder.getOrderItemList()) {
+ if (tb.getValidCode() < 16) {
+ invalidCount++;
+ }
+ }
+
+ // 鑾峰彇鏁翠綋璁㈠崟鐨勭姸鎬�
+ int wholeOrderState = 0;
+ if (jdOrder.getOrderItemList().size() == invalidCount)
+ wholeOrderState = CommonOrder.STATE_WHOLE_ORDER_SHIXIAO;
+ else if (invalidCount == 0)
+ wholeOrderState = CommonOrder.STATE_WHOLE_ORDER_YOUXIAO;
+ else
+ wholeOrderState = CommonOrder.STATE_WHOLE_ORDER_BUFENYOUXIAO;
+
+ List<JDOrderItem> orderItemList = jdOrder.getOrderItemList();
+ jdOrder.setOrderItemList(null);
+
+ for (JDOrderItem itemOrder : orderItemList) {
+ itemOrder.setOrder(jdOrder);
+ CommonOrder newCommonOrder = CommonOrderFactory.create(itemOrder);
+ CommonOrderGoods cog = new CommonOrderGoods();
+ cog.setGoodsId(itemOrder.getSkuId() + "");
+ cog.setGoodsType(Constant.SOURCE_TYPE_JD);
+ newCommonOrder.setCommonOrderGoods(cog);
+ newCommonOrder.setStateWholeOrder(wholeOrderState);
+ // 璁㈠崟鍟嗗搧鎻掑叆
+ List<CommonOrderGoods> commonGoodsList = commonOrderGoodsMapper.listByGoodsIdAndGoodsType(cog.getGoodsId(),
+ cog.getGoodsType());
+ if (commonGoodsList.size() <= 0)// 涓嶅瓨鍦ㄥ氨鎻掑叆鍟嗗搧
+ {
+ JDGoods goods = JDApiUtil.getGoodsDetail(itemOrder.getSkuId());
+
+ if (goods != null) {
+ cog = CommonOrderGoodsFactory.create(goods);
+ }
+ cog.setCreateTime(new Date());
+ cog.setUpdateTime(new Date());
+ commonOrderGoodsMapper.insertSelective(cog);
+ }
+ newCommonOrder.setUserInfo(new UserInfo(uid));
+ commonOrderList.add(addCommonOrder(newCommonOrder));
+ }
+ return commonOrderList;
+ }
+
+ /**
+ * 娣诲姞璁㈠崟
+ *
+ * @param commonOrder
+ */
+ @Transactional
+ private CommonOrder addCommonOrder(CommonOrder commonOrder) throws CommonOrderException {
+ // 鍒ゆ柇鍟嗗搧鏄惁瀛樺湪
+ if (commonOrder == null)
+ throw new CommonOrderException(1, "璁㈠崟涓虹┖");
+ if (commonOrder.getUserInfo() == null)
+ throw new CommonOrderException(2, "璁㈠崟鐢ㄦ埛涓虹┖");
+
+ if (commonOrder.getCommonOrderGoods() == null || commonOrder.getCommonOrderGoods().getGoodsId() == null
+ || commonOrder.getCommonOrderGoods().getGoodsType() == null)
+ throw new CommonOrderException(3, "璁㈠崟鍟嗗搧涓虹┖");
+ // 涓嶅瓨鍦ㄥ氨鎻掑叆锛屽瓨鍦ㄥ氨涓嶇
+ CommonOrderGoods goods = commonOrder.getCommonOrderGoods();
+
+ // 涔嬪墠涓嶅瓨鍦ㄤ簬鏁版嵁搴�
+ if (commonOrder.getCommonOrderGoods().getId() == null) {
+ List<CommonOrderGoods> commonGoodsList = commonOrderGoodsMapper
+ .listByGoodsIdAndGoodsType(goods.getGoodsId(), goods.getGoodsType());
+
+ if (commonGoodsList == null || commonGoodsList.size() < 1) {// 涓嶅瓨鍦�
+ commonOrderGoodsMapper.insertSelective(goods);
+ } else {// 瀛樺湪
+ goods = commonGoodsList.get(0);
+ }
+ if (goods.getId() == null)
+ throw new CommonOrderException(4, "鍟嗗搧鎻掑叆澶辫触");
+ commonOrder.setCommonOrderGoods(goods);
+ }
+
+ CommonOrder oldCommonOrder = commonOrderMapper.selectByOrderNoAndOrderTypeAndOrderBy(commonOrder.getOrderNo(),
+ commonOrder.getSourceType(), commonOrder.getOrderBy());
+
+ if (oldCommonOrder == null)// 鏂板
+ {
+ commonOrder.setCreateTime(new Date());
+ commonOrderMapper.insertSelective(commonOrder);
+ // 鎻掑叆鏄犲皠锛屼繚璇佷氦鏄揑D鐨勫畬鏁存��
+ commonOrderTradeIdMapMapper.insertSelective(new CommonOrderTradeIdMap(commonOrder.getId(),
+ commonOrder.getTradeId(), new Date(), commonOrder.getSourceType()));
+ return commonOrder;
+ } else {// 淇敼
+ // 宸茬粡缁撶畻鎴栬�呭凡缁忓け鏁堢殑璁㈠崟涓嶅鐞�
+ if (oldCommonOrder.getState() == CommonOrder.STATE_JS || oldCommonOrder.getState() == CommonOrder.STATE_SX) {
+ return oldCommonOrder;
+ }
+ // 浜ゆ槗ID涓�鑷存墠淇敼
+ if (commonOrder.getTradeId() != null
+ && commonOrder.getTradeId().equalsIgnoreCase(oldCommonOrder.getTradeId())) {
+ CommonOrder updateCommonOrder = new CommonOrder(oldCommonOrder.getId());
+ updateCommonOrder.seteIncome(commonOrder.geteIncome());
+ updateCommonOrder.setEstimate(commonOrder.getEstimate());
+ updateCommonOrder.setPayment(commonOrder.getPayment());
+ updateCommonOrder.setSettlement(commonOrder.getSettlement());
+ updateCommonOrder.setSettleTime(commonOrder.getSettleTime());
+ updateCommonOrder.setState(commonOrder.getState());
+ updateCommonOrder.setStateWholeOrder(commonOrder.getStateWholeOrder());
+ updateCommonOrder.setUpdateTime(new Date());
+ updateCommonOrder.setTradeId(commonOrder.getTradeId());
+ commonOrderMapper.updateByPrimaryKeySelective(updateCommonOrder);
+ return commonOrderMapper.selectByPrimaryKey(updateCommonOrder.getId());
+ } else
+ return oldCommonOrder;
+ }
}
@Override
@@ -1026,4 +1163,5 @@
return commonOrderMapper.selectBySourceTypeAndTradeId(sourceType, tradeId);
}
+
}
--
Gitblit v1.8.0