Merge remote-tracking branch 'origin/master'

admin

2019-03-01 a5b74cb17159f71dac98b3e7ae81e43fce73a3f9

 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();