From b6c37e4bc38db88a360d0f2c6099183f9bb75bdc Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期一, 22 四月 2019 14:31:59 +0800
Subject: [PATCH] 券推送插入
---
fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderProcessServiceImpl.java | 21 ++++++++++++++-------
1 files changed, 14 insertions(+), 7 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 7d309ea..fe7d20e 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
@@ -60,9 +60,9 @@
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;
@@ -143,6 +143,7 @@
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);
@@ -450,9 +451,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(), "");
@@ -461,7 +462,7 @@
}
}
- userMoneyDetailMapper.insert(userMoneyDetail);
+ userMoneyDetailMapper.insertSelective(userMoneyDetail);
// 娣诲姞璧勯噾鏄庣粏涓庣孩鍖呯殑鏄犲皠鍏崇郴
for (HongBaoV2 v2 : userHongBao.get(uid)) {
accountDetailsHongBaoMapService.saveAccountDetailsHongBaoMap(v2.getId(), userMoneyDetail.getId());
@@ -508,10 +509,10 @@
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"),
- Constant.TAOBAO_AUTH_APPKEY, Constant.TAOBAO_AUTH_APPSECRET);
+ TaoBaoConstant.TAOBAO_AUTH_APPKEY, TaoBaoConstant.TAOBAO_AUTH_APPSECRET);
List<TaoBaoOrder> thirdOList = TaoKeOrderApiUtil.getTaoBaoThirdAllOrder(
- TimeUtil.getGernalTime(time, "yyyy-MM-dd HH:mm:ss"), 30, 1, Constant.TAOBAO_AUTH_APPKEY,
- Constant.TAOBAO_AUTH_APPSECRET);
+ 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);
@@ -556,6 +557,8 @@
if (order.getJieSuanTime().getTime() >= TimeUtil.convertToTimeTemp("2018-08-05", "yyyy-MM-dd")) {
return;
}
+
+ // TODO 澶勭悊缁存潈鎴愬姛浣嗘槸宸插埌璐︾殑璁㈠崟
}
@Override
@@ -852,6 +855,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) {
@@ -978,7 +986,6 @@
e1.printStackTrace();
}
}
-
}
}
--
Gitblit v1.8.0