From 59ce2452667a57caf547a753913cf5e573c8cc39 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期一, 19 八月 2019 18:05:47 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderProcessServiceImpl.java | 34 ++++++++++++++++++++++++++++++----
1 files changed, 30 insertions(+), 4 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 2a76464..ddf8b52 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
@@ -18,6 +18,7 @@
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;
@@ -463,8 +464,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);
}
}
}
@@ -1018,7 +1023,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)
@@ -1133,7 +1138,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)
@@ -1207,4 +1212,25 @@
}
}
}
+
+ @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);
+ }
+ }
+
+
+ }
}
--
Gitblit v1.8.0