From 51a4ff5d777028d52a19c314a99f796334cb7b51 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 23 十一月 2019 18:30:01 +0800
Subject: [PATCH] 配置文件修改
---
fanli/src/main/java/com/yeshi/fanli/service/impl/money/tb/TaoBaoWeiQuanDrawBackServiceImpl.java | 100 ++++++++++++++++++++------------------------------
1 files changed, 40 insertions(+), 60 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/money/tb/TaoBaoWeiQuanDrawBackServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/money/tb/TaoBaoWeiQuanDrawBackServiceImpl.java
index 4fbf085..7261dbb 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/money/tb/TaoBaoWeiQuanDrawBackServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/money/tb/TaoBaoWeiQuanDrawBackServiceImpl.java
@@ -133,38 +133,12 @@
List<TaoBaoWeiQuanOrder> list = taoBaoWeiQuanOrderService.getWeiQuanSuccessOrders(orderId);
if (list == null || list.size() == 0)
return;
- // 鏌ヨ杩樻湭鎵ｆ鐨勪富绾㈠寘
- List<HongBaoV2> mainHongBaoList = new ArrayList<>();
- for (TaoBaoWeiQuanOrder weiQuanOrder : list) {
- List<CommonOrder> orderList = commonOrderMapper.listBySourceTypeAndTradeId(Constant.SOURCE_TYPE_TAOBAO,
- weiQuanOrder.getOrderItemId());
- if (orderList != null && orderList.size() > 0)
- for (CommonOrder commonOrder : orderList) {
- // 淇敼璁㈠崟鐘舵�佷负缁存潈
- CommonOrder co = new CommonOrder(commonOrder.getId());
- co.setState(CommonOrder.STATE_WQ);
- co.setUpdateTime(new Date());
- commonOrderMapper.updateByPrimaryKeySelective(co);
-
- HongBaoOrder hongBaoOrder = hongBaoOrderMapper.selectByCommonOrderId(commonOrder.getId());
- if (hongBaoOrder.getCommonOrder() != null
- && !StringUtil.isNullOrEmpty(hongBaoOrder.getCommonOrder().getTradeId()))
- // 鏌ヨ鏄惁宸茬粡缁存潈
- {
- TaoBaoWeiQuanDrawBack drawBack = taoBaoWeiQuanDrawBackMapper.selectByOrderItemIdAndUid(
- hongBaoOrder.getCommonOrder().getTradeId(),
- hongBaoOrder.getHongBaoV2().getUserInfo().getId());
- if (drawBack == null)// 娣诲姞杩樻湭鎵ｆ鐨勫瓙璁㈠崟
- mainHongBaoList.add(hongBaoOrder.getHongBaoV2());
- }
-
- }
- }
+ List<HongBaoV2> mainHongBaoList = getWeiQuanMainHongBao(list, orderId);
if (mainHongBaoList == null || mainHongBaoList.size() == 0)
return;
for (int i = 0; i < mainHongBaoList.size(); i++) {
- //閿佽锛岄槻姝㈤噸澶� 鎿嶄綔
+ // 閿佽锛岄槻姝㈤噸澶� 鎿嶄綔
HongBaoV2 hb = hongBaoV2Mapper.selectByPrimaryKeyForUpdate(mainHongBaoList.get(i).getId());
mainHongBaoList.set(i, hb);
// 鍙鐞嗚繑鍒╄鍗�
@@ -297,44 +271,50 @@
}
}
+ private List<HongBaoV2> getWeiQuanMainHongBao(List<TaoBaoWeiQuanOrder> list, String orderId) {
+ // 鏌ヨ鏄惁涓虹淮鏉冭鍗�
+ if (list == null || list.size() == 0)
+ return null;
+ // 鑾峰彇鍜岃璁㈠崟鍙锋湁鍏宠仈鐨勭敤鎴�
+ // 鏌ヨ杩樻湭鎵ｆ鐨勪富绾㈠寘
+ List<HongBaoV2> mainHongBaoList = new ArrayList<>();
+ for (TaoBaoWeiQuanOrder weiQuanOrder : list) {
+ List<CommonOrder> orderList = commonOrderMapper.listBySourceTypeAndTradeId(Constant.SOURCE_TYPE_TAOBAO,
+ weiQuanOrder.getOrderItemId());
+ if (orderList != null && orderList.size() > 0)
+ for (CommonOrder commonOrder : orderList) {
+ // 淇敼璁㈠崟鐘舵�佷负缁存潈
+ CommonOrder co = new CommonOrder(commonOrder.getId());
+ co.setState(CommonOrder.STATE_WQ);
+ co.setUpdateTime(new Date());
+ commonOrderMapper.updateByPrimaryKeySelective(co);
+
+ HongBaoOrder hongBaoOrder = hongBaoOrderMapper.selectByCommonOrderId(commonOrder.getId());
+ if (hongBaoOrder.getCommonOrder() != null
+ && !StringUtil.isNullOrEmpty(hongBaoOrder.getCommonOrder().getTradeId()))
+ // 鏌ヨ鏄惁宸茬粡缁存潈
+ {
+ TaoBaoWeiQuanDrawBack drawBack = taoBaoWeiQuanDrawBackMapper.selectByOrderItemIdAndUid(
+ hongBaoOrder.getCommonOrder().getTradeId(),
+ hongBaoOrder.getHongBaoV2().getUserInfo().getId());
+ if (drawBack == null)// 娣诲姞杩樻湭鎵ｆ鐨勫瓙璁㈠崟
+ mainHongBaoList.add(hongBaoOrder.getHongBaoV2());
+ }
+ }
+ }
+ return mainHongBaoList;
+ }
+
@Transactional
@Override
public void doWeiQuanShare(String orderId) throws TaoBaoWeiQuanException {
if (StringUtil.isNullOrEmpty(orderId))
throw new TaoBaoWeiQuanException(1, "璁㈠崟鍙蜂负绌哄��");
- // 鏌ヨ鏄惁涓虹淮鏉冭鍗�
- List<TaoBaoWeiQuanOrder> list = taoBaoWeiQuanOrderService.getWeiQuanSuccessOrders(orderId);
- if (list == null || list.size() == 0)
- return;
- // 鑾峰彇鍜岃璁㈠崟鍙锋湁鍏宠仈鐨勭敤鎴�
- // 鑾峰彇涓荤孩鍖�(鍚屼竴涓鍗曞彿鐨勫崟鍙細瀵瑰簲鍚屼竴涓敤鎴�)
- List<CommonOrderVO> typeList = new ArrayList<>();
- CommonOrderVO cv = new CommonOrderVO();
- cv.setSourceType(Constant.SOURCE_TYPE_TAOBAO);
- cv.setOrderNo(orderId);
- typeList.add(cv);
- List<CommonOrderVO> commonOrderList = commonOrderMapper.listOrderGoodsInfo(typeList);
- List<HongBaoV2> mainHongBaoList = new ArrayList<>();
- if (commonOrderList != null)
- for (CommonOrderVO vo : commonOrderList) {
- // 鏇存敼璁㈠崟鐘舵��
- CommonOrder co = new CommonOrder(vo.getId());
- co.setState(CommonOrder.STATE_WQ);
- co.setUpdateTime(new Date());
- commonOrderMapper.updateByPrimaryKeySelective(co);
- HongBaoOrder hongBaoOrder = hongBaoOrderMapper.selectByCommonOrderId(vo.getId());
- if (hongBaoOrder.getCommonOrder() != null
- && !StringUtil.isNullOrEmpty(hongBaoOrder.getCommonOrder().getTradeId()))
- // 鏌ヨ鏄惁宸茬粡缁存潈
- {
- TaoBaoWeiQuanDrawBack drawBack = taoBaoWeiQuanDrawBackMapper.selectByOrderItemIdAndUid(
- hongBaoOrder.getCommonOrder().getTradeId(),
- hongBaoOrder.getHongBaoV2().getUserInfo().getId());
- if (drawBack == null)// 娣诲姞杩樻湭鎵ｆ鐨勫瓙璁㈠崟
- mainHongBaoList.add(hongBaoOrder.getHongBaoV2());
- }
- }
+ List<TaoBaoWeiQuanOrder> list = taoBaoWeiQuanOrderService.getWeiQuanSuccessOrders(orderId);
+ if(list==null||list.size()==0)
+ return;
+ List<HongBaoV2> mainHongBaoList = getWeiQuanMainHongBao(list, orderId);
if (mainHongBaoList == null || mainHongBaoList.size() == 0)
return;
--
Gitblit v1.8.0