From f4548a3ee46afe45da4ee2a42dc169c575deee9f Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期三, 31 七月 2019 11:57:36 +0800
Subject: [PATCH] 动态v2兼容
---
fanli/src/main/java/com/yeshi/fanli/service/impl/hongbao/HongBaoV2ServiceImpl.java | 27 ++++++++++++++-------------
1 files changed, 14 insertions(+), 13 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 3fc166c..ca70561 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
@@ -25,7 +25,6 @@
import com.yeshi.fanli.dao.mybatis.taobao.TaoBaoWeiQuanOrderMapper;
import com.yeshi.fanli.dto.HongBao;
import com.yeshi.fanli.dto.HongBaoDTO;
-import com.yeshi.fanli.entity.bus.msg.MsgOrderDetail;
import com.yeshi.fanli.entity.bus.user.HongBaoV2;
import com.yeshi.fanli.entity.bus.user.ThreeSale;
import com.yeshi.fanli.entity.bus.user.UserExtraTaoBaoInfo;
@@ -48,7 +47,6 @@
import com.yeshi.fanli.service.inter.order.ShareGoodsActivityOrderService;
import com.yeshi.fanli.service.inter.user.UserExtraTaoBaoInfoService;
import com.yeshi.fanli.service.inter.user.UserInfoService;
-import com.yeshi.fanli.service.inter.user.UserNotificationService;
import com.yeshi.fanli.service.inter.user.UserShareGoodsGroupService;
import com.yeshi.fanli.service.inter.user.UserSystemCouponRecordService;
import com.yeshi.fanli.service.inter.user.UserSystemCouponService;
@@ -95,9 +93,6 @@
@Resource
private ThreeSaleSerivce threeSaleSerivce;
-
- @Resource
- private UserNotificationService userNotificationService;
@Resource
private UserOrderMsgNotificationService userOrderMsgNotificationService;
@@ -189,20 +184,17 @@
money, goodsCount, state);
break;
case HongBaoV2.TYPE_SHARE_GOODS:
- userNotificationService.orderShareStatisticed(uid, orderId, goodsCount, MsgOrderDetail.STATE_FK,
- null, money);
+
userOrderMsgNotificationService.orderShareStatistic(uid, orderId,orderType, commonOrder.getPayment(),
money, goodsCount, state);
break;
case HongBaoV2.TYPE_YIJI:
- userNotificationService.orderInviteStatisticed(uid, orderId, goodsCount,
- MsgOrderDetail.STATE_FK, null, money);
+
userOrderMsgNotificationService.orderInviteStatistic(uid, orderId,orderType, commonOrder.getPayment(),
money, goodsCount, state);
break;
case HongBaoV2.TYPE_ERJI:
- userNotificationService.orderInviteStatisticed(uid, orderId, goodsCount,
- MsgOrderDetail.STATE_FK, null, money);
+
userOrderMsgNotificationService.orderInviteStatistic(uid, orderId,orderType, commonOrder.getPayment(),
money, goodsCount, state);
break;
@@ -274,7 +266,7 @@
HongBaoV2 oldHongBao = hongBaoV2Mapper.selectByPrimaryKey(hongBaoOrder.getHongBaoV2().getId());
if (oldHongBao == null)
throw new HongBaoException(10, "绾㈠寘瀵硅薄涓嶅瓨鍦�");
- // 宸茬粡澶辨晥鎴栬�呭凡缁忛鍙栫殑绾㈠寘涓嶅仛澶勭悊
+ // 宸茬粡澶辨晥锛屽凡缁忛鍙栵紝鏂拌�佺姸鎬佷竴鑷寸殑绾㈠寘涓嶅仛澶勭悊
if (oldHongBao.getState() == HongBaoV2.STATE_SHIXIAO || oldHongBao.getState() == HongBaoV2.STATE_YILINGQU)
return;
@@ -315,6 +307,14 @@
} else if (commonOrder.getState() == CommonOrder.STATE_SX) {
hongBao.setState(HongBaoV2.STATE_SHIXIAO);
hongBao.setMoney(new BigDecimal(0));
+
+ }
+
+ // 鏂拌�佺孩鍖呯姸鎬佷竴鑷翠笉澶勭悊
+ if (oldHongBao.getState().intValue() == hongBao.getState())
+ return;
+
+ if (hongBao.getState() == HongBaoV2.STATE_SHIXIAO) {
if (mianDan) {
try {
userSystemCouponService.updateStateByDrawback(commonOrder.getOrderNo());
@@ -324,6 +324,7 @@
}
}
}
+
hongBaoV2Mapper.updateByPrimaryKeySelective(hongBao);
// 鍔犲叆閫氱煡
@@ -955,7 +956,7 @@
hb.setMoney(hongBao.getMoney());
try {
- userShareGoodsGroupService.updateOrderRecord(hb);
+ userShareGoodsGroupService.updateOrderRecord(hb,commonOrder.getSourceType());
} catch (UserShareGoodsRecordException e) {
try {
LogHelper.errorDetailInfo(e);
--
Gitblit v1.8.0