From ad9fbd2c18f280ef9bba47f28353d367cf2d94e8 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期二, 14 五月 2019 11:28:03 +0800
Subject: [PATCH] Merge branch 'div_12'
---
fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderProcessServiceImpl.java | 144 +++++++++++++++++++++++++++++++++++++-----------
1 files changed, 111 insertions(+), 33 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 bc4b21f..78ae16f 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
@@ -20,12 +20,9 @@
import com.yeshi.fanli.dao.mybatis.AccountMessageMapper;
import com.yeshi.fanli.dao.mybatis.HongBaoManageMapper;
import com.yeshi.fanli.dao.mybatis.HongBaoV2Mapper;
-import com.yeshi.fanli.dao.mybatis.MoneyRecordMapper;
-import com.yeshi.fanli.dao.mybatis.ThreeSaleGiftMapper;
import com.yeshi.fanli.dao.mybatis.UserInfoMapper;
import com.yeshi.fanli.dao.mybatis.money.UserMoneyDetailMapper;
import com.yeshi.fanli.dao.mybatis.order.HongBaoOrderMapper;
-import com.yeshi.fanli.dao.mybatis.order.OrderItemMapper;
import com.yeshi.fanli.dao.mybatis.order.OrderMapper;
import com.yeshi.fanli.dao.mybatis.share.PidUserMapper;
import com.yeshi.fanli.dao.mybatis.taobao.TaoBaoWeiQuanOrderMapper;
@@ -40,6 +37,7 @@
import com.yeshi.fanli.entity.taobao.PidUser;
import com.yeshi.fanli.entity.taobao.TaoBaoOrder;
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.HongBaoException;
import com.yeshi.fanli.exception.OrderItemException;
@@ -56,17 +54,22 @@
import com.yeshi.fanli.service.inter.order.OrderProcessService;
import com.yeshi.fanli.service.inter.order.OrderService;
import com.yeshi.fanli.service.inter.push.PushService;
+import com.yeshi.fanli.service.inter.taobao.TaoBaoBuyRelationMapService;
import com.yeshi.fanli.service.inter.taobao.TaoBaoOrderService;
import com.yeshi.fanli.service.inter.taobao.TaoBaoUnionConfigService;
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;
import com.yeshi.fanli.util.RedisManager;
import com.yeshi.fanli.util.StringUtil;
+import com.yeshi.fanli.util.TaoBaoConstant;
import com.yeshi.fanli.util.TimeUtil;
import com.yeshi.fanli.util.factory.UserMoneyDetailFactory;
+import com.yeshi.fanli.util.taobao.TaoKeOrderApiUtil;
@Service
public class OrderProcessServiceImpl implements OrderProcessService {
@@ -77,25 +80,14 @@
@Resource
private PidUserMapper pidUserMapper;
-
@Resource
private UserInfoMapper userInfoMapper;
-
- @Resource
- private OrderItemMapper orderItemMapper;
-
@Resource
private HongBaoManageMapper hongBaoManageMapper;
@Resource
private AccountMessageMapper accountMessageMapper;
-
- @Resource
- private MoneyRecordMapper moneyRecordMapper;
-
- @Resource
- private ThreeSaleGiftMapper threeSaleGiftMapper;
@Resource
private OrderService orderService;
@@ -145,6 +137,12 @@
@Resource
private UserSystemCouponService userSystemCouponService;
+ @Resource
+ private UserMoneyService userMoneyService;
+
+ @Resource
+ private TaoBaoBuyRelationMapService taoBaoBuyRelationMapService;
+
@Override
public void processOrder(Map<String, List<TaoBaoOrder>> orders) {
List<TaoBaoUnionConfig> configList = taoBaoUnionConfigService.getConfigByTypeCache(PidUser.TYPE_FANLI_ANDROID);
@@ -155,16 +153,19 @@
Map<String, List<TaoBaoOrder>> shareOrderMap = new HashMap<>();
while (its.hasNext()) {
String orderId = its.next();
+
if (orders.get(orderId) != null && orders.get(orderId).size() > 0) {
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).getRelationId())) {
- shareOrderMap.put(orderId, list);
- } else if (!StringUtil.isNullOrEmpty(list.get(0).getSpecialId())) {
+ 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 {
- String pid = String.format("mm_%s_%s_%s", configList.get(0).getAccountId(),
- list.get(0).getSourceMediaId(), list.get(0).getAdPositionId());
+
PidUser pidUser = pidUserMapper.selectByPid(pid);
if (pidUser != null && pidUser.getType() == PidUser.TYPE_SHARE_GOODS) {// 鍟嗗搧鍒嗕韩璁㈠崟
// List<PidOrder> pidOrderList = new ArrayList<>();
@@ -462,9 +463,9 @@
UserMoneyDetail userMoneyDetail = null;
// 鎻掑叆鏂扮増璧勯噾鏄庣粏
try {
+ // 姝ゅ涓嶇敤璁㈠崟鍙峰仛鍞竴鎬х储寮�
userMoneyDetail = UserMoneyDetailFactory.createFanLi(uid, hongBaoOrder.getCommonOrder().getOrderNo(),
hongBaoOrder.getCommonOrder().getSourceType(), null, money);
-
} catch (UserMoneyDetailException e1) {
try {
LogHelper.errorDetailInfo(e1, "璁㈠崟鍙�:" + hongBaoOrder.getCommonOrder().getOrderNo(), "");
@@ -473,13 +474,11 @@
}
}
- userMoneyDetailMapper.insert(userMoneyDetail);
+ userMoneyService.addUserMoney(uid, money, userMoneyDetail);
// 娣诲姞璧勯噾鏄庣粏涓庣孩鍖呯殑鏄犲皠鍏崇郴
for (HongBaoV2 v2 : userHongBao.get(uid)) {
accountDetailsHongBaoMapService.saveAccountDetailsHongBaoMap(v2.getId(), userMoneyDetail.getId());
}
- // 澧炲姞鐢ㄦ埛璧勯噾
- userInfoMapper.addHongBaoByUid(uid, money);
// 绔欏唴淇�+鎺ㄩ��
UserInfo user = userInfoMapper.selectByPrimaryKey(uid);
@@ -508,7 +507,40 @@
// 缁存潈鎵ｆ锛�2018-08-05鍚庡紑濮嬪疄琛岋級
if (hongBaoOrder.getCommonOrder().getSettleTime() != null && hongBaoOrder.getCommonOrder().getSettleTime()
.getTime() >= TimeUtil.convertToTimeTemp("2018-08-05", "yyyy-MM-dd")) {
- taoBaoWeiQuanDrawBackService.doWeiQuanFanli(hongBaoOrder.getCommonOrder().getOrderNo());
+ try {
+
+ taoBaoWeiQuanDrawBackService.doWeiQuanFanli(hongBaoOrder.getCommonOrder().getOrderNo());
+
+ } catch (TaoBaoWeiQuanException e) {
+ if (e.getCode() == TaoBaoWeiQuanException.CODE_NEDD_UPDATE_ORDER) {
+ List<TaoBaoOrder> olist = taoBaoOrderService
+ .getTaoBaoOrderByOrderId(hongBaoOrder.getCommonOrder().getOrderNo());
+
+ if (olist != null && olist.size() > 0) {
+ long time = TimeUtil.convertToTimeTemp(olist.get(0).getCreateTime(), "yyyy-MM-dd HH:mm:ss");
+ olist = TaoKeOrderApiUtil.getTaoBaoAllOrder(TimeUtil.getGernalTime(time, "yyyy-MM-dd HH:mm:ss"),
+ TaoBaoConstant.TAOBAO_AUTH_APPKEY, TaoBaoConstant.TAOBAO_AUTH_APPSECRET);
+ List<TaoBaoOrder> thirdOList = TaoKeOrderApiUtil.getTaoBaoThirdAllOrder(
+ TimeUtil.getGernalTime(time, "yyyy-MM-dd HH:mm:ss"), 30, 1,
+ TaoBaoConstant.TAOBAO_AUTH_APPKEY, TaoBaoConstant.TAOBAO_AUTH_APPSECRET);
+ if (thirdOList != null && thirdOList.size() > 0)
+ olist.addAll(thirdOList);
+
+ if (olist != null && olist.size() > 0) {
+ for (int i = 0; i < olist.size(); i++) {
+ if (!olist.get(i).getOrderId()
+ .equalsIgnoreCase(hongBaoOrder.getCommonOrder().getOrderNo())) {// 鍒犻櫎鏃犲叧璁㈠崟
+ olist.remove(i);
+ i--;
+ }
+ }
+
+ taoBaoOrderService.addTaoBaoOrderList(olist);
+ }
+ }
+ } else
+ throw new TaoBaoWeiQuanException(e.getCode(), e.getMsg());
+ }
}
}
@@ -532,8 +564,37 @@
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;
+ // 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());
+ if (commonOrder != null && !StringUtil.isNullOrEmpty(commonOrder.getTradeId())) {
+ HongBaoOrder hongBaoOrder = hongBaoOrderMapper.selectByCommonOrderId(commonOrder.getId());
+ if (hongBaoOrder != null && hongBaoOrder.getHongBaoV2() != null
+ && hongBaoOrder.getHongBaoV2().getState() == HongBaoV2.STATE_YILINGQU) {// 宸茬粡鍒拌处鐨勭湅鏄惁闇�瑕佹墸娆�
+ TaoBaoWeiQuanDrawBack drawBack = taoBaoWeiQuanDrawBackService
+ .selectByOrderItemId(order.getOrderItemId());
+ if (drawBack == null) {// 杩樻湭鎵ｆ
+ try {
+ taoBaoWeiQuanDrawBackService.doWeiQuanFanli(order.getOrderId());
+ taoBaoWeiQuanDrawBackService.doWeiQuanShare(order.getOrderId());
+ taoBaoWeiQuanDrawBackService.doWeiQuanInvite(order.getOrderId());
+ } catch (TaoBaoWeiQuanException e) {
+ try {
+ LogHelper.errorDetailInfo(e, null, "璁㈠崟鍙�:" + order.getOrderId());
+ } catch (Exception e1) {
+ e1.printStackTrace();
+ }
+ }
+ }
+ }
+ }
}
}
@@ -717,7 +778,7 @@
// 鏂扮増閫氱煡
userMoneyMsgNotificationService.inviteOrderReceived(uid, inviteOrders.size(), inviteGoodsCount, invitemoney,
- userInfoMapper.selectByPrimaryKey(uid).getMyHongBao());
+ userInfoMapper.selectByPKey(uid).getMyHongBao());
for (String orderId : drawBackOrders)
taoBaoWeiQuanDrawBackService.doWeiQuanInvite(orderId);
@@ -755,8 +816,10 @@
// 2018-08-05 杩囧悗鐨勮鍗曟墠澶勭悊缁存潈
Date balanceTime = null;
HongBaoOrder hongBaoOrder = hongBaoOrderMapper.selectByHongBaoId(hongBao.getId());
- if (hongBaoOrder != null)
+ if (hongBaoOrder != null) {
balanceTime = hongBaoOrder.getCommonOrder().getSettleTime();
+ shareGoodsCount += hongBaoOrder.getCommonOrder().getCount();
+ }
shareOrders.add(hongBaoOrder.getCommonOrder().getOrderNo());
if (balanceTime != null
&& balanceTime.getTime() >= TimeUtil.convertToTimeTemp("2018-08-05", "yyyy-MM-dd")) {
@@ -831,6 +894,11 @@
@Override
public void processShopingFanliOrderNew(String orderId, List<TaoBaoOrder> orderList)
throws HongBaoException, OrderItemException {
+
+ LogHelper.test(String.format("璁㈠崟澶勭悊:璁㈠崟鍙�-%s 璁㈠崟鏁伴噺-%s", orderId, orderList.size() + ""));
+ if (orderList.size() == 1)
+ LogHelper.test("璁㈠崟鎺掑簭鍊�:" + orderList.get(0).getOrderBy());
+
List<TaoBaoUnionConfig> configList = taoBaoUnionConfigService.getConfigByTypeCache(PidUser.TYPE_FANLI_ANDROID);
if (orderList != null && orderList.size() > 0) {
@@ -859,10 +927,21 @@
orderMapper.insertSelective(order);
oldOrder = order;
} else {
- UserExtraTaoBaoInfo info = userExtraTaoBaoInfoService
- .getBySpecialId(orderList.get(0).getSpecialId());
- if (info != null && info.getUser() != null) {
- uid = info.getUser().getId();
+
+ Long targetUid = null;
+ if (pid.equalsIgnoreCase(TaoBaoConstant.TAOBAO_RELATION_AS_SPECIAL_PID)
+ && !StringUtil.isNullOrEmpty(orderList.get(0).getRelationId())) {
+ targetUid = taoBaoBuyRelationMapService.selectUidByRelationId(orderList.get(0).getRelationId());
+
+ } else if (!StringUtil.isNullOrEmpty(orderList.get(0).getSpecialId())) {
+ UserExtraTaoBaoInfo info = userExtraTaoBaoInfoService
+ .getBySpecialId(orderList.get(0).getSpecialId());
+ if (info != null && info.getUser() != null)
+ targetUid = info.getUser().getId();
+ }
+
+ if (targetUid != null) {
+ uid = targetUid;
// 鎻掑叆鍒癘rder涓�
// 娣诲姞鍒拌鍗曚腑鍘�
Order order = new Order();
@@ -957,7 +1036,6 @@
e1.printStackTrace();
}
}
-
}
}
--
Gitblit v1.8.0