From b3da9f82b7740d39742fef1a81a56c22fe1c8b9c Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期一, 08 六月 2020 17:27:02 +0800
Subject: [PATCH] 券后价调整
---
fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java | 183 +++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 172 insertions(+), 11 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 a9a7183..af88de3 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,11 @@
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.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,6 +226,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);
@@ -605,8 +614,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()));
}
}
@@ -1151,6 +1161,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(), "00000000");
+ 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));
@@ -1816,11 +1943,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) throws CommonOrderException, Exception {
+ List<Integer> listSource, boolean notBackSuVip) 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);
+ type, orderState, orderNo, startTime, endTime, dateType, listSource, notBackSuVip);
// 璁㈠崟淇℃伅涓虹┖
if (listOrder == null || listOrder.size() == 0) {
@@ -1842,9 +1970,10 @@
@Override
public long countOrderList(Long uid, Integer state, Integer type, Integer orderState, String orderNo,
- String startTime, String endTime, Integer dateType, List<Integer> listSource) throws CommonOrderException {
+ String startTime, String endTime, Integer dateType, List<Integer> listSource, boolean notBackSuVip)
+ throws CommonOrderException {
return commonOrderMapper.countOrderList(uid, state, type, orderState, orderNo, startTime, endTime, dateType,
- listSource);
+ listSource, notBackSuVip);
}
/**
@@ -1862,11 +1991,11 @@
List<String> listPDD = new ArrayList<String>();
for (CommonOrderVO order : listOrder) {
if (order.getHongBaoType() == HongBaoV2.TYPE_YIJI || order.getHongBaoType() == HongBaoV2.TYPE_ERJI
- || order.getHongBaoType() == HongBaoV2.TYPE_SHARE_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());
@@ -1979,6 +2108,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) {
@@ -2033,6 +2177,14 @@
List<TaoBaoWeiQuanOrder> listWQ = taoBaoWeiQuanOrderMapper
.selectListByOrderIdAndState(order.getOrderNo(), "缁存潈鎴愬姛");
BigDecimal weiQuanMoney = getWeiQuanMoney(listWQ, sourceType, uid);
+
+ if (settleTime != null) {
+ orderStateContent = "鍞悗鎴愬姛";
+ WeiQuanInfo weiQuanInfo = new WeiQuanInfo();
+ weiQuanInfo.setOldHongBao("楼" + hongBao.setScale(2, BigDecimal.ROUND_DOWN).toString());
+ weiQuanInfo.setWqHongBao("鍞悗锛�-楼" + weiQuanMoney.setScale(2, BigDecimal.ROUND_DOWN).toString());
+ order.setWeiQuanInfo(weiQuanInfo);
+ }
hongBao = MoneyBigDecimalUtil.sub(hongBao, weiQuanMoney);
}
}
@@ -2176,8 +2328,7 @@
order.setRewardDetail(rewardMap);
}
}
-
-
+
@Override
public long countOrderByUidAndSettled(Long uid, BigDecimal payment) {
Long count = commonOrderMapper.countOrderByUidAndSettled(uid, payment);
@@ -2186,5 +2337,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