From cebb70396a159270ce84cb44caeafa82faa439a4 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 30 七月 2019 18:25:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderProcessServiceImpl.java | 140 ++++++++++++++++++++--------------------------
1 files changed, 61 insertions(+), 79 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderProcessServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderProcessServiceImpl.java
index ef1b81c..af5d212 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderProcessServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderProcessServiceImpl.java
@@ -54,7 +54,6 @@
import com.yeshi.fanli.service.inter.taobao.TaoBaoWeiQuanDrawBackService;
import com.yeshi.fanli.service.inter.user.UserExtraTaoBaoInfoService;
import com.yeshi.fanli.service.inter.user.UserMoneyService;
-import com.yeshi.fanli.service.inter.user.UserNotificationService;
import com.yeshi.fanli.service.inter.user.UserSystemCouponService;
import com.yeshi.fanli.util.CMQManager;
import com.yeshi.fanli.util.Constant;
@@ -74,9 +73,6 @@
private UserInfoMapper userInfoMapper;
@Resource
- private UserNotificationService userNotificationService;
-
- @Resource
private TaoBaoUnionConfigService taoBaoUnionConfigService;
@Resource
@@ -84,7 +80,6 @@
@Resource
private TaoBaoOrderService taoBaoOrderService;
-
@Resource
private LostOrderService lostOrderService;
@@ -115,7 +110,7 @@
@Resource
private TaoBaoBuyRelationMapService taoBaoBuyRelationMapService;
-
+
@Resource
private CommonOrderService commonOrderService;
@@ -144,18 +139,19 @@
} else if (!StringUtil.isNullOrEmpty(list.get(0).getRelationId())) {
shareOrderMap.put(orderId, list);
} else {
+ // 閫氳繃绾㈠寘鏌ヨ
+ CommonOrder commonOrder = commonOrderService
+ .selectBySourceTypeAndTradeId(Constant.SOURCE_TYPE_TAOBAO, list.get(0).getTradeId());
- PidUser pidUser = null;//pidUserMapper.selectByPid(pid);
- if (pidUser != null && pidUser.getType() == PidUser.TYPE_SHARE_GOODS) {// 鍟嗗搧鍒嗕韩璁㈠崟
- // List<PidOrder> pidOrderList = new ArrayList<>();
- // for (TaoBaoOrder order : list) {
- // pidOrderList.add(TaoBaoOrderUtil.convertToPidOrder(order));
- // }
- // sharePidOrderMap.put(orderId, pidOrderList);
- shareOrderMap.put(orderId, list);
- } else {// 鏅�氳繑鍒╄鍗�
- fanliOrderMap.put(orderId, list);
+ if (commonOrder != null) {
+ HongBaoOrder hongBaoOrder = hongBaoOrderMapper.selectByCommonOrderId(commonOrder.getId());
+ if (hongBaoOrder != null && hongBaoOrder.getHongBaoV2() != null
+ && hongBaoOrder.getHongBaoV2().getType() == HongBaoV2.TYPE_SHARE_GOODS) {
+ shareOrderMap.put(orderId, list);
+ continue;
+ }
}
+ fanliOrderMap.put(orderId, list);
}
}
}
@@ -282,7 +278,6 @@
}
}
-
@Resource
private HongBaoOrderMapper hongBaoOrderMapper;
@@ -297,16 +292,20 @@
LogHelper.error("杩斿埄澶辫触:" + hb1.getId());
return;
}
- // 缁存潈涓殑涓嶈繑鍒�
- List<TaoBaoWeiQuanOrder> taoBaoWeiQuanList = taoBaoWeiQuanOrderMapper
- .selectListByOrderIdAndState(hongBaoOrder.getCommonOrder().getOrderNo(), "缁存潈鍒涘缓");
- if (taoBaoWeiQuanList != null && taoBaoWeiQuanList.size() > 0)
- return;
- taoBaoWeiQuanList = taoBaoWeiQuanOrderMapper
- .selectListByOrderIdAndState(hongBaoOrder.getCommonOrder().getOrderNo(), "绛夊緟澶勭悊");
- if (taoBaoWeiQuanList != null && taoBaoWeiQuanList.size() > 0)
- return;
+ if (hongBaoOrder.getCommonOrder() != null
+ && hongBaoOrder.getCommonOrder().getSourceType() == Constant.SOURCE_TYPE_TAOBAO) {
+ // 缁存潈涓殑涓嶈繑鍒�
+ List<TaoBaoWeiQuanOrder> taoBaoWeiQuanList = taoBaoWeiQuanOrderMapper
+ .selectListByOrderIdAndState(hongBaoOrder.getCommonOrder().getOrderNo(), "缁存潈鍒涘缓");
+ if (taoBaoWeiQuanList != null && taoBaoWeiQuanList.size() > 0)
+ return;
+
+ taoBaoWeiQuanList = taoBaoWeiQuanOrderMapper
+ .selectListByOrderIdAndState(hongBaoOrder.getCommonOrder().getOrderNo(), "绛夊緟澶勭悊");
+ if (taoBaoWeiQuanList != null && taoBaoWeiQuanList.size() > 0)
+ return;
+ }
// 鏌ヨ鍚屼竴璁㈠崟鍙风殑绾㈠寘
List<CommonOrder> orderList = commonOrderService.listBySourceTypeAndOrderId(
@@ -387,21 +386,11 @@
}
// 绔欏唴淇�+鎺ㄩ��
- UserInfo user = userInfoMapper.selectByPrimaryKey(uid);
- try {
- userNotificationService.orderFanliRecieved(uid, hongBaoOrder.getCommonOrder().getOrderNo(),
- userGoodsCount.get(uid), user.getMyHongBao(), money);
- } catch (Exception e) {
- try {
- LogHelper.errorDetailInfo(e);
- } catch (Exception e1) {
- e1.printStackTrace();
- }
- }
+ UserInfo user = userInfoMapper.selectByPKey(uid);
// 鏂扮増閫氱煡
userMoneyMsgNotificationService.fanliOrderReceived(uid, hongBaoOrder.getCommonOrder().getOrderNo(),
- userGoodsCount.get(uid), money, user.getMyHongBao());
+ hongBaoOrder.getCommonOrder().getSourceType(), userGoodsCount.get(uid), money, user.getMyHongBao());
}
// 閫氱煡鍏嶅崟鍒拌处
try {
@@ -414,9 +403,8 @@
if (hongBaoOrder.getCommonOrder().getSettleTime() != null && hongBaoOrder.getCommonOrder().getSettleTime()
.getTime() >= TimeUtil.convertToTimeTemp("2018-08-05", "yyyy-MM-dd")) {
try {
-
- taoBaoWeiQuanDrawBackService.doWeiQuanFanli(hongBaoOrder.getCommonOrder().getOrderNo());
-
+ if (hongBaoOrder.getCommonOrder().getSourceType() == Constant.SOURCE_TYPE_TAOBAO)
+ taoBaoWeiQuanDrawBackService.doWeiQuanFanli(hongBaoOrder.getCommonOrder().getOrderNo());
} catch (TaoBaoWeiQuanException e) {
if (e.getCode() == TaoBaoWeiQuanException.CODE_NEDD_UPDATE_ORDER) {
List<TaoBaoOrder> olist = taoBaoOrderService
@@ -455,7 +443,7 @@
public void weiQuanOrder(List<TaoBaoWeiQuanOrder> orderList) {
if (orderList != null)
for (TaoBaoWeiQuanOrder order : orderList) {
- if (order.getState().equalsIgnoreCase("缁存潈鎴愬姛")) {
+ if (order.getState().contains("缁存潈鎴愬姛")) {
CMQManager.getInstance().addWeiQuanOrderMsg(order);
}
}
@@ -641,7 +629,6 @@
// 閭�璇疯禋鍒拌处
if (invitemoney.compareTo(new BigDecimal(0)) > 0) {
- userInfoMapper.addHongBaoByUid(uid, invitemoney);
// 娣诲姞鏂扮増璇︽儏璁板綍
try {
@@ -660,9 +647,11 @@
long invalidCount = hongBaoV2Mapper.countInviteOrderCountByUidAndSettleTime(uid, CommonOrder.STATE_SX,
minDate, maxDate);
- UserMoneyDetail userMoneyDetail = UserMoneyDetailFactory.createInvite(uid, (int) validCount,
- (int) weiQuanCount, (int) invalidCount, invitemoney, new Date());
- userMoneyDetailMapper.insert(userMoneyDetail);
+ UserMoneyDetail userMoneyDetail = UserMoneyDetailFactory.createInvite(uid, Constant.SOURCE_TYPE_TAOBAO,
+ (int) validCount, (int) weiQuanCount, (int) invalidCount, invitemoney, new Date());
+
+ // 澧炲姞璧勯噾
+ userMoneyService.addUserMoney(uid, invitemoney, userMoneyDetail);
// 娣诲姞鍒扮孩鍖呰繑鍒╄褰曢泦鍚�
accountDetailsHongBaoMapService.saveAccountDetailsHongBaoMap(hbIdList, userMoneyDetail.getId());
} catch (UserMoneyDetailException e) {
@@ -673,18 +662,9 @@
}
}
- // 鍙戦�佹帹閫�
- try {
- // 鎻愭垚鍒拌处娑堟伅閫氱煡
- userNotificationService.tiChengInviteRecieved(uid, inviteOrders.size(), inviteGoodsCount, null,
- invitemoney);
- } catch (Exception e) {
- e.printStackTrace();
- }
-
// 鏂扮増閫氱煡
- userMoneyMsgNotificationService.inviteOrderReceived(uid, inviteOrders.size(), inviteGoodsCount, invitemoney,
- userInfoMapper.selectByPKey(uid).getMyHongBao());
+ userMoneyMsgNotificationService.inviteOrderReceived(uid, Constant.SOURCE_TYPE_TAOBAO, inviteOrders.size(),
+ inviteGoodsCount, invitemoney, userInfoMapper.selectByPKey(uid).getMyHongBao());
for (String orderId : drawBackOrders)
taoBaoWeiQuanDrawBackService.doWeiQuanInvite(orderId);
@@ -739,7 +719,6 @@
*/
if (sharemoney.compareTo(new BigDecimal(0)) > 0) {
- userInfoMapper.addHongBaoByUid(uid, sharemoney);
// 娣诲姞鏂扮増璇︽儏璁板綍
try {
// 璁＄畻鏈湀鐨勬湁鏁堣鍗曪紝澶辨晥璁㈠崟锛岀淮鏉冭鍗�
@@ -758,9 +737,11 @@
long invalidCount = commonOrderService.countByUidAndOrderStateWithOrderBalanceTime(uid,
CommonOrder.STATE_SX, minDate, maxDate);
- UserMoneyDetail userMoneyDetail = UserMoneyDetailFactory.createShare(uid, (int) validCount,
- (int) weiQuanCount, (int) invalidCount, sharemoney, new Date());
- userMoneyDetailMapper.insert(userMoneyDetail);
+ UserMoneyDetail userMoneyDetail = UserMoneyDetailFactory.createShare(uid, Constant.SOURCE_TYPE_TAOBAO,
+ (int) validCount, (int) weiQuanCount, (int) invalidCount, sharemoney, new Date());
+ // 娣诲姞璧勯噾
+ userMoneyService.addUserMoney(uid, sharemoney, userMoneyDetail);
+
// 娣诲姞鍒扮孩鍖呰繑鍒╄褰曢泦鍚�
accountDetailsHongBaoMapService.saveAccountDetailsHongBaoMap(hbIdList, userMoneyDetail.getId());
} catch (UserMoneyDetailException e) {
@@ -771,26 +752,15 @@
}
}
- // 鍙戦�佹帹閫�
- try {
- // 鎻愭垚鍒拌处娑堟伅閫氱煡
- userNotificationService.tiChengShareRecieved(uid, shareOrders.size(), shareGoodsCount, null,
- sharemoney);
- } catch (Exception e) {
- e.printStackTrace();
- }
-
// 鏂扮増閫氱煡
- userMoneyMsgNotificationService.shareOrderReceived(uid, shareOrders.size(), shareGoodsCount, sharemoney,
- userInfoMapper.selectByPrimaryKey(uid).getMyHongBao());
+ userMoneyMsgNotificationService.shareOrderReceived(uid, Constant.SOURCE_TYPE_TAOBAO, shareOrders.size(),
+ shareGoodsCount, sharemoney, userInfoMapper.selectByPrimaryKey(uid).getMyHongBao());
for (String orderId : drawBackOrders)
taoBaoWeiQuanDrawBackService.doWeiQuanShare(orderId);
}
}
-
-
@Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
@Override
@@ -811,7 +781,7 @@
// 鍘熸潵涓嶅瓨鍦ㄨ鍗�
Long uid = null;
if (oldOrder == null) {
- PidUser pidUser =null;// pidUserMapper.selectByPid(pid);
+ PidUser pidUser = null;// pidUserMapper.selectByPid(pid);
if (pidUser != null) {
uid = pidUser.getUid();
@@ -829,7 +799,6 @@
orderMapper.insertSelective(order);
oldOrder = order;
} else {
-
Long targetUid = null;
if (pid.equalsIgnoreCase(TaoBaoConstant.TAOBAO_RELATION_AS_SPECIAL_PID)
&& !StringUtil.isNullOrEmpty(orderList.get(0).getRelationId())) {
@@ -897,8 +866,7 @@
try {
commonOrderList = commonOrderService.addTaoBaoOrder(orderList, uid);
hongBaoV2Service.addHongBao(commonOrderList, HongBaoV2.TYPE_ZIGOU);
-
-
+
} catch (CommonOrderException e) {
try {
LogHelper.errorDetailInfo(e, "addTaoBaoOrder鎴朼ddHongBao鍑洪敊", "璁㈠崟鍙�:" + orderId);
@@ -917,7 +885,7 @@
orderList.get(0).getSourceMediaId(), orderList.get(0).getAdPositionId());
// 鍘熸潵涓嶅瓨鍦ㄨ鍗�
Long uid = null;
- PidUser pidUser =null; //pidUserMapper.selectByPid(pid);-PID鏈哄埗绉婚櫎
+ PidUser pidUser = null; // pidUserMapper.selectByPid(pid);-PID鏈哄埗绉婚櫎
if (pidUser != null)
uid = pidUser.getUid();
else {
@@ -927,6 +895,20 @@
}
// 灏氭湭鎵惧埌鍜孭ID瀵瑰簲鐨勭敤鎴�
+ if (uid == null) {
+ // 閫氳繃绾㈠寘鏌ヨ
+ CommonOrder commonOrder = commonOrderService.selectBySourceTypeAndTradeId(Constant.SOURCE_TYPE_TAOBAO,
+ orderList.get(0).getTradeId());
+
+ if (commonOrder != null) {
+ HongBaoOrder hongBaoOrder = hongBaoOrderMapper.selectByCommonOrderId(commonOrder.getId());
+ if (hongBaoOrder != null && hongBaoOrder.getHongBaoV2() != null
+ && hongBaoOrder.getHongBaoV2().getType() == HongBaoV2.TYPE_SHARE_GOODS) {
+ uid = hongBaoOrder.getHongBaoV2().getUserInfo().getId();
+ }
+ }
+ }
+
if (uid == null)
return;
--
Gitblit v1.8.0