From 3e4ef41ffacd7f5fda2e81c3810cd11a6375b83c Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 15 六月 2020 16:32:35 +0800
Subject: [PATCH] 好单库转链支持
---
fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java | 199 +++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 182 insertions(+), 17 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 5e9a369..8a61cea 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
@@ -28,6 +28,8 @@
import com.yeshi.fanli.dto.mq.order.body.OrderConfirmMQMsg;
import com.yeshi.fanli.dto.order.CommonOrderAddResultDTO;
import com.yeshi.fanli.dto.pdd.PDDGoodsDetail;
+import com.yeshi.fanli.dto.suning.SuningGoodsInfo;
+import com.yeshi.fanli.dto.vip.goods.VIPGoodsInfo;
import com.yeshi.fanli.entity.accept.AcceptData;
import com.yeshi.fanli.entity.bus.user.HongBaoV2;
import com.yeshi.fanli.entity.bus.user.UserInfo;
@@ -43,13 +45,17 @@
import com.yeshi.fanli.entity.order.ESOrder;
import com.yeshi.fanli.entity.order.HongBaoOrder;
import com.yeshi.fanli.entity.order.InviteOrderSubsidy;
+import com.yeshi.fanli.entity.order.SourceTypeEnum;
import com.yeshi.fanli.entity.pdd.PDDOrder;
+import com.yeshi.fanli.entity.suning.SuningOrderInfo;
import com.yeshi.fanli.entity.system.ConfigKeyEnum;
import com.yeshi.fanli.entity.system.SystemCoupon.CouponTypeEnum;
import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
import com.yeshi.fanli.entity.taobao.TaoBaoOrder;
import com.yeshi.fanli.entity.taobao.TaoBaoOrderGoods;
import com.yeshi.fanli.entity.taobao.TaoBaoWeiQuanOrder;
+import com.yeshi.fanli.entity.vipshop.VipShopOrder;
+import com.yeshi.fanli.entity.vipshop.VipShopOrderDetail;
import com.yeshi.fanli.exception.order.CommonOrderException;
import com.yeshi.fanli.exception.taobao.TaobaoGoodsDownException;
import com.yeshi.fanli.log.LogHelper;
@@ -82,9 +88,12 @@
import com.yeshi.fanli.util.pinduoduo.PinDuoDuoApiUtil;
import com.yeshi.fanli.util.rocketmq.MQMsgBodyFactory;
import com.yeshi.fanli.util.rocketmq.MQTopicName;
+import com.yeshi.fanli.util.suning.SuningApiUtil;
+import com.yeshi.fanli.util.suning.SuningUtil;
import com.yeshi.fanli.util.taobao.TaoBaoUtil;
import com.yeshi.fanli.util.taobao.TaoKeApiUtil;
import com.yeshi.fanli.util.user.UserLevelUtil;
+import com.yeshi.fanli.util.vipshop.VipShopApiUtil;
import com.yeshi.fanli.vo.msg.ClientTextStyleVO;
import com.yeshi.fanli.vo.order.CommonOrderGoodsVO;
import com.yeshi.fanli.vo.order.CommonOrderVO;
@@ -218,7 +227,7 @@
List<Integer> listSource) throws CommonOrderException, Exception {
int pageSize = Constant.PAGE_SIZE;
-
+
List<CommonOrderVO> listOrder = commonOrderMapper.listUserOrder((page - 1) * pageSize, pageSize, uid, state,
type, orderState, orderNo, startTime, endTime, dateType, listSource);
@@ -606,8 +615,9 @@
}
// 閭�璇� 闅愯棌璁㈠崟鍙�
- if (HongBaoV2.TYPE_YAOQING == hongBaoType || HongBaoV2.TYPE_YIJI == hongBaoType || HongBaoV2.TYPE_ERJI == hongBaoType
- || HongBaoV2.TYPE_SHARE_YIJI == hongBaoType || HongBaoV2.TYPE_SHARE_ERJI == hongBaoType) {
+ if (HongBaoV2.TYPE_YAOQING == hongBaoType || HongBaoV2.TYPE_YIJI == hongBaoType
+ || HongBaoV2.TYPE_ERJI == hongBaoType || HongBaoV2.TYPE_SHARE_YIJI == hongBaoType
+ || HongBaoV2.TYPE_SHARE_ERJI == hongBaoType) {
order.setOrderNo(UserUtil.filterOrderId(order.getOrderNo()));
}
}
@@ -1152,6 +1162,123 @@
commonOrderGoodsMapper.insertSelective(cog);
} else {
+ }
+ newCommonOrder.setUserInfo(new UserInfo(uid));
+ commonOrderList.add(addCommonOrder(newCommonOrder));
+ }
+ addConfirmMQMsg(commonOrderList);
+ return commonOrderList;
+ }
+
+ @Transactional(rollbackFor = Exception.class)
+ @Override
+ public List<CommonOrderAddResultDTO> addVipShopOrder(VipShopOrder vipShopOrder, Long uid)
+ throws CommonOrderException {
+ List<CommonOrderAddResultDTO> commonOrderList = new ArrayList<>();
+ // 鍒ゆ柇鎵�鏈夌殑璁㈠崟鐘舵��
+ int invalidCount = 0;
+ for (VipShopOrderDetail detail : vipShopOrder.getDetailList()) {
+ if (detail.getStatus() == VipShopOrderDetail.STATUS_INVALID) {
+ invalidCount++;
+ }
+ }
+
+ // 鑾峰彇鏁翠綋璁㈠崟鐨勭姸鎬�
+ int wholeOrderState = 0;
+ if (vipShopOrder.getDetailList().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<VipShopOrderDetail> orderItemList = vipShopOrder.getDetailList();
+ vipShopOrder.setDetailList(null);
+
+ for (VipShopOrderDetail itemOrder : orderItemList) {
+ itemOrder.setOrder(vipShopOrder);
+ CommonOrder newCommonOrder = CommonOrderFactory.create(itemOrder);
+ CommonOrderGoods cog = new CommonOrderGoods();
+ cog.setGoodsId(itemOrder.getGoodsId());
+ cog.setGoodsType(Constant.SOURCE_TYPE_VIP);
+ newCommonOrder.setCommonOrderGoods(cog);
+ newCommonOrder.setStateWholeOrder(wholeOrderState);
+ // 璁㈠崟鍟嗗搧鎻掑叆
+ List<CommonOrderGoods> commonGoodsList = commonOrderGoodsMapper.listByGoodsIdAndGoodsType(cog.getGoodsId(),
+ cog.getGoodsType());
+ if (commonGoodsList.size() <= 0)// 涓嶅瓨鍦ㄥ氨鎻掑叆鍟嗗搧
+ {
+ VIPGoodsInfo goods = VipShopApiUtil.getGoodsDetail(itemOrder.getGoodsId());
+ if (goods == null) {
+ goods = new VIPGoodsInfo();
+ goods.setGoodsName(itemOrder.getGoodsName());
+ goods.setVipPrice("");
+ goods.setGoodsId(itemOrder.getGoodsId());
+ goods.setGoodsThumbUrl(itemOrder.getGoodsThumb());
+ }
+
+ if (goods != null) {
+ cog = CommonOrderGoodsFactory.create(goods);
+ }
+
+ cog.setCreateTime(new Date());
+ cog.setUpdateTime(new Date());
+ commonOrderGoodsMapper.insertSelective(cog);
+ } else {
+
+ }
+ newCommonOrder.setUserInfo(new UserInfo(uid));
+ commonOrderList.add(addCommonOrder(newCommonOrder));
+ }
+ addConfirmMQMsg(commonOrderList);
+ return commonOrderList;
+ }
+
+ @Transactional(rollbackFor = Exception.class)
+ @Override
+ public List<CommonOrderAddResultDTO> addSuningOrder(List<SuningOrderInfo> suningOrderList, Long uid)
+ throws CommonOrderException {
+ List<CommonOrderAddResultDTO> commonOrderList = new ArrayList<>();
+ // 鍒ゆ柇鎵�鏈夌殑璁㈠崟鐘舵��
+ int invalidCount = 0;
+ for (SuningOrderInfo order : suningOrderList) {
+ if ("閫�娆�".equalsIgnoreCase(order.getOrderLineStatusDesc())
+ || "璁㈠崟宸插彇娑�".equalsIgnoreCase(order.getOrderLineStatusDesc())) {
+ invalidCount++;
+ }
+ }
+ // 鑾峰彇鏁翠綋璁㈠崟鐨勭姸鎬�
+ int wholeOrderState = 0;
+ if (suningOrderList.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 (SuningOrderInfo suningOrderInfo : suningOrderList) {
+ CommonOrder newCommonOrder = CommonOrderFactory.create(suningOrderInfo);
+ CommonOrderGoods cog = new CommonOrderGoods();
+ cog.setGoodsId(suningOrderInfo.getGoodsNum() + "");
+ cog.setGoodsType(Constant.SOURCE_TYPE_SUNING);
+ newCommonOrder.setCommonOrderGoods(cog);
+ newCommonOrder.setStateWholeOrder(wholeOrderState);
+ // 璁㈠崟鍟嗗搧鎻掑叆
+ List<CommonOrderGoods> commonGoodsList = commonOrderGoodsMapper.listByGoodsIdAndGoodsType(cog.getGoodsId(),
+ cog.getGoodsType());
+ if (commonGoodsList.size() <= 0)// 涓嶅瓨鍦ㄥ氨鎻掑叆鍟嗗搧
+ {
+ SuningGoodsInfo pddGoods = null;
+ // TODO 闇�瑕佽幏鍙�
+ pddGoods = SuningApiUtil.getGoodsDetail(suningOrderInfo.getGoodsNum(), suningOrderInfo.getSellerCode());
+ if (pddGoods != null) {
+ cog = CommonOrderGoodsFactory.create(pddGoods);
+ }
+ cog.setCreateTime(new Date());
+ cog.setUpdateTime(new Date());
+ commonOrderGoodsMapper.insertSelective(cog);
+ newCommonOrder.setCommonOrderGoods(cog);
+ } else {
}
newCommonOrder.setUserInfo(new UserInfo(uid));
commonOrderList.add(addCommonOrder(newCommonOrder));
@@ -1817,12 +1944,12 @@
@Override
public List<CommonOrderVO> getOrderList(AcceptData acceptData, Integer page, Long uid, Integer state, Integer type,
Integer orderState, String orderNo, String startTime, String endTime, Integer dateType,
- List<Integer> listSource, boolean notBackSuVip) throws CommonOrderException, Exception {
+ List<Integer> listSource) throws CommonOrderException, Exception {
int pageSize = Constant.PAGE_SIZE;
-
+
List<CommonOrderVO> listOrder = commonOrderMapper.getOrderList((page - 1) * pageSize, pageSize, uid, state,
- type, orderState, orderNo, startTime, endTime, dateType, listSource,notBackSuVip);
+ type, orderState, orderNo, startTime, endTime, dateType, listSource);
// 璁㈠崟淇℃伅涓虹┖
if (listOrder == null || listOrder.size() == 0) {
@@ -1844,9 +1971,9 @@
@Override
public long countOrderList(Long uid, Integer state, Integer type, Integer orderState, String orderNo,
- String startTime, String endTime, Integer dateType, List<Integer> listSource, boolean notBackSuVip) throws CommonOrderException {
+ String startTime, String endTime, Integer dateType, List<Integer> listSource) {
return commonOrderMapper.countOrderList(uid, state, type, orderState, orderNo, startTime, endTime, dateType,
- listSource, notBackSuVip);
+ listSource);
}
/**
@@ -1862,13 +1989,15 @@
List<String> listTB = new ArrayList<String>();
List<String> listJD = new ArrayList<String>();
List<String> listPDD = new ArrayList<String>();
+ List<String> listVIP = new ArrayList<String>();
+ List<String> listSuNing = new ArrayList<String>();
for (CommonOrderVO order : listOrder) {
if (order.getHongBaoType() == HongBaoV2.TYPE_YIJI || order.getHongBaoType() == HongBaoV2.TYPE_ERJI
|| order.getHongBaoType() == HongBaoV2.TYPE_SHARE_YIJI
|| order.getHongBaoType() == HongBaoV2.TYPE_SHARE_ERJI) {
Integer urank = order.getUrank();
if (urank != null) {
- UserLevelEnum levelEnum = UserLevelUtil.getByOrderRank(urank);
+ UserLevelEnum levelEnum = UserLevelUtil.getByOrderRank(urank);
if (levelEnum != null) {
levelEnum = UserLevelUtil.getShowLevel(levelEnum);
order.setOrderDesc("璁㈠崟鏉ユ簮锛�" + levelEnum.getName());
@@ -1885,6 +2014,10 @@
listJD.add(order.getOrderNo());
} else if (sourceType == Constant.SOURCE_TYPE_PDD) {
listPDD.add(order.getOrderNo());
+ } else if (sourceType == Constant.SOURCE_TYPE_VIP) {
+ listVIP.add(order.getOrderNo());
+ } else if (sourceType == Constant.SOURCE_TYPE_SUNING) {
+ listSuNing.add(order.getOrderNo());
}
}
@@ -1903,6 +2036,17 @@
listRecordPDD = userSystemCouponRecordService.getRecordByOrderNoList(Constant.SOURCE_TYPE_PDD, listPDD);
}
+ List<UserSystemCouponRecord> listRecordVIP = null;
+ if (listVIP.size() > 0) {
+ listRecordVIP = userSystemCouponRecordService.getRecordByOrderNoList(Constant.SOURCE_TYPE_VIP, listVIP);
+ }
+
+ List<UserSystemCouponRecord> listRecordSuNing = null;
+ if (listSuNing.size() > 0) {
+ listRecordSuNing = userSystemCouponRecordService.getRecordByOrderNoList(Constant.SOURCE_TYPE_SUNING, listSuNing);
+ }
+
+
SimpleDateFormat format = new SimpleDateFormat("yyyy.MM.dd HH:mm");
SimpleDateFormat formatday = new SimpleDateFormat("yyyy.MM.dd");
// 鏄惁瀛樺湪濂栧姳鍒�
@@ -1965,6 +2109,11 @@
Integer goodsType = commonGoodsVO.getGoodsType();
if (goodsType != null & goodsType == Constant.SOURCE_TYPE_ELME) {
order.setOrderType(Constant.SOURCE_TYPE_ELME); // 楗夸簡涔堣鍗�
+ commonGoodsVO.setGoodsId("0");
+ }
+
+ if (goodsType == Constant.SOURCE_TYPE_SUNING) {
+ commonGoodsVO.setGoodsId(SuningUtil.getConcatGoodsIId(commonGoodsVO.getShopId() +"", commonGoodsVO.getGoodsId()));
}
order.getListOrderGoods().add(commonGoodsVO);
}
@@ -1981,6 +2130,21 @@
} else if (sourceType == Constant.SOURCE_TYPE_PDD) {
order.setOrderType(4);
}
+
+ // 瀛愭潵婧愮被鍨�
+ ClientTextStyleVO shopStyleVO = new ClientTextStyleVO();
+ SourceTypeEnum typeEnum = SourceTypeEnum.getByDesc(order.getChildSourceType());
+ if (typeEnum == null) {
+ shopStyleVO.setContent("鍏朵粬");
+ shopStyleVO.setColor("#FF5000");
+ shopStyleVO.setBorderColor("#FF5000");
+ } else {
+ shopStyleVO.setContent(typeEnum.getDescShow());
+ shopStyleVO.setColor(typeEnum.getFontColor());
+ shopStyleVO.setBorderColor(typeEnum.getBorderColor());
+ }
+ order.setShopType(shopStyleVO);
+
Date thirdCreateTime = order.getThirdCreateTime();
if (thirdCreateTime != null) {
@@ -2035,7 +2199,7 @@
List<TaoBaoWeiQuanOrder> listWQ = taoBaoWeiQuanOrderMapper
.selectListByOrderIdAndState(order.getOrderNo(), "缁存潈鎴愬姛");
BigDecimal weiQuanMoney = getWeiQuanMoney(listWQ, sourceType, uid);
-
+
if (settleTime != null) {
orderStateContent = "鍞悗鎴愬姛";
WeiQuanInfo weiQuanInfo = new WeiQuanInfo();
@@ -2066,6 +2230,10 @@
couponUseFactory(order, listRecordJD);
} else if (sourceType == Constant.SOURCE_TYPE_PDD) {
couponUseFactory(order, listRecordPDD);
+ } else if (sourceType == Constant.SOURCE_TYPE_VIP) {
+ couponUseFactory(order, listRecordVIP);
+ } else if (sourceType == Constant.SOURCE_TYPE_SUNING) {
+ couponUseFactory(order, listRecordSuNing);
}
} else if (HongBaoV2.TYPE_SHARE_GOODS == hongBaoType) {
// 鍒嗕韩
@@ -2186,8 +2354,7 @@
order.setRewardDetail(rewardMap);
}
}
-
-
+
@Override
public long countOrderByUidAndSettled(Long uid, BigDecimal payment) {
Long count = commonOrderMapper.countOrderByUidAndSettled(uid, payment);
@@ -2196,17 +2363,15 @@
}
return count;
}
-
-
+
@Override
public String getNewestOrderNoByTaoBao() {
return commonOrderMapper.getNewestOrderNoByTaoBao();
}
-
-
+
@Override
public List<CommonOrder> listByOrderNo(String orderNo) {
return commonOrderMapper.listByOrderNo(orderNo);
}
-
+
}
--
Gitblit v1.8.0