From add2d28c3aeccfe57338c439967abbb83117b20e Mon Sep 17 00:00:00 2001 From: liujie <liujie> Date: 星期二, 17 十月 2023 09:56:55 +0800 Subject: [PATCH] 修改bug --- cloud-server-other/src/main/java/com/dsh/other/service/impl/SiteServiceImpl.java | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/cloud-server-other/src/main/java/com/dsh/other/service/impl/SiteServiceImpl.java b/cloud-server-other/src/main/java/com/dsh/other/service/impl/SiteServiceImpl.java index 7a6dafe..6590670 100644 --- a/cloud-server-other/src/main/java/com/dsh/other/service/impl/SiteServiceImpl.java +++ b/cloud-server-other/src/main/java/com/dsh/other/service/impl/SiteServiceImpl.java @@ -105,6 +105,7 @@ Store store = storeService.getById(site.getStoreId()); QuerySiteInfoVo querySiteInfoVo = new QuerySiteInfoVo(); querySiteInfoVo.setId(site.getId()); + querySiteInfoVo.setTypeName(site.getTypeName()); querySiteInfoVo.setName(site.getName()); querySiteInfoVo.setSiteTypeName(siteType.getName()); querySiteInfoVo.setStoreName(store.getName()); @@ -251,8 +252,12 @@ //校验优惠券 Long couponId = reservationSite.getCouponId(); + if (couponId!=null && couponId != 0){ + if(null != couponId && reservationSite.getPayType() != 3){ UserCoupon userCoupon = userCouponClient.queryUserCouponById(new QueryUserCouponByIdAndUserId(reservationSite.getCouponId(),uid)); + + if(userCoupon.getStatus() == 2){ return ResultUtil.error("优惠券已被核销"); } @@ -283,6 +288,7 @@ userCoupon.setStatus(2); userCouponClient.updateUserCoupon(userCoupon); } + } SiteBooking siteBooking = new SiteBooking(); -- Gitblit v1.7.1