Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/PlayPai int...

liujie

昨天 f7ef2230af6dc8a55c2b5bd6505eed8586c87f75

 cloud-server-other/src/main/java/com/dsh/other/controller/TVipController.java

@@ -67,7 +67,10 @@
                Integer id = Integer.valueOf(couponJsonObject.getString("id"));
                // 优惠券数量
                Integer value = Integer.valueOf(couponJsonObject.getString("value"));
                Coupon coupon = coupons.stream().filter(e -> e.getId().equals(id)).findFirst().orElse(new Coupon());
                Coupon coupon = coupons.stream().filter(e -> e.getId().equals(id)).findFirst().orElse(null);
                if (coupon==null){
                    continue;
                }
                CouponVipResp couponVipResp = new CouponVipResp();
                couponVipResp.setId(coupon.getId());
                couponVipResp.setName(coupon.getName());