From cd4d7c2ff85d68aebec276073020224b5de56415 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 05 十一月 2019 10:29:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserSystemCouponServiceImpl.java | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserSystemCouponServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserSystemCouponServiceImpl.java
index 45baec2..3019d5f 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserSystemCouponServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserSystemCouponServiceImpl.java
@@ -287,8 +287,11 @@
userCoupon.setEndTime(endTime);
userCoupon.setCreateTime(new Date());
userCoupon.setUpdateTime(new Date());
- // 鎻掑叆鏁版嵁搴�
- insertSelective(userCoupon);
+ userSystemCouponMapper.insertSelective(userCoupon);
+
+ if(coupon.getType() == CouponTypeEnum.freeCoupon) {
+ userSystemCouponActivateService.addActivateRecord(userCoupon.getId());
+ }
executor.execute(new Runnable() {
@Override
@@ -875,7 +878,7 @@
Order order = orderService.findOrderByOrderIdAndType(orderNo, sourceType);
if (order == null)
- return;
+ throw new UserSystemCouponException(1, "璇ヨ鍗曚笉瀛樺湪");
/* 濂栭噾璁＄畻 浠ュ強鐩稿叧绾㈠寘淇℃伅澶勭悊 */
@@ -903,7 +906,8 @@
}, null);
System.out.println(result);
} catch (Exception e) {
- throw new Exception();
+ e.printStackTrace();
+ throw e;
}
}
}
--
Gitblit v1.8.0