From e1a62ec62e7331d97af9302e90e1ce44af8235eb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 27 一月 2021 15:26:55 +0800
Subject: [PATCH] 拼多多授权绑定
---
fanli/src/main/java/com/yeshi/fanli/service/manger/order/HongBaoV2AddManager.java | 15 +++++++--------
1 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/manger/order/HongBaoV2AddManager.java b/fanli/src/main/java/com/yeshi/fanli/service/manger/order/HongBaoV2AddManager.java
index 65288f8..cfb3dc9 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/manger/order/HongBaoV2AddManager.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/manger/order/HongBaoV2AddManager.java
@@ -15,7 +15,6 @@
import com.yeshi.fanli.entity.SystemEnum;
import org.springframework.stereotype.Component;
-import org.springframework.transaction.annotation.Transactional;
import com.yeshi.fanli.dao.mybatis.HongBaoV2Mapper;
import com.yeshi.fanli.dao.mybatis.order.CommonOrderGoodsMapper;
@@ -46,9 +45,9 @@
import com.yeshi.fanli.service.inter.user.vip.UserVIPInfoService;
import com.yeshi.fanli.service.manger.user.UserLevelManager;
import com.yeshi.fanli.util.Constant;
-import com.yeshi.fanli.util.MoneyBigDecimalUtil;
+import org.yeshi.utils.MoneyBigDecimalUtil;
import com.yeshi.fanli.util.TaoBaoConstant;
-import com.yeshi.fanli.util.TimeUtil;
+import org.yeshi.utils.TimeUtil;
import com.yeshi.fanli.util.user.UserLevelUtil;
@Component
@@ -287,7 +286,7 @@
throw new HongBaoException(201, "鐢ㄦ埛绛夌骇涓虹┖");
// 宸茬粡澶辨晥锛屽凡缁忛鍙栵紝鏂拌�佺姸鎬佷竴鑷寸殑绾㈠寘涓嶅仛澶勭悊
- if (oldHongBao.getState() == HongBaoV2.STATE_SHIXIAO || oldHongBao.getState() == HongBaoV2.STATE_YILINGQU)
+ if (oldHongBao.getState() == HongBaoV2.STATE_SHIXIAO || oldHongBao.getState() == HongBaoV2.STATE_YILINGQU|| oldHongBao.getState() == HongBaoV2.STATE_LINGQUING)
return false;
if (type == HongBaoV2.TYPE_ZIGOU) {// 鑾峰彇鑷喘鐨勮繑鍒╂瘮渚�
@@ -310,8 +309,8 @@
HongBaoV2 hongBao = createFanLiUpdateHongBao(commonOrder, money, hongBaoOrder.getHongBaoV2().getId(),
mianDan);
- // 鏂拌�佺孩鍖呯姸鎬佷竴鑷翠笉澶勭悊
- if (oldHongBao.getState().intValue() == hongBao.getState())
+ // 鏂拌�佺孩鍖呯姸鎬佷竴鑷翠笖浣ｉ噾閲戦涓嶅彉鍒欎笉澶勭悊
+ if (oldHongBao.getState().intValue() == hongBao.getState()&&oldHongBao.getMoney().compareTo(hongBao.getMoney())==0)
return false;
if (hongBao.getState() == HongBaoV2.STATE_SHIXIAO) {
@@ -353,7 +352,7 @@
List<UserTeamLevel> bossList = getBossList(children);
for (HongBaoV2 child : children) {
- if (child.getState() == HongBaoV2.STATE_YILINGQU)
+ if (child.getState() == HongBaoV2.STATE_YILINGQU||child.getState() == HongBaoV2.STATE_LINGQUING)
continue;
if (child.getType() == HongBaoV2.TYPE_YIJI) {
@@ -458,7 +457,7 @@
if (children != null && children.size() > 0) {
List<UserTeamLevel> bossList = getBossList(children);
for (HongBaoV2 child : children) {
- if (child.getState() == HongBaoV2.STATE_YILINGQU)
+ if (child.getState() == HongBaoV2.STATE_YILINGQU||child.getState() == HongBaoV2.STATE_LINGQUING)
continue;
if (child.getType() == HongBaoV2.TYPE_SHARE_YIJI) {
--
Gitblit v1.8.0