From ca7aa881987169d3d0202fe85d9f47d225111f33 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 01 三月 2019 18:34:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/controller/client/UserCouponController.java | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/UserCouponController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/UserCouponController.java
index 011d4dc..6cc19ba 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/UserCouponController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/UserCouponController.java
@@ -474,10 +474,11 @@
couponId = systemCouponId;
}
- if (countPrize == 1) {
- SystemCoupon coupon = systemCouponService.selectByPrimaryKey(systemCouponId);
- hasPrize = coupon.getType().name();
- }
+ }
+
+ if (countPrize == 1 && couponId != null) {
+ SystemCoupon coupon = systemCouponService.selectByPrimaryKey(couponId);
+ hasPrize = coupon.getType().name();
}
count = MAX_COUNT - 1 - list.size();
--
Gitblit v1.8.0