From 60200c7ced052a8148b1511d8c0c2807b3ffd89f Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 27 二月 2019 17:07:03 +0800
Subject: [PATCH] 免单券相关修改
---
fanli/src/main/java/com/yeshi/fanli/service/impl/hongbao/HongBaoV2ServiceImpl.java | 13 +++++++------
1 files changed, 7 insertions(+), 6 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 ec9ddea..3c20b33 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
@@ -735,10 +735,12 @@
}
}
}
- } else if (commonOrder.getState() == CommonOrder.STATE_SX) {//璁剧疆澶辨晥
-// userSystemCouponService.updateS
-
-
+ } else if (commonOrder.getState() == CommonOrder.STATE_SX) {// 璁剧疆鍏嶅崟鍒稿け鏁�
+ try {
+ userSystemCouponService.updateStateByDrawback(commonOrder.getOrderNo());
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
}
HongBaoV2 hongBao = new HongBaoV2();
@@ -758,7 +760,6 @@
} else if (commonOrder.getState() == CommonOrder.STATE_SX) {
hongBao.setState(HongBaoV2.STATE_SHIXIAO);
hongBao.setMoney(new BigDecimal(0));
-
} else {
throw new HongBaoException(3, "缁存潈璁㈠崟涓嶈兘鍒涘缓绾㈠寘");
}
@@ -794,7 +795,7 @@
}
UserInfo boss = threeSaleSerivce.getBoss(user.getId());
- if (boss != null && hongBao.getState() != HongBaoV2.STATE_SHIXIAO && mianDanMoney==null) {// 1绾OSS瀛樺湪涓旂孩鍖呮湭澶辨晥,鍏嶅崟涓嶆敮鎸佸绾у垎閿�
+ if (boss != null && hongBao.getState() != HongBaoV2.STATE_SHIXIAO && mianDanMoney == null) {// 1绾OSS瀛樺湪涓旂孩鍖呮湭澶辨晥,鍏嶅崟涓嶆敮鎸佸绾у垎閿�
// 鎻掑叆涓�绾у瓙绾㈠寘
BigDecimal firstRate = hongBaoManageService
--
Gitblit v1.8.0