From 28cf328a098334b51a3e9d2d56f983fb8c862211 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期六, 23 五月 2020 09:54:38 +0800
Subject: [PATCH] 足迹、收藏订单兼容新需求
---
fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderProcessServiceImpl.java | 383 ++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 283 insertions(+), 100 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 09ebb52..f4e4a9c 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
@@ -30,10 +30,12 @@
import com.yeshi.fanli.dao.mybatis.order.HongBaoOrderMapper;
import com.yeshi.fanli.dao.mybatis.order.OrderMapper;
import com.yeshi.fanli.dao.mybatis.taobao.TaoBaoWeiQuanOrderMapper;
+import com.yeshi.fanli.dto.mq.UidDateDTO;
import com.yeshi.fanli.dto.mq.order.OrderTopicTagEnum;
import com.yeshi.fanli.dto.mq.order.body.OrderMQMsg;
import com.yeshi.fanli.dto.mq.order.body.OrderMoneyRecievedMQMsg;
import com.yeshi.fanli.dto.order.CommonOrderAddResultDTO;
+import com.yeshi.fanli.dto.order.HongBaoAddResult;
import com.yeshi.fanli.entity.bus.user.HongBaoV2;
import com.yeshi.fanli.entity.bus.user.Order;
import com.yeshi.fanli.entity.bus.user.UserExtraTaoBaoInfo;
@@ -51,6 +53,7 @@
import com.yeshi.fanli.entity.taobao.TaoBaoUnionConfig;
import com.yeshi.fanli.entity.taobao.TaoBaoWeiQuanDrawBack;
import com.yeshi.fanli.entity.taobao.TaoBaoWeiQuanOrder;
+import com.yeshi.fanli.exception.elme.ElmeOrderException;
import com.yeshi.fanli.exception.money.OrderMoneySettleException;
import com.yeshi.fanli.exception.money.UserMoneyDetailException;
import com.yeshi.fanli.exception.order.CommonOrderException;
@@ -59,7 +62,9 @@
import com.yeshi.fanli.exception.order.TaoBaoWeiQuanException;
import com.yeshi.fanli.exception.user.UserAccountException;
import com.yeshi.fanli.log.LogHelper;
+import com.yeshi.fanli.log.OrderLogHelper;
import com.yeshi.fanli.service.inter.elme.ElmeHongBaoOrderMapService;
+import com.yeshi.fanli.service.inter.elme.ElmeOrderProcessService;
import com.yeshi.fanli.service.inter.elme.ElmeOrderService;
import com.yeshi.fanli.service.inter.hongbao.AccountDetailsHongBaoMapService;
import com.yeshi.fanli.service.inter.money.UserMoneyService;
@@ -71,20 +76,22 @@
import com.yeshi.fanli.service.inter.order.OrderMoneySettleService;
import com.yeshi.fanli.service.inter.order.OrderProcessService;
import com.yeshi.fanli.service.inter.order.jd.JDOrderService;
+import com.yeshi.fanli.service.inter.order.msg.UserOrderMsgNotificationService;
import com.yeshi.fanli.service.inter.order.pdd.PDDOrderService;
import com.yeshi.fanli.service.inter.order.tb.TaoBaoOrderService;
import com.yeshi.fanli.service.inter.taobao.TaoBaoBuyRelationMapService;
import com.yeshi.fanli.service.inter.taobao.TaoBaoUnionConfigService;
import com.yeshi.fanli.service.inter.user.UserSystemCouponService;
import com.yeshi.fanli.service.inter.user.tb.UserExtraTaoBaoInfoService;
-import com.yeshi.fanli.service.manger.HongBaoV2AddManager;
+import com.yeshi.fanli.service.manger.order.HongBaoV2AddManager;
import com.yeshi.fanli.util.CMQManager;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.MoneyBigDecimalUtil;
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.TaoBaoConstant;
import com.yeshi.fanli.util.TimeUtil;
-import com.yeshi.fanli.util.cmq.PlaceOrderCMQManager;
+import com.yeshi.fanli.util.cmq.order.PlaceOrderCMQManager;
+import com.yeshi.fanli.util.cmq.order.TeamOrderCMQManager;
import com.yeshi.fanli.util.factory.UserMoneyDetailFactory;
import com.yeshi.fanli.util.jd.JDApiUtil;
import com.yeshi.fanli.util.pinduoduo.PinDuoDuoApiUtil;
@@ -126,6 +133,9 @@
@Resource
private UserMoneyMsgNotificationService userMoneyMsgNotificationService;
+
+ @Resource
+ private UserOrderMsgNotificationService userOrderMsgNotificationService;
@Resource
private UserExtraTaoBaoInfoService userExtraTaoBaoInfoService;
@@ -202,6 +212,7 @@
Iterator<String> its = orders.keySet().iterator();
Map<String, List<TaoBaoOrder>> fanliOrderMap = new HashMap<>();
Map<String, List<TaoBaoOrder>> shareOrderMap = new HashMap<>();
+ Map<String, List<TaoBaoOrder>> elmeOrderMap = new HashMap<>();
while (its.hasNext()) {
String orderId = its.next();
@@ -209,26 +220,35 @@
List<TaoBaoOrder> list = orders.get(orderId);
String pid = String.format("mm_%s_%s_%s", configList.get(0).getAccountId(),
list.get(0).getSourceMediaId(), list.get(0).getAdPositionId());
-
- if (!StringUtil.isNullOrEmpty(list.get(0).getSpecialId())
- || pid.equalsIgnoreCase(TaoBaoConstant.TAOBAO_RELATION_AS_SPECIAL_PID)) {// 璁剧疆娓犻亾ID褰撳仛浼氬憳杩愯惀ID鐨勪綅缃甀D
- fanliOrderMap.put(orderId, list);
- } 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());
-
- 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;
- }
+ if ("楗夸簡涔�".equalsIgnoreCase(list.get(0).getOrderType())&&!pid.equalsIgnoreCase(TaoBaoConstant.TAOBAO_RELATION_PID_DEFAULT)) {
+ // 楗夸簡涔堣鍗曞紑濮嬪綊鍏ュ埌娣樺疂璁㈠崟
+ if (TimeUtil.convertToTimeTemp(list.get(0).getCreateTime(),
+ "yyyy-MM-dd HH:mm:ss") >= Constant.NEW_ORDER_FANLI_RULE_TIME) {
+ fanliOrderMap.put(orderId, list);
+ } else {
+ elmeOrderMap.put(orderId, list);
}
- fanliOrderMap.put(orderId, list);
+ } else {
+ if (!StringUtil.isNullOrEmpty(list.get(0).getSpecialId())
+ || pid.equalsIgnoreCase(TaoBaoConstant.TAOBAO_RELATION_AS_SPECIAL_PID)) {// 璁剧疆娓犻亾ID褰撳仛浼氬憳杩愯惀ID鐨勪綅缃甀D
+ fanliOrderMap.put(orderId, list);
+ } 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());
+
+ 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);
+ }
}
}
}
@@ -237,6 +257,54 @@
processShopingFanliOrder(fanliOrderMap);
// 澶勭悊鍒嗕韩璧氳鍗�
processShareGoodsOrder(shareOrderMap);
+ // 澶勭悊楗夸簡涔堣鍗�
+ processElemeOrder(elmeOrderMap);
+ }
+
+ private ElmeOrder createElmeOrder(TaoBaoOrder taoBaoOrder) {
+ ElmeOrder elmeOrder = new ElmeOrder();
+ elmeOrder.setChannelId("");
+ elmeOrder.setCreateTime(new Date());
+ elmeOrder
+ .setOrderDate(new Date(TimeUtil.convertToTimeTemp(taoBaoOrder.getCreateTime(), "yyyy-MM-dd HH:mm:ss")));
+ elmeOrder.setOrderId(taoBaoOrder.getOrderId());
+ elmeOrder.setPayMoney(taoBaoOrder.getPayment());
+ elmeOrder.setRid(taoBaoOrder.getRelationId());
+ if (taoBaoOrder.getOrderState().equalsIgnoreCase("璁㈠崟缁撶畻"))
+ elmeOrder.setIsSettle(true);
+ else
+ elmeOrder.setIsSettle(false);
+
+ if (!taoBaoOrder.getOrderState().equalsIgnoreCase("璁㈠崟澶辨晥"))
+ elmeOrder.setState(1);
+ else {
+ elmeOrder.setState(0);
+ elmeOrder.setPayMoney(new BigDecimal(0));
+ }
+ elmeOrder.setTrackPid(
+ String.format("mm_124933865_%s_%s", taoBaoOrder.getSourceMediaId(), taoBaoOrder.getAdPositionId()));
+ if (!StringUtil.isNullOrEmpty(taoBaoOrder.getRelationId())) {
+ UserExtraTaoBaoInfo extraInfo = userExtraTaoBaoInfoService.getByRelationId(taoBaoOrder.getRelationId());
+ if (extraInfo != null)
+ elmeOrder.setUid(extraInfo.getUser().getId());
+ }
+ return elmeOrder;
+ }
+
+ private void processElemeOrder(Map<String, List<TaoBaoOrder>> orders) {
+ for (Iterator<String> its = orders.keySet().iterator(); its.hasNext();) {
+ String orderId = its.next();
+ List<TaoBaoOrder> orderList = orders.get(orderId);
+ for (TaoBaoOrder taoBaoOrder : orderList) {
+ ElmeOrder elmeOrder = createElmeOrder(taoBaoOrder);
+ try {
+ elmeOrderProcessService.processOrder(elmeOrder);
+ } catch (ElmeOrderException e) {
+ e.printStackTrace();
+ }
+
+ }
+ }
}
@Override
@@ -345,7 +413,8 @@
|| hb.getPreGetTime().getTime() > System.currentTimeMillis())
continue;
try {
- CMQManager.getInstance().addFanLiMsgNew(hb);
+ if (Constant.ENABLE_MQ)
+ CMQManager.getInstance().addFanLiMsgNew(hb);
} catch (Exception e) {
try {
LogHelper.errorDetailInfo(e);
@@ -360,10 +429,15 @@
private HongBaoOrderMapper hongBaoOrderMapper;
@Override
- @Transactional
+ @Transactional(rollbackFor = Exception.class)
public void fanli(HongBaoV2 hb1) throws TaoBaoWeiQuanException {
// 鏌ヨ鏈�鏂扮殑绾㈠寘鏁版嵁
hb1 = hongBaoV2Mapper.selectByPrimaryKeyForUpdate(hb1.getId());
+
+ if (hb1 == null || hb1.getState() != HongBaoV2.STATE_KELINGQU || hb1.getPreGetTime() == null
+ || hb1.getPreGetTime().getTime() > System.currentTimeMillis())
+ return;
+
// 姝ｅ父鐢ㄦ埛鎵嶈兘鍒拌处
UserInfo mainUser = userInfoMapper.selectAvailableByPrimaryKey(hb1.getUserInfo().getId());
if (mainUser == null || mainUser.getState() != UserInfo.STATE_NORMAL) {
@@ -427,18 +501,27 @@
String key = mainUser.getId() + "-" + UUID.randomUUID().toString();
msg.setKey(key);
try {
- orderTransactionProducer.send(msg, new LocalTransactionExecuter() {
- @Override
- public TransactionStatus execute(Message arg0, Object arg1) {
- try {
- orderMoneySettleService.ziGouSettle(hongBaoOrder.getCommonOrder().getOrderNo(),
- hongBaoOrder.getCommonOrder().getSourceType(), key);
- return TransactionStatus.CommitTransaction;
- } catch (Exception e) {
- return TransactionStatus.RollbackTransaction;
+ if (!Constant.IS_TEST)
+ orderTransactionProducer.send(msg, new LocalTransactionExecuter() {
+ @Override
+ public TransactionStatus execute(Message arg0, Object arg1) {
+ try {
+ orderMoneySettleService.ziGouSettle(hongBaoOrder.getCommonOrder().getOrderNo(),
+ hongBaoOrder.getCommonOrder().getSourceType(), key);
+ return TransactionStatus.CommitTransaction;
+ } catch (Exception e) {
+ e.printStackTrace();
+ return TransactionStatus.RollbackTransaction;
+ }
}
+ }, null);
+ else {
+ try {
+ orderMoneySettleService.ziGouSettle(hongBaoOrder.getCommonOrder().getOrderNo(),
+ hongBaoOrder.getCommonOrder().getSourceType(), key);
+ } catch (Exception e) {
}
- }, null);
+ }
} catch (Exception e) {
LogHelper.mqError(e.getMessage(), msg.getTopic(), msg.getTag(), new Gson().toJson(mqMsg));
}
@@ -450,7 +533,8 @@
for (TaoBaoWeiQuanOrder order : orderList) {
try {
if (order.getState().contains("缁存潈鎴愬姛")) {
- CMQManager.getInstance().addWeiQuanOrderMsg(order);
+ if (Constant.ENABLE_MQ)
+ CMQManager.getInstance().addWeiQuanOrderMsg(order);
}
} catch (Exception e) {
LogHelper.error("缁存潈璁㈠崟鍔犲叆鍒伴槦鍒楀嚭閿�:" + order != null ? new Gson().toJson(order) : null);
@@ -467,13 +551,8 @@
if (orderList != null && orderList.size() > 0 & !StringUtil.isNullOrEmpty(orderList.get(0).getSettlementTime()))
order.setJieSuanTime(
new Date(TimeUtil.convertToTimeTemp(orderList.get(0).getSettlementTime(), "yyyy-MM-dd HH:mm:ss")));
- // if (order.getJieSuanTime().getTime() >=
- // TimeUtil.convertToTimeTemp("2018-08-05", "yyyy-MM-dd")) {
- // return;
- // }
- // TODO 澶勭悊缁存潈鎴愬姛浣嗘槸宸插埌璐︾殑璁㈠崟
-
+ // 澶勭悊缁存潈鎴愬姛浣嗘槸宸插埌璐︾殑璁㈠崟
if (order.getJieSuanTime().getTime() > TimeUtil.convertToTimeTemp("2019-01-01", "yyyy-MM-dd")) {// 缁撶畻鏃堕棿鍦�2鏈�1鍙风殑寮�濮嬪鐞嗗凡鍒拌处浣嗘槸缁存潈鐨�
CommonOrder commonOrder = commonOrderService.selectBySourceTypeAndTradeId(Constant.SOURCE_TYPE_TAOBAO,
order.getOrderItemId());
@@ -484,15 +563,34 @@
TaoBaoWeiQuanDrawBack drawBack = taoBaoWeiQuanDrawBackService
.selectByOrderItemId(order.getOrderItemId());
if (drawBack == null) {// 杩樻湭鎵ｆ
+ OrderLogHelper.taoBaoWeiQuan("宸插埌璐︽湭鎵ｆ澶勭悊:瀛愯鍗曞彿:" + order.getOrderItemId());
try {
- taoBaoWeiQuanDrawBackService.doWeiQuanFanli(order.getOrderId());
+ taoBaoWeiQuanDrawBackService.doWeiQuanFanli(order.getOrderId(), true);
taoBaoWeiQuanDrawBackService.doWeiQuanShare(order.getOrderId());
taoBaoWeiQuanDrawBackService.doWeiQuanInvite(order.getOrderId());
} catch (TaoBaoWeiQuanException e) {
try {
- LogHelper.errorDetailInfo(e, null, "璁㈠崟鍙�:" + order.getOrderId());
+ LogHelper.errorDetailInfo(e, "鍒拌处鍚庡鐞嗙淮鏉冩墸娆惧嚭閿�", "璁㈠崟鍙�:" + order.getOrderId());
} catch (Exception e1) {
e1.printStackTrace();
+ }
+ }
+ } else {
+ // 鏌ヨ瀛愮孩鍖呮槸鍚﹀凡鍒拌处
+ List<HongBaoV2> children = hongBaoV2Service
+ .listChildrenById(hongBaoOrder.getHongBaoV2().getId());
+ for (HongBaoV2 hongBaoV2 : children) {
+ if (hongBaoV2.getState() == HongBaoV2.STATE_YILINGQU) {
+ try {
+ taoBaoWeiQuanDrawBackService.doWeiQuanInvite(order.getOrderId());
+ } catch (TaoBaoWeiQuanException e) {
+ try {
+ LogHelper.errorDetailInfo(e, "鍒拌处鍚庡鐞嗙淮鏉冩墸娆惧嚭閿�", "璁㈠崟鍙�:" + order.getOrderId());
+ } catch (Exception e1) {
+ e1.printStackTrace();
+ }
+ }
+ break;
}
}
}
@@ -502,65 +600,117 @@
}
@Override
- public void fanliInvaiteAndShare() {
- // 鏌ュ嚭閭�璇疯禋涓庡垎浜禋璇ヨ繑鍒╃殑鐢ㄦ埛ID
- List<Long> inviteAndShareUids = hongBaoV2Mapper.listUidCanBanlanceShareAndInvite(1000);
+ public void fanliPreInvaite(Date maxTime) {
+ // 鏌ュ嚭閭�璇疯禋鐨勭敤鎴稩D
+ List<Integer> typeList = new ArrayList<>();
+ typeList.add(HongBaoV2.TYPE_YIJI);
+ typeList.add(HongBaoV2.TYPE_ERJI);
+ typeList.add(HongBaoV2.TYPE_SHARE_YIJI);
+ typeList.add(HongBaoV2.TYPE_SHARE_ERJI);
+
+ long count = hongBaoV2Mapper.countUidCanBanlanceByTypeAndMaxTime(typeList, maxTime);
+ int pageSize = 1000;
+ int page = (int) (count % pageSize == 0 ? count / pageSize : count / pageSize + 1);
Set<Long> uidSets = new HashSet<>();
- if (inviteAndShareUids != null)
- for (Long uid : inviteAndShareUids) {
- if (userInfoMapper.selectAvailableByPrimaryKey(uid) != null)
- uidSets.add(uid);
- }
+ for (int i = 0; i < page; i++) {
+ List<Long> inviteAndShareUids = hongBaoV2Mapper.listUidCanBanlanceByTypeAndMaxTime(typeList, maxTime,
+ i * pageSize, pageSize);
+ if (inviteAndShareUids != null)
+ for (Long uid : inviteAndShareUids) {
+ if (userInfoMapper.selectAvailableByPrimaryKey(uid) != null)
+ uidSets.add(uid);
+ }
+ }
// 鏍规嵁鐢ㄦ埛ID
Iterator<Long> its = uidSets.iterator();
while (its.hasNext()) {
Long uid = its.next();
try {
- CMQManager.getInstance().addFanLiTiChengMsg(uid);
+ if (Constant.ENABLE_MQ)
+ TeamOrderCMQManager.getInstance().addFanLiTeamIncomePreMsg(new UidDateDTO(uid, maxTime));
} catch (Exception e) {
e.printStackTrace();
LogHelper.error(e);
}
}
+
}
@Override
- @Transactional
- public void fanliInvaiteAndShare(Long uid) throws TaoBaoWeiQuanException {
+ public void fanliShare(Date maxTime) {
+ // 鏌ュ嚭閭�璇疯禋鐨勭敤鎴稩D
+ List<Integer> typeList = new ArrayList<>();
+ typeList.add(HongBaoV2.TYPE_SHARE_GOODS);
+
+ long count = hongBaoV2Mapper.countUidCanBanlanceByTypeAndMaxTime(typeList, maxTime);
+ int pageSize = 1000;
+ int page = (int) (count % pageSize == 0 ? count / pageSize : count / pageSize + 1);
+ Set<Long> uidSets = new HashSet<>();
+ for (int i = 0; i < page; i++) {
+ List<Long> inviteAndShareUids = hongBaoV2Mapper.listUidCanBanlanceByTypeAndMaxTime(typeList, maxTime,
+ i * pageSize, pageSize);
+ if (inviteAndShareUids != null)
+ for (Long uid : inviteAndShareUids) {
+ if (userInfoMapper.selectAvailableByPrimaryKey(uid) != null)
+ uidSets.add(uid);
+ }
+ }
+ // 鏍规嵁鐢ㄦ埛ID
+ Iterator<Long> its = uidSets.iterator();
+ while (its.hasNext()) {
+ Long uid = its.next();
+ try {
+ if (Constant.ENABLE_MQ)
+ CMQManager.getInstance().addFanLiShareMsg(new UidDateDTO(uid, maxTime));
+ } catch (Exception e) {
+ e.printStackTrace();
+ LogHelper.error(e);
+ }
+ }
+
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void fanliPreInvaite(Long uid, Date maxPreGetTime) {
// 閭�璇疯禋鍒拌处
try {
- orderMoneySettleService.inviteSettleTB(uid);
- } catch (OrderMoneySettleException e) {
- e.printStackTrace();
- }
- //
- try {
- orderMoneySettleService.inviteSettleJD(uid);
- } catch (OrderMoneySettleException e) {
- e.printStackTrace();
- }
- //
- try {
- orderMoneySettleService.inviteSettlePDD(uid);
- } catch (OrderMoneySettleException e) {
- e.printStackTrace();
- }
-
- // 鍒嗕韩璧氬埌璐�
- try {
- orderMoneySettleService.shareSettleTB(uid);
+ orderMoneySettleService.inviteSettleTB(uid, maxPreGetTime);
} catch (OrderMoneySettleException e) {
e.printStackTrace();
}
try {
- orderMoneySettleService.shareSettleJD(uid);
+ orderMoneySettleService.inviteSettleJD(uid, maxPreGetTime);
} catch (OrderMoneySettleException e) {
e.printStackTrace();
}
- //
+
try {
- orderMoneySettleService.shareSettlePDD(uid);
+ orderMoneySettleService.inviteSettlePDD(uid, maxPreGetTime);
+ } catch (OrderMoneySettleException e) {
+ e.printStackTrace();
+ }
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void fanliShare(Long uid, Date maxPreGetTime) {
+ // 閭�璇疯禋鍒拌处
+ try {
+ orderMoneySettleService.shareSettleTB(uid, maxPreGetTime);
+ } catch (OrderMoneySettleException e) {
+ e.printStackTrace();
+ }
+
+ try {
+ orderMoneySettleService.shareSettleJD(uid, maxPreGetTime);
+ } catch (OrderMoneySettleException e) {
+ e.printStackTrace();
+ }
+
+ try {
+ orderMoneySettleService.shareSettlePDD(uid, maxPreGetTime);
} catch (OrderMoneySettleException e) {
e.printStackTrace();
}
@@ -587,9 +737,16 @@
if (oldOrder == null) {
Long targetUid = null;
if (pid.equalsIgnoreCase(TaoBaoConstant.TAOBAO_RELATION_AS_SPECIAL_PID)
- && !StringUtil.isNullOrEmpty(orderList.get(0).getRelationId())) {
+ && !StringUtil.isNullOrEmpty(orderList.get(0).getRelationId())) {// 澶勭悊闈炶繑鍒╁晢鍝佸簱鐨勫晢鍝�
targetUid = taoBaoBuyRelationMapService.selectUidByRelationId(orderList.get(0).getRelationId());
+ } else if (pid.equalsIgnoreCase(TaoBaoConstant.TAOBAO_ELEME_PID)
+ && !StringUtil.isNullOrEmpty(orderList.get(0).getRelationId())) {// 澶勭悊楗夸簡涔堢殑璁㈠崟
+ UserExtraTaoBaoInfo extraInfo = userExtraTaoBaoInfoService
+ .getByRelationId(orderList.get(0).getRelationId());
+ if (extraInfo != null) {
+ targetUid = extraInfo.getUser().getId();
+ }
} else if (!StringUtil.isNullOrEmpty(orderList.get(0).getSpecialId())) {
UserExtraTaoBaoInfo info = userExtraTaoBaoInfoService
.getBySpecialId(orderList.get(0).getSpecialId());
@@ -658,7 +815,8 @@
order.setOrderType(Constant.SOURCE_TYPE_TAOBAO);
order.setUserInfo(new UserInfo(uid));
try {
- PlaceOrderCMQManager.getInstance().addPlaceOrderMsg(order);
+ if (Constant.ENABLE_MQ)
+ PlaceOrderCMQManager.getInstance().addPlaceOrderMsg(order);
} catch (Exception e) {
}
}
@@ -708,7 +866,8 @@
order.setOrderType(Constant.SOURCE_TYPE_TAOBAO);
order.setUserInfo(new UserInfo(uid));
try {
- PlaceOrderCMQManager.getInstance().addPlaceOrderMsg(order);
+ if (Constant.ENABLE_MQ)
+ PlaceOrderCMQManager.getInstance().addPlaceOrderMsg(order);
} catch (Exception e) {
}
}
@@ -830,7 +989,8 @@
order.setOrderType(Constant.SOURCE_TYPE_JD);
order.setUserInfo(new UserInfo(uid));
try {
- PlaceOrderCMQManager.getInstance().addPlaceOrderMsg(order);
+ if (Constant.ENABLE_MQ)
+ PlaceOrderCMQManager.getInstance().addPlaceOrderMsg(order);
} catch (Exception e) {
}
}
@@ -861,7 +1021,8 @@
order.setOrderType(Constant.SOURCE_TYPE_JD);
order.setUserInfo(new UserInfo(uid));
try {
- PlaceOrderCMQManager.getInstance().addPlaceOrderMsg(order);
+ if (Constant.ENABLE_MQ)
+ PlaceOrderCMQManager.getInstance().addPlaceOrderMsg(order);
} catch (Exception e) {
}
}
@@ -970,7 +1131,8 @@
order.setOrderType(Constant.SOURCE_TYPE_PDD);
order.setUserInfo(new UserInfo(uid));
try {
- PlaceOrderCMQManager.getInstance().addPlaceOrderMsg(order);
+ if (Constant.ENABLE_MQ)
+ PlaceOrderCMQManager.getInstance().addPlaceOrderMsg(order);
} catch (Exception e) {
}
}
@@ -1003,7 +1165,8 @@
order.setOrderType(Constant.SOURCE_TYPE_PDD);
order.setUserInfo(new UserInfo(uid));
try {
- PlaceOrderCMQManager.getInstance().addPlaceOrderMsg(order);
+ if (Constant.ENABLE_MQ)
+ PlaceOrderCMQManager.getInstance().addPlaceOrderMsg(order);
} catch (Exception e) {
}
}
@@ -1087,6 +1250,23 @@
@Transactional(rollbackFor = Exception.class)
public void invalidHongBaoV2AndGiveGodenCorn(Long hongBaoId, Long uid, String orderId, int sourceType,
String beiZhu) throws Exception {
+ HongBaoOrder hongbaoOrder = hongBaoOrderMapper.selectByHongBaoId(hongBaoId);
+ if (hongbaoOrder != null) {
+ CommonOrder commonOrder = commonOrderService.selectByPrimaryKey(hongbaoOrder.getCommonOrder().getId());
+ if (commonOrder != null) {
+ if (commonOrder.getState() == CommonOrder.STATE_FK) {
+ CommonOrder updateOrder = new CommonOrder(commonOrder.getId());
+ updateOrder.setState(CommonOrder.STATE_SX);
+ updateOrder.setUpdateTime(new Date());
+ commonOrderService.updateByPrimaryKeySelective(updateOrder);
+ }
+ }
+ }
+
+ HongBaoV2 hongBao = hongBaoV2Service.selectByPrimaryKey(hongBaoId);
+ if (hongBao == null || hongBao.getState() == HongBaoV2.STATE_SHIXIAO)
+ return;
+
HongBaoV2 v2 = new HongBaoV2(hongBaoId);
v2.setState(HongBaoV2.STATE_SHIXIAO);
v2.setBeizhu(beiZhu);
@@ -1101,7 +1281,10 @@
update.setUpdateTime(new Date());
hongBaoV2Service.updateByPrimaryKeySelective(update);
}
- userSystemCouponService.systemGiveRewardCoupon(uid, 1, orderId, sourceType, "鍥犲晢瀹惰繚绾︽湭鑳界粨绠楄繑鍒╂垨鍟嗗宸茬粡鍏冲簵");
+
+ if (hongBao.getType() == HongBaoV2.TYPE_ZIGOU || hongBao.getType() == HongBaoV2.TYPE_SHARE_GOODS) {
+ userOrderMsgNotificationService.orderInvalidToBusinessRunning(uid, orderId, sourceType, hongBao.getType());
+ }
}
@Transactional
@@ -1118,7 +1301,7 @@
// 鏌ヨ涓荤孩鍖�
HongBaoOrder hongBaoOrder = hongBaoOrderMapper.selectByCommonOrderId(commonOrder.getId());
if (hongBaoOrder != null && hongBaoOrder.getHongBaoV2() != null) {
- if (hongBaoOrder.getHongBaoV2().getState() == HongBaoV2.STATE_BUKELINGQU) {
+ if (hongBaoOrder.getHongBaoV2().getState() == HongBaoV2.STATE_BUKELINGQU || hongBaoOrder.getHongBaoV2().getState() == HongBaoV2.STATE_SHIXIAO) {
// 璁㈠崟澶辨晥,璧犻�侀噾甯�
try {
invalidHongBaoV2AndGiveGodenCorn(hongBaoOrder.getHongBaoV2().getId(), hongBaoOrder.getHongBaoV2().getUserInfo().getId(), commonOrder.getOrderNo(), commonOrder.getSourceType(), "璁㈠崟鎴愬姛锛屽晢瀹舵湭鎵撴");
@@ -1144,6 +1327,9 @@
@Resource
private ElmeOrderService elmeOrderService;
+ @Resource
+ private ElmeOrderProcessService elmeOrderProcessService;
+
/**
* 鑾峰彇楗夸簡涔堝彲浠ヨ繑鍒╃殑绾㈠寘
*
@@ -1153,7 +1339,7 @@
public List<HongBaoV2> getCanBalanceElmeFanliHongBao() {
List<Integer> list = new ArrayList<>();
list.add(HongBaoV2.TYPE_ELME);
- return hongBaoV2Mapper.listCanBalanceHongBaoByTypeAndUid(list, null, null, 0, 1000);
+ return hongBaoV2Mapper.listCanBalanceHongBaoByTypeAndUid(list, null, null, new Date(), 0, 1000);
}
@Override
@@ -1190,9 +1376,6 @@
}
userMoneyService.addUserMoney(hongBao.getUserInfo().getId(), hongBao.getMoney(), detail);
BigDecimal balance = userInfoMapper.selectByPrimaryKey(hongBao.getUserInfo().getId()).getMyHongBao();
- // 娣诲姞娑堟伅
- userMoneyMsgNotificationService.elmeFanli(hongBao.getUserInfo().getId(), order.getOrderId(),
- hongBao.getMoney(), balance);
}
// 杩斿埄鍒拌处
}
@@ -1209,18 +1392,17 @@
@Transactional
private void addHongBaoWithMQ(List<CommonOrderAddResultDTO> commonOrderList, String orderId, Long uid,
int sourceType, int hongBaoType) {
-
final List<CommonOrder> coList = convertCommonOrder(commonOrderList);
- int resultCode = 0;
+ HongBaoAddResult result = null;
try {
long time = TimeUtil.convertToTimeTemp("2019-12-06", "yyyy-MM-dd");
if (!Constant.IS_TEST)
- time = TimeUtil.convertToTimeTemp("2020-01-01", "yyyy-MM-dd");
+ time = TimeUtil.convertToTimeTemp("2019-12-20", "yyyy-MM-dd");
if (coList.get(0).getThirdCreateTime().getTime() < time)
- resultCode = hongBaoV2Service.addHongBao(coList, hongBaoType);
+ result = hongBaoV2Service.addHongBao(coList, hongBaoType);
else
- resultCode = hongBaoV2AddManager.addHongBao(coList, hongBaoType);
+ result = hongBaoV2AddManager.addHongBao(coList, hongBaoType);
} catch (HongBaoException e) {
try {
LogHelper.errorDetailInfo(e, "addJDOrder鎴朼ddHongBao鍑洪敊", "璁㈠崟鍙�:" + orderId);
@@ -1230,12 +1412,13 @@
} catch (UserAccountException e) {
}
- if (resultCode == 1) {// 鍙彂閫佹柊澧炴秷鎭�
- OrderMQMsg mqMsg = new OrderMQMsg(orderId, sourceType, uid, OrderMQMsg.HANDLE_TYPE_ADD,
- isCommonOrderValid(coList), 0, new Date());
- Message msg = MQMsgBodyFactory.create(MQTopicName.TOPIC_ORDER, OrderTopicTagEnum.orderStatistic, mqMsg);
- producer.send(msg);
- }
+ if (!Constant.IS_TEST)
+ if (result.getResultCode() == HongBaoAddResult.CODE_ADD) {// 鍙彂閫佹柊澧炴秷鎭�
+ OrderMQMsg mqMsg = new OrderMQMsg(orderId, sourceType, uid, OrderMQMsg.HANDLE_TYPE_ADD,
+ isCommonOrderValid(coList), 0, new Date(), result.isMiandan());
+ Message msg = MQMsgBodyFactory.create(MQTopicName.TOPIC_ORDER, OrderTopicTagEnum.orderStatistic, mqMsg);
+ producer.send(msg);
+ }
}
/**
--
Gitblit v1.8.0