From 47f034b4239ac0865560953e9f6edafa487b0fb9 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期三, 18 三月 2020 09:32:36 +0800
Subject: [PATCH] 会员等级 + 订单列表新增内容
---
fanli/src/main/java/com/yeshi/fanli/service/impl/order/InviteOrderSubsidyServiceImpl.java | 10 ++--------
1 files changed, 2 insertions(+), 8 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/InviteOrderSubsidyServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/InviteOrderSubsidyServiceImpl.java
index a6cee04..2897328 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/InviteOrderSubsidyServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/InviteOrderSubsidyServiceImpl.java
@@ -28,7 +28,6 @@
import com.yeshi.fanli.service.inter.user.vip.UserVIPInfoService;
import com.yeshi.fanli.util.MoneyBigDecimalUtil;
import com.yeshi.fanli.util.StringUtil;
-import com.yeshi.fanli.util.TimeUtil;
@Service
public class InviteOrderSubsidyServiceImpl implements InviteOrderSubsidyService {
@@ -64,13 +63,8 @@
return inviteOrderSubsidyMapper.getByOrderNoAndTypeForUpdate(uid, orderNo, type);
}
- @Transactional
+ @Transactional(rollbackFor=Exception.class)
private void addOrderSubsidy(InviteOrderSubsidy orderSubsidy) throws InviteOrderSubsidyException {
- // TODO 纭畾鐢熸晥鏃ユ湡 鏈哄埗2020骞寸敓鏁�
- if (System.currentTimeMillis() < TimeUtil.convertToTimeTemp("2020-01-01", "yyyy-MM-dd")) {
- return;
- }
-
if (orderSubsidy.getMoney() == null || StringUtil.isNullOrEmpty(orderSubsidy.getOrderNo())
|| orderSubsidy.getSourceType() == null || orderSubsidy.getUid() == null)
throw new InviteOrderSubsidyException(1, "鏁版嵁涓嶅畬鏁�");
@@ -97,7 +91,7 @@
}
}
- @Transactional
+ @Transactional(rollbackFor=Exception.class)
@Override
public void addOrUpdateByOrder(String orderId, int sourceType) throws InviteOrderSubsidyException {
List<HongBaoOrder> list = hongBaoOrderService.listByOrderIdAndSourceType(orderId, sourceType);
--
Gitblit v1.8.0