From 0f73ccdaaa2864b49a127fb9f3a52d3c67b22add Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 29 一月 2019 18:05:20 +0800
Subject: [PATCH] 消息相关bug修改
---
fanli/src/main/java/com/yeshi/fanli/service/impl/hongbao/HongBaoV2ServiceImpl.java | 30 ++++++++++++------------------
1 files changed, 12 insertions(+), 18 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/hongbao/HongBaoV2ServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/hongbao/HongBaoV2ServiceImpl.java
index b6e6e90..9786047 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/hongbao/HongBaoV2ServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/hongbao/HongBaoV2ServiceImpl.java
@@ -595,13 +595,10 @@
} else if (type == HongBaoV2.TYPE_SHARE_GOODS) {
BigDecimal fanliRate = hongBaoManageService.getShareRate(commonOrder.getCreateTime().getTime());
- Order order = orderMapper.selectOrderByOrderId(commonOrder.getOrderNo());
- if (order != null) {
- List<ShareGoodsActivityOrder> list = shareGoodsActivityOrderService
- .listByOrderIdAndUid(commonOrder.getUserInfo().getId(), order.getId());
- if (list != null && list.size() > 0) {
- fanliRate = list.get(0).getShareRate();
- }
+ List<ShareGoodsActivityOrder> list = shareGoodsActivityOrderService
+ .listByOrderIdAndUid(commonOrder.getUserInfo().getId(), commonOrder.getOrderNo());
+ if (list != null && list.size() > 0) {
+ fanliRate = list.get(0).getShareRate();
}
HongBaoV2 hongBao = new HongBaoV2(hongBaoOrder.getHongBaoV2().getId());
@@ -855,18 +852,15 @@
if (taoBaoOrderList != null && taoBaoOrderList.size() > 0
&& !StringUtil.isNullOrEmpty(taoBaoOrderList.get(0).getRelationId())) {
if (shareGoodsActivityOrderService.listByUid(commonOrder.getUserInfo().getId()).size() < 1) {
- Order order = orderMapper.selectOrderByOrderId(commonOrder.getOrderNo());
- if (order != null) {
- shareRate = new BigDecimal(hongBaoManageService.get("share_activity_proportion"));
+ shareRate = new BigDecimal(hongBaoManageService.get("share_activity_proportion"));
+ try {
+ shareGoodsActivityOrderService.addShareGoodsActivityOrder(
+ commonOrder.getUserInfo().getId(), shareRate, commonOrder.getOrderNo());
+ } catch (ShareGoodsActivityOrderException e) {
try {
- shareGoodsActivityOrderService.addShareGoodsActivityOrder(
- commonOrder.getUserInfo().getId(), shareRate, order);
- } catch (ShareGoodsActivityOrderException e) {
- try {
- LogHelper.errorDetailInfo(e);
- } catch (Exception e1) {
- e1.printStackTrace();
- }
+ LogHelper.errorDetailInfo(e);
+ } catch (Exception e1) {
+ e1.printStackTrace();
}
}
}
--
Gitblit v1.8.0