From c93dfa3912f0fed74faa2f5f3ef42c318a04a7a2 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期一, 13 四月 2020 11:04:14 +0800
Subject: [PATCH] 消息
---
fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderProcessServiceImpl.java | 29 +++++++++++++++++++++--------
1 files changed, 21 insertions(+), 8 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 737adf6..2a0c112 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
@@ -214,11 +214,14 @@
String pid = String.format("mm_%s_%s_%s", configList.get(0).getAccountId(),
list.get(0).getSourceMediaId(), list.get(0).getAdPositionId());
if ("楗夸簡涔�".equalsIgnoreCase(list.get(0).getOrderType())) {
- // 澶勭悊楗夸簡涔堣鍗�
- elmeOrderMap.put(orderId, list);
- }
-
- else {
+ // 楗夸簡涔堣鍗曞紑濮嬪綊鍏ュ埌娣樺疂璁㈠崟
+ if (TimeUtil.convertToTimeTemp(list.get(0).getCreateTime(), "yyyy-MM-dd HH:mm:ss") > TimeUtil
+ .convertToTimeTemp("2020-04-15", "yyyy-MM-dd")) {
+ fanliOrderMap.put(orderId, list);
+ } else {
+ elmeOrderMap.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);
@@ -668,9 +671,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());
@@ -739,7 +749,8 @@
order.setOrderType(Constant.SOURCE_TYPE_TAOBAO);
order.setUserInfo(new UserInfo(uid));
try {
- PlaceOrderCMQManager.getInstance().addPlaceOrderMsg(order);
+ if (!Constant.IS_TEST)
+ PlaceOrderCMQManager.getInstance().addPlaceOrderMsg(order);
} catch (Exception e) {
}
}
@@ -1182,7 +1193,9 @@
update.setUpdateTime(new Date());
hongBaoV2Service.updateByPrimaryKeySelective(update);
}
- userSystemCouponService.systemGiveRewardCoupon(uid, 1, orderId, sourceType, "鍥犲晢瀹惰繚绾︽湭鑳界粨绠楄繑鍒╂垨鍟嗗宸茬粡鍏冲簵");
+ // TODO 鍟嗗鍏冲簵璺戣矾闇�瑕佽禒閫侀噾甯�
+ // userSystemCouponService.systemGiveRewardCoupon(uid, 1, orderId,
+ // sourceType, "鍥犲晢瀹惰繚绾︽湭鑳界粨绠楄繑鍒╂垨鍟嗗宸茬粡鍏冲簵");
}
@Transactional
--
Gitblit v1.8.0