From a6f01cf9667958ca3d5c2f2ef28637baa8bf5e6d Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期四, 25 七月 2019 12:20:01 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/hongbao/HongBaoV2ServiceImpl.java | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 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 c8d1580..6dfde25 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
@@ -274,7 +274,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 +315,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 +332,7 @@
}
}
}
+
hongBaoV2Mapper.updateByPrimaryKeySelective(hongBao);
// 鍔犲叆閫氱煡
--
Gitblit v1.8.0