From d3a9feeeee6f70462d12e48db5fd1cab9b183bc8 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期二, 17 九月 2019 17:14:54 +0800
Subject: [PATCH] 更改goodsType
---
fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderProcessServiceImpl.java | 395 ++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 341 insertions(+), 54 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 5304b5b..734ef51 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
@@ -16,7 +16,9 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional;
+import org.yeshi.utils.NumberUtil;
+import com.google.gson.Gson;
import com.yeshi.fanli.dao.mybatis.HongBaoV2Mapper;
import com.yeshi.fanli.dao.mybatis.UserInfoMapper;
import com.yeshi.fanli.dao.mybatis.money.UserMoneyDetailMapper;
@@ -24,6 +26,7 @@
import com.yeshi.fanli.dao.mybatis.order.OrderMapper;
import com.yeshi.fanli.dao.mybatis.taobao.TaoBaoWeiQuanOrderMapper;
import com.yeshi.fanli.dto.HongBao;
+import com.yeshi.fanli.dto.order.CommonOrderAddResultDTO;
import com.yeshi.fanli.entity.bus.user.HongBaoV2;
import com.yeshi.fanli.entity.bus.user.Order;
import com.yeshi.fanli.entity.bus.user.UserExtraTaoBaoInfo;
@@ -39,31 +42,35 @@
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;
-import com.yeshi.fanli.exception.TaoBaoWeiQuanException;
import com.yeshi.fanli.exception.money.UserMoneyDetailException;
import com.yeshi.fanli.exception.order.CommonOrderException;
+import com.yeshi.fanli.exception.order.HongBaoException;
+import com.yeshi.fanli.exception.order.OrderItemException;
+import com.yeshi.fanli.exception.order.TaoBaoWeiQuanException;
import com.yeshi.fanli.log.LogHelper;
import com.yeshi.fanli.service.inter.hongbao.AccountDetailsHongBaoMapService;
-import com.yeshi.fanli.service.inter.hongbao.HongBaoV2Service;
-import com.yeshi.fanli.service.inter.msg.UserMoneyMsgNotificationService;
+import com.yeshi.fanli.service.inter.money.UserMoneyService;
+import com.yeshi.fanli.service.inter.money.msg.UserMoneyMsgNotificationService;
+import com.yeshi.fanli.service.inter.money.tb.TaoBaoWeiQuanDrawBackService;
import com.yeshi.fanli.service.inter.order.CommonOrderService;
+import com.yeshi.fanli.service.inter.order.HongBaoV2Service;
import com.yeshi.fanli.service.inter.order.LostOrderService;
import com.yeshi.fanli.service.inter.order.OrderProcessService;
+import com.yeshi.fanli.service.inter.order.jd.JDOrderService;
+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.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.UserSystemCouponService;
+import com.yeshi.fanli.service.inter.user.tb.UserExtraTaoBaoInfoService;
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.HongBaoRecieveCMQManager;
+import com.yeshi.fanli.util.cmq.PlaceOrderCMQManager;
import com.yeshi.fanli.util.factory.UserMoneyDetailFactory;
import com.yeshi.fanli.util.jd.JDApiUtil;
import com.yeshi.fanli.util.pinduoduo.PinDuoDuoApiUtil;
@@ -122,6 +129,43 @@
@Resource
private HongBaoV2Service hongBaoV2Service;
+
+ @Resource
+ private JDOrderService jdOrderService;
+
+ @Resource
+ private PDDOrderService pddOrderService;
+
+ /**
+ * 鏄惁鏄垎浜鍗�
+ *
+ * @param order
+ * @return
+ */
+ private boolean isShareOrder(TaoBaoOrder order) {
+ List<TaoBaoUnionConfig> configList = taoBaoUnionConfigService.getConfigByTypeCache(PidUser.TYPE_FANLI_ANDROID);
+ String pid = String.format("mm_%s_%s_%s", configList.get(0).getAccountId(), order.getSourceMediaId(),
+ order.getAdPositionId());
+ if (!StringUtil.isNullOrEmpty(order.getSpecialId())
+ || pid.equalsIgnoreCase(TaoBaoConstant.TAOBAO_RELATION_AS_SPECIAL_PID)) {// 璁剧疆娓犻亾ID褰撳仛浼氬憳杩愯惀ID鐨勪綅缃甀D
+ return false;
+ } else if (!StringUtil.isNullOrEmpty(order.getRelationId())) {
+ return true;
+ } else {
+ // 閫氳繃绾㈠寘鏌ヨ
+ CommonOrder commonOrder = commonOrderService.selectBySourceTypeAndTradeId(Constant.SOURCE_TYPE_TAOBAO,
+ order.getTradeId());
+
+ if (commonOrder != null) {
+ HongBaoOrder hongBaoOrder = hongBaoOrderMapper.selectByCommonOrderId(commonOrder.getId());
+ if (hongBaoOrder != null && hongBaoOrder.getHongBaoV2() != null
+ && hongBaoOrder.getHongBaoV2().getType() == HongBaoV2.TYPE_SHARE_GOODS) {
+ return true;
+ }
+ }
+ return false;
+ }
+ }
@Override
public synchronized void processOrder(Map<String, List<TaoBaoOrder>> orders) {
@@ -227,8 +271,9 @@
@Override
public void fanli() {
+ LogHelper.test("澶勭悊杩斿埄鍒拌处");
// 鑾峰彇涓荤孩鍖�
- List<HongBaoV2> hongBaoList = hongBaoV2Mapper.listCanBalanceHongBaoByType(HongBao.TYPE_TAOBAO, 100);
+ List<HongBaoV2> hongBaoList = hongBaoV2Mapper.listCanBalanceHongBaoByType(HongBaoV2.TYPE_ZIGOU, 1000);
//
// /**
// * 闇�瑕佸疄鏃舵洿鏂板緟杩斿埄鐨勮鍗�
@@ -292,12 +337,32 @@
public void fanli(HongBaoV2 hb1) throws TaoBaoWeiQuanException {
// 鏌ヨ鏈�鏂扮殑绾㈠寘鏁版嵁
hb1 = hongBaoV2Mapper.selectByPrimaryKeyForUpdate(hb1.getId());
+ // 姝ｅ父鐢ㄦ埛鎵嶈兘鍒拌处
+ UserInfo mainUser = userInfoMapper.selectAvailableByPrimaryKey(hb1.getUserInfo().getId());
+ if (mainUser == null || mainUser.getState() != UserInfo.STATE_NORMAL) {
+ return;
+ }
// 鏌ヨ绾㈠寘鐩稿叧鑱旂殑璁㈠崟
HongBaoOrder hongBaoOrder = hongBaoOrderMapper.selectByHongBaoId(hb1.getId());
if (hongBaoOrder == null) {
LogHelper.error("杩斿埄澶辫触:" + hb1.getId());
return;
}
+
+ if (hongBaoOrder.getCommonOrder() == null) {// ||
+ // hongBaoOrder.getCommonOrder().getSourceType()
+ // ==
+ // Constant.SOURCE_TYPE_JD
+ // || hongBaoOrder.getCommonOrder().getSourceType() ==
+ // Constant.SOURCE_TYPE_PDD
+ return;
+ }
+
+ // 濡傛灉鏄嫾澶氬/浜笢缁存潈鍒欒繑鍥烇紝涓嶉渶瑕佽繑鍒�
+ if ((hongBaoOrder.getCommonOrder().getSourceType() == Constant.SOURCE_TYPE_PDD
+ || hongBaoOrder.getCommonOrder().getSourceType() == Constant.SOURCE_TYPE_JD)
+ && hongBaoOrder.getCommonOrder().getState() == CommonOrder.STATE_WQ)
+ return;
if (hongBaoOrder.getCommonOrder() != null
&& hongBaoOrder.getCommonOrder().getSourceType() == Constant.SOURCE_TYPE_TAOBAO) {
@@ -389,10 +454,15 @@
// 娣诲姞璧勯噾鏄庣粏涓庣孩鍖呯殑鏄犲皠鍏崇郴
for (HongBaoV2 v2 : userHongBao.get(uid)) {
accountDetailsHongBaoMapService.saveAccountDetailsHongBaoMap(v2.getId(), userMoneyDetail.getId());
+ try {
+ HongBaoRecieveCMQManager.getInstance().addHongBaoRecieveMsg(v2.getId());
+ } catch (Exception e) {
+ LogHelper.errorDetailInfo(e);
+ }
}
// 绔欏唴淇�+鎺ㄩ��
- UserInfo user = userInfoMapper.selectByPKey(uid);
+ UserInfo user = userInfoMapper.selectByPrimaryKey(uid);
// 鏂扮増閫氱煡
userMoneyMsgNotificationService.fanliOrderReceived(uid, hongBaoOrder.getCommonOrder().getOrderNo(),
@@ -419,10 +489,12 @@
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);
+ TaoBaoConstant.TAOBAO_AUTH_APPKEY, TaoBaoConstant.TAOBAO_AUTH_APPSECRET,
+ TaoKeOrderApiUtil.TK_STATUS_ALL);
List<TaoBaoOrder> thirdOList = TaoKeOrderApiUtil.getTaoBaoThirdAllOrder(
TimeUtil.getGernalTime(time, "yyyy-MM-dd HH:mm:ss"), 30, 1,
- TaoBaoConstant.TAOBAO_AUTH_APPKEY, TaoBaoConstant.TAOBAO_AUTH_APPSECRET);
+ TaoKeOrderApiUtil.TK_STATUS_ALL, TaoBaoConstant.TAOBAO_AUTH_APPKEY,
+ TaoBaoConstant.TAOBAO_AUTH_APPSECRET);
if (thirdOList != null && thirdOList.size() > 0)
olist.addAll(thirdOList);
@@ -449,8 +521,12 @@
public void weiQuanOrder(List<TaoBaoWeiQuanOrder> orderList) {
if (orderList != null)
for (TaoBaoWeiQuanOrder order : orderList) {
- if (order.getState().contains("缁存潈鎴愬姛")) {
- CMQManager.getInstance().addWeiQuanOrderMsg(order);
+ try {
+ if (order.getState().contains("缁存潈鎴愬姛")) {
+ CMQManager.getInstance().addWeiQuanOrderMsg(order);
+ }
+ } catch (Exception e) {
+ LogHelper.error("缁存潈璁㈠崟鍔犲叆鍒伴槦鍒楀嚭閿�:" + order != null ? new Gson().toJson(order) : null);
}
}
}
@@ -546,6 +622,7 @@
@Override
@Transactional
public void fanliInvaiteAndShare(Long uid) throws TaoBaoWeiQuanException {
+ List<Long> recieveHongBaoIds = new ArrayList<>();
/**
* 澶勭悊閭�璇疯禋璁㈠崟
*/
@@ -553,7 +630,37 @@
List<Integer> types = new ArrayList<>();
types.add(HongBaoV2.TYPE_YIJI);
types.add(HongBaoV2.TYPE_ERJI);
- List<HongBaoV2> hongBaoList = hongBaoV2Mapper.listCanBalanceHongBaoByTypeAndUid(types, uid, 1000);
+ long count = hongBaoV2Mapper.countCanBalanceHongBaoByTypeAndUid(types, uid);
+ List<HongBaoV2> hongBaoList = new ArrayList<>();
+ // 1000鏉℃暟鎹负1椤�
+ int page = (int) (count % 1000 == 0 ? count / 1000 : count / 1000 + 1);
+ for (int i = 0; i < page; i++) {
+ List<HongBaoV2> tempHongBaoList = hongBaoV2Mapper.listCanBalanceHongBaoByTypeAndUid(types, uid, i * 1000,
+ 1000);
+ if (tempHongBaoList != null && tempHongBaoList.size() > 0)
+ hongBaoList.addAll(tempHongBaoList);
+ }
+ // 鐏板害娴嬭瘯涓紝浜笢/鎷煎澶氳鍗曞垎浜�/閭�璇疯鍗曚笉杩斿埄
+ for (int i = 0; i < hongBaoList.size(); i++) {
+ HongBaoV2 item = hongBaoList.get(i);
+ if (item.getType() == HongBaoV2.TYPE_SHARE_GOODS) {
+ } else {
+ item = item.getParent();
+ }
+ if (item != null) {
+ HongBaoOrder hongBaoOrder = hongBaoOrderMapper.selectByHongBaoId(item.getId());
+ if (hongBaoOrder != null && hongBaoOrder.getCommonOrder() != null) {
+ CommonOrder co = hongBaoOrder.getCommonOrder();
+ // 涓婄骇鐢ㄦ埛涓嶆槸姝ｅ父鐢ㄦ埛锛岃鍗曞潎涓嶈兘鍒拌处
+ UserInfo userInfo = userInfoMapper.selectAvailableByPrimaryKey(co.getUserInfo().getId());
+ if (userInfo == null || userInfo.getState() != UserInfo.STATE_NORMAL) {
+ hongBaoList.remove(i);
+ i--;
+ }
+
+ }
+ }
+ }
List<Long> hbIdList = new ArrayList<>();
@@ -605,7 +712,8 @@
types.clear();
types.add(HongBaoV2.TYPE_SHARE_YIJI);
types.add(HongBaoV2.TYPE_SHARE_ERJI);
- List<HongBaoV2> hbList = hongBaoV2Mapper.listCanBalanceHongBaoByTypeAndUid(types, uid, 10000);
+ // TODO 闇�瑕佸鐞嗚秴杩�1w鏉℃暟鎹殑璁㈠崟
+ List<HongBaoV2> hbList = hongBaoV2Mapper.listCanBalanceHongBaoByTypeAndUid(types, uid, 0, 10000);
if (hbList != null && hbList.size() > 0)
totalHongBaoList.addAll(hbList);
@@ -650,11 +758,9 @@
minDate, maxDate);
long weiQuanCount = hongBaoV2Mapper.countInviteOrderCountByUidAndSettleTime(uid, CommonOrder.STATE_WQ,
minDate, maxDate);
- long invalidCount = hongBaoV2Mapper.countInviteOrderCountByUidAndSettleTime(uid, CommonOrder.STATE_SX,
- minDate, maxDate);
UserMoneyDetail userMoneyDetail = UserMoneyDetailFactory.createInvite(uid, Constant.SOURCE_TYPE_TAOBAO,
- (int) validCount, (int) weiQuanCount, (int) invalidCount, invitemoney, new Date());
+ (int) validCount, (int) weiQuanCount, invitemoney, new Date());
// 澧炲姞璧勯噾
userMoneyService.addUserMoney(uid, invitemoney, userMoneyDetail);
@@ -670,12 +776,13 @@
// 鏂扮増閫氱煡
userMoneyMsgNotificationService.inviteOrderReceived(uid, Constant.SOURCE_TYPE_TAOBAO, inviteOrders.size(),
- inviteGoodsCount, invitemoney, userInfoMapper.selectByPKey(uid).getMyHongBao());
+ inviteGoodsCount, invitemoney, userInfoMapper.selectByPrimaryKey(uid).getMyHongBao());
for (String orderId : drawBackOrders)
taoBaoWeiQuanDrawBackService.doWeiQuanInvite(orderId);
}
-
+ if (hbIdList.size() > 0)
+ recieveHongBaoIds.addAll(hbIdList);
hbIdList.clear();
drawBackOrders.clear();
@@ -689,7 +796,8 @@
// 鏌ヨUID鐨勫垎浜禋璁㈠崟
types.clear();
types.add(HongBaoV2.TYPE_SHARE_GOODS);
- List<HongBaoV2> hongBaoShareList = hongBaoV2Mapper.listCanBalanceHongBaoByTypeAndUid(types, uid, 10000);
+ // TODO 闇�瑕佸鐞嗚秴杩�10000鏉℃暟鎹殑璁㈠崟
+ List<HongBaoV2> hongBaoShareList = hongBaoV2Mapper.listCanBalanceHongBaoByTypeAndUid(types, uid, 0, 10000);
for (HongBaoV2 hongBao : hongBaoShareList) {
hongBao = hongBaoV2Mapper.selectByPrimaryKeyForUpdate(hongBao.getId());
hongBao = filterWeiQuanINGHongBao(hongBao);
@@ -736,20 +844,22 @@
Date minDate = new Date(TimeUtil
.convertToTimeTemp(ca.get(Calendar.YEAR) + "-" + (ca.get(Calendar.MONTH) + 1), "yyyy-M"));
- long validCount = commonOrderService.countByUidAndOrderStateWithOrderBalanceTime(uid,
- CommonOrder.STATE_JS, minDate, maxDate);
- long weiQuanCount = commonOrderService.countByUidAndOrderStateWithOrderBalanceTime(uid,
- CommonOrder.STATE_WQ, minDate, maxDate);
- long invalidCount = commonOrderService.countByUidAndOrderStateWithOrderBalanceTime(uid,
- CommonOrder.STATE_SX, minDate, maxDate);
+ long validCount = hongBaoV2Mapper.countShareOrderCountByUidAndSettleTime(uid, CommonOrder.STATE_JS,
+ minDate, maxDate);
+ long weiQuanCount = hongBaoV2Mapper.countShareOrderCountByUidAndSettleTime(uid, CommonOrder.STATE_WQ,
+ minDate, maxDate);
+ long invalidCount = hongBaoV2Mapper.countShareOrderCountByUidAndSettleTime(uid, CommonOrder.STATE_SX,
+ minDate, maxDate);
UserMoneyDetail userMoneyDetail = UserMoneyDetailFactory.createShare(uid, Constant.SOURCE_TYPE_TAOBAO,
- (int) validCount, (int) weiQuanCount, (int) invalidCount, sharemoney, new Date());
+ (int) validCount, (int) weiQuanCount, sharemoney, new Date());
// 娣诲姞璧勯噾
userMoneyService.addUserMoney(uid, sharemoney, userMoneyDetail);
// 娣诲姞鍒扮孩鍖呰繑鍒╄褰曢泦鍚�
accountDetailsHongBaoMapService.saveAccountDetailsHongBaoMap(hbIdList, userMoneyDetail.getId());
+ if (hbIdList.size() > 0)
+ recieveHongBaoIds.addAll(hbIdList);
} catch (UserMoneyDetailException e) {
try {
LogHelper.errorDetailInfo(e);
@@ -760,10 +870,20 @@
// 鏂扮増閫氱煡
userMoneyMsgNotificationService.shareOrderReceived(uid, Constant.SOURCE_TYPE_TAOBAO, shareOrders.size(),
- shareGoodsCount, sharemoney, userInfoMapper.selectByPrimaryKey(uid).getMyHongBao());
+ shareGoodsCount, sharemoney, userInfoMapper.selectAvailableByPrimaryKey(uid).getMyHongBao());
for (String orderId : drawBackOrders)
taoBaoWeiQuanDrawBackService.doWeiQuanShare(orderId);
+ }
+
+ // 鎵�鏈夌殑杩斿埄鍒拌处绾㈠寘ID
+ for (Long hongBaoId : recieveHongBaoIds) {
+ try {
+ HongBaoRecieveCMQManager.getInstance().addHongBaoRecieveMsg(hongBaoId);
+ } catch (Exception e) {
+ LogHelper.errorDetailInfo(e);
+ }
+
}
}
@@ -868,11 +988,21 @@
orderMapper.updateByPrimaryKeySelective(updateOrder);
// 鐢ㄧ涓�涓瓙璁㈠崟閿佸畾鐢ㄦ埛
- List<CommonOrder> commonOrderList = null;
+ List<CommonOrderAddResultDTO> commonOrderList = null;
try {
commonOrderList = commonOrderService.addTaoBaoOrder(orderList, uid);
- hongBaoV2Service.addHongBao(commonOrderList, HongBaoV2.TYPE_ZIGOU);
+ hongBaoV2Service.addHongBao(convertCommonOrder(commonOrderList), HongBaoV2.TYPE_ZIGOU);
+ if (isCommonOrderAllAdd(commonOrderList)) {
+ Order order = new Order();
+ order.setOrderId(orderId);
+ order.setOrderType(Constant.SOURCE_TYPE_TAOBAO);
+ order.setUserInfo(new UserInfo(uid));
+ try {
+ PlaceOrderCMQManager.getInstance().addPlaceOrderMsg(order);
+ } catch (Exception e) {
+ }
+ }
} catch (CommonOrderException e) {
try {
LogHelper.errorDetailInfo(e, "addTaoBaoOrder鎴朼ddHongBao鍑洪敊", "璁㈠崟鍙�:" + orderId);
@@ -920,8 +1050,18 @@
// 鐢ㄧ涓�涓瓙璁㈠崟閿佸畾鐢ㄦ埛
try {
- List<CommonOrder> commonOrders = commonOrderService.addTaoBaoOrder(orderList, uid);
- hongBaoV2Service.addHongBao(commonOrders, HongBaoV2.TYPE_SHARE_GOODS);
+ List<CommonOrderAddResultDTO> commonOrders = commonOrderService.addTaoBaoOrder(orderList, uid);
+ hongBaoV2Service.addHongBao(convertCommonOrder(commonOrders), HongBaoV2.TYPE_SHARE_GOODS);
+ if (isCommonOrderAllAdd(commonOrders)) {
+ Order order = new Order();
+ order.setOrderId(orderId);
+ order.setOrderType(Constant.SOURCE_TYPE_TAOBAO);
+ order.setUserInfo(new UserInfo(uid));
+ try {
+ PlaceOrderCMQManager.getInstance().addPlaceOrderMsg(order);
+ } catch (Exception e) {
+ }
+ }
} catch (CommonOrderException e) {
e.printStackTrace();
} catch (HongBaoException e1) {
@@ -930,13 +1070,34 @@
}
}
+ /**
+ * 鏄惁涓哄垎浜鍗�
+ *
+ * @param order
+ * @return
+ */
+ private boolean isShareOrder(JDOrder order) {
+ if (order == null || order.getOrderItemList() == null || order.getOrderItemList().size() == 0)
+ return false;
+ Long positionId = order.getOrderItemList().get(0).getPositionId();
+ if (positionId == JDApiUtil.POSITION_SHARE) {// 鍒嗕韩璁㈠崟
+ return true;
+ }
+ return false;
+ }
+
@Override
public void processJDOrder(JDOrder order) {
if (order == null || order.getOrderItemList() == null || order.getOrderItemList().size() == 0)
return;
+
+ // 鎷嗗崟鐨勪笉鍋氬鐞�
+ if (order.getValidCode() == 2)
+ return;
+
String uidStr = order.getExt1();
Long uid = null;
- if (!StringUtil.isNullOrEmpty(uidStr))
+ if (!StringUtil.isNullOrEmpty(uidStr) && NumberUtil.isNumeric(uidStr))
uid = Long.parseLong(uidStr);
Long positionId = order.getOrderItemList().get(0).getPositionId();
if (positionId == JDApiUtil.POSITION_FANLI)// 杩斿埄璁㈠崟
@@ -954,6 +1115,7 @@
/**
* 澶勭悊浜笢杩斿埄璁㈠崟
+ *
* @param jdOrder
* @param uid
*/
@@ -978,7 +1140,7 @@
// 鍔犲叆璁㈠崟
Order oldOrder = orderMapper.selectOrderByOrderIdAndOrderType(jdOrder.getOrderId() + "",
Constant.SOURCE_TYPE_JD);
- if (uid == null && oldOrder.getBeizhu().contains("琛ュ崟"))
+ if (uid == null && oldOrder != null && oldOrder.getBeizhu() != null && oldOrder.getBeizhu().contains("琛ュ崟"))
uid = oldOrder.getUserInfo().getId();
if (uid == null)
@@ -1007,8 +1169,18 @@
}
try {
- List<CommonOrder> commonOrderList = commonOrderService.addJDOrder(jdOrder, uid);
- hongBaoV2Service.addHongBao(commonOrderList, HongBaoV2.TYPE_ZIGOU);
+ List<CommonOrderAddResultDTO> commonOrderList = commonOrderService.addJDOrder(jdOrder, uid);
+ hongBaoV2Service.addHongBao(convertCommonOrder(commonOrderList), HongBaoV2.TYPE_ZIGOU);
+ if (isCommonOrderAllAdd(commonOrderList)) {
+ Order order = new Order();
+ order.setOrderId(jdOrder.getOrderId() + "");
+ order.setOrderType(Constant.SOURCE_TYPE_TAOBAO);
+ order.setUserInfo(new UserInfo(uid));
+ try {
+ PlaceOrderCMQManager.getInstance().addPlaceOrderMsg(order);
+ } catch (Exception e) {
+ }
+ }
} catch (CommonOrderException e) {
try {
LogHelper.errorDetailInfo(e, "addJDOrder鎴朼ddHongBao鍑洪敊", "璁㈠崟鍙�:" + jdOrder.getOrderId());
@@ -1026,27 +1198,52 @@
/**
* 澶勭悊浜笢鍒嗕韩璁㈠崟
+ *
* @param order
* @param uid
*/
@Transactional
- private void processShareJDOrder(JDOrder order, Long uid) {
+ private void processShareJDOrder(JDOrder jdOrder, Long uid) {
try {
- List<CommonOrder> commonOrderList = commonOrderService.addJDOrder(order, uid);
- hongBaoV2Service.addHongBao(commonOrderList, HongBaoV2.TYPE_SHARE_GOODS);
+ List<CommonOrderAddResultDTO> commonOrderList = commonOrderService.addJDOrder(jdOrder, uid);
+ hongBaoV2Service.addHongBao(convertCommonOrder(commonOrderList), HongBaoV2.TYPE_SHARE_GOODS);
+ if (isCommonOrderAllAdd(commonOrderList)) {
+ Order order = new Order();
+ order.setOrderId(jdOrder.getOrderId() + "");
+ order.setOrderType(Constant.SOURCE_TYPE_TAOBAO);
+ order.setUserInfo(new UserInfo(uid));
+ try {
+ PlaceOrderCMQManager.getInstance().addPlaceOrderMsg(order);
+ } catch (Exception e) {
+ }
+ }
} catch (CommonOrderException e) {
try {
- LogHelper.errorDetailInfo(e, "addJDOrder鎴朼ddHongBao鍑洪敊", "璁㈠崟鍙�:" + order.getOrderId());
+ LogHelper.errorDetailInfo(e, "addJDOrder鎴朼ddHongBao鍑洪敊", "璁㈠崟鍙�:" + jdOrder.getOrderId());
} catch (Exception e1) {
e1.printStackTrace();
}
} catch (HongBaoException e) {
try {
- LogHelper.errorDetailInfo(e, "addJDOrder鎴朼ddHongBao鍑洪敊", "璁㈠崟鍙�:" + order.getOrderId());
+ LogHelper.errorDetailInfo(e, "addJDOrder鎴朼ddHongBao鍑洪敊", "璁㈠崟鍙�:" + jdOrder.getOrderId());
} catch (Exception e1) {
e1.printStackTrace();
}
}
+ }
+
+ /**
+ * 鏄惁鏄垎浜禋璁㈠崟
+ *
+ * @param order
+ * @return
+ */
+ private boolean isShareOrder(PDDOrder pddOrder) {
+ String positionId = pddOrder.getpId();
+ if (PinDuoDuoApiUtil.PID_SHARE.equalsIgnoreCase(positionId))
+ return true;
+ else
+ return false;
}
/**
@@ -1076,6 +1273,7 @@
/**
* 澶勭悊鎷煎澶氳嚜璐繑鍒╄鍗�
+ *
* @param pddOrder
* @param uid
*/
@@ -1091,7 +1289,7 @@
// 鍔犲叆璁㈠崟
Order oldOrder = orderMapper.selectOrderByOrderIdAndOrderType(pddOrder.getOrderSn(), Constant.SOURCE_TYPE_PDD);
- if (uid == null && oldOrder.getBeizhu().contains("琛ュ崟"))
+ if (uid == null && oldOrder != null && oldOrder.getBeizhu() != null && oldOrder.getBeizhu().contains("琛ュ崟"))
uid = oldOrder.getUserInfo().getId();
if (uid == null)
@@ -1121,8 +1319,18 @@
try {
List<PDDOrder> pddOrderList = new ArrayList<>();
pddOrderList.add(pddOrder);
- List<CommonOrder> commonOrderList = commonOrderService.addPDDOrder(pddOrderList, uid);
- hongBaoV2Service.addHongBao(commonOrderList, HongBaoV2.TYPE_ZIGOU);
+ List<CommonOrderAddResultDTO> commonOrderList = commonOrderService.addPDDOrder(pddOrderList, uid);
+ hongBaoV2Service.addHongBao(convertCommonOrder(commonOrderList), HongBaoV2.TYPE_ZIGOU);
+ if (isCommonOrderAllAdd(commonOrderList)) {
+ Order order = new Order();
+ order.setOrderId(pddOrder.getOrderSn());
+ order.setOrderType(Constant.SOURCE_TYPE_TAOBAO);
+ order.setUserInfo(new UserInfo(uid));
+ try {
+ PlaceOrderCMQManager.getInstance().addPlaceOrderMsg(order);
+ } catch (Exception e) {
+ }
+ }
} catch (CommonOrderException e) {
try {
LogHelper.errorDetailInfo(e, "addPDDOrder鎴朼ddHongBao鍑洪敊", "璁㈠崟鍙�:" + pddOrder.getOrderSn());
@@ -1138,31 +1346,110 @@
}
}
-
/**
* 澶勭悊鎷煎澶氬垎浜鍗�
+ *
* @param order
* @param uid
*/
@Transactional
- private void processSharePDDOrder(PDDOrder order, Long uid) {
+ private void processSharePDDOrder(PDDOrder pddOrder, Long uid) {
try {
List<PDDOrder> pddOrderList = new ArrayList<>();
- pddOrderList.add(order);
- List<CommonOrder> commonOrderList = commonOrderService.addPDDOrder(pddOrderList, uid);
- hongBaoV2Service.addHongBao(commonOrderList, HongBaoV2.TYPE_SHARE_GOODS);
+ pddOrderList.add(pddOrder);
+ List<CommonOrderAddResultDTO> commonOrderList = commonOrderService.addPDDOrder(pddOrderList, uid);
+ hongBaoV2Service.addHongBao(convertCommonOrder(commonOrderList), HongBaoV2.TYPE_SHARE_GOODS);
+ if (isCommonOrderAllAdd(commonOrderList)) {
+ Order order = new Order();
+ order.setOrderId(pddOrder.getOrderSn());
+ order.setOrderType(Constant.SOURCE_TYPE_TAOBAO);
+ order.setUserInfo(new UserInfo(uid));
+ try {
+ PlaceOrderCMQManager.getInstance().addPlaceOrderMsg(order);
+ } catch (Exception e) {
+ }
+ }
} catch (CommonOrderException e) {
try {
- LogHelper.errorDetailInfo(e, "addJDOrder鎴朼ddHongBao鍑洪敊", "璁㈠崟鍙�:" + order.getOrderId());
+ LogHelper.errorDetailInfo(e, "addJDOrder鎴朼ddHongBao鍑洪敊", "璁㈠崟鍙�:" + pddOrder.getOrderId());
} catch (Exception e1) {
e1.printStackTrace();
}
} catch (HongBaoException e) {
try {
- LogHelper.errorDetailInfo(e, "addJDOrder鎴朼ddHongBao鍑洪敊", "璁㈠崟鍙�:" + order.getOrderId());
+ LogHelper.errorDetailInfo(e, "addJDOrder鎴朼ddHongBao鍑洪敊", "璁㈠崟鍙�:" + pddOrder.getOrderId());
} catch (Exception e1) {
e1.printStackTrace();
}
}
}
+
+ @Override
+ public void repairCommonOrderByByTaoBaoOrder(String orderId) {
+ // 鏍规嵁璁㈠崟鍙锋煡璇㈡窐瀹濊鍗�
+ List<TaoBaoOrder> orderList = taoBaoOrderService.getTaoBaoOrderByOrderId(orderId);
+ if (orderList != null)
+ for (TaoBaoOrder order : orderList) {
+ // 鏍规嵁浜ゆ槗ID鏌ヨ甯歌璁㈠崟
+ CommonOrder commonOrder = commonOrderService.selectBySourceTypeAndTradeId(Constant.SOURCE_TYPE_TAOBAO,
+ order.getTradeId());
+ // 淇orderby
+ if (commonOrder != null) {
+ CommonOrder update = new CommonOrder(commonOrder.getId());
+ update.setOrderBy(order.getOrderBy());
+ update.setUpdateTime(new Date());
+ commonOrderService.updateByPrimaryKeySelective(update);
+ }
+ }
+
+ }
+
+ @Override
+ public boolean isShareOrder(CommonOrder commonOrder) {
+ switch (commonOrder.getSourceType()) {
+ case Constant.SOURCE_TYPE_TAOBAO:
+ return isShareOrder(taoBaoOrderService.selectByTradeId(commonOrder.getTradeId()));
+ case Constant.SOURCE_TYPE_JD:
+ return isShareOrder(jdOrderService.selectDetailByOrderId(Long.parseLong(commonOrder.getOrderNo())));
+ case Constant.SOURCE_TYPE_PDD:
+ return isShareOrder(pddOrderService.selectByOrderSn(commonOrder.getOrderNo()).get(0));
+ }
+ return false;
+ }
+
+ /**
+ * 杞负鏅�氳鍗�
+ *
+ * @param dtoList
+ * @return
+ */
+ private List<CommonOrder> convertCommonOrder(List<CommonOrderAddResultDTO> dtoList) {
+ List<CommonOrder> commonOrderList = new ArrayList<>();
+ if (dtoList != null)
+ for (CommonOrderAddResultDTO dto : dtoList)
+ commonOrderList.add(dto.getCommonOrder());
+ return commonOrderList;
+ }
+
+ /**
+ * 鏄惁鍏ㄦ槸澧炲姞
+ *
+ * @param list
+ * @return
+ */
+ private boolean isCommonOrderAllAdd(List<CommonOrderAddResultDTO> list) {
+ if (list == null || list.size() == 0)
+ return false;
+ int addCount = 0;
+ if (list != null)
+ for (CommonOrderAddResultDTO dto : list) {
+ if (dto.getType() == CommonOrderAddResultDTO.TYPE_ADD)
+ addCount++;
+ }
+ if (addCount == list.size())
+ return true;
+ else
+ return false;
+ }
+
}
--
Gitblit v1.8.0