diff --git a/play-admin/src/main/java/com/starry/admin/modules/shop/service/IPlayCouponDetailsService.java b/play-admin/src/main/java/com/starry/admin/modules/shop/service/IPlayCouponDetailsService.java index fd3b988..4e90a8b 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/shop/service/IPlayCouponDetailsService.java +++ b/play-admin/src/main/java/com/starry/admin/modules/shop/service/IPlayCouponDetailsService.java @@ -48,7 +48,7 @@ public interface IPlayCouponDetailsService extends IService selectByCustomId(String customId); + List selectByCustomId(String customId); /** diff --git a/play-admin/src/main/java/com/starry/admin/modules/shop/service/impl/PlayCouponDetailsServiceImpl.java b/play-admin/src/main/java/com/starry/admin/modules/shop/service/impl/PlayCouponDetailsServiceImpl.java index d08ea17..b447800 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/shop/service/impl/PlayCouponDetailsServiceImpl.java +++ b/play-admin/src/main/java/com/starry/admin/modules/shop/service/impl/PlayCouponDetailsServiceImpl.java @@ -118,10 +118,13 @@ public class PlayCouponDetailsServiceImpl extends ServiceImpl selectByCustomId(String customId) { + public List selectByCustomId(String customId) { MPJLambdaWrapper lambdaWrapper = new MPJLambdaWrapper<>(); + lambdaWrapper.selectAll(PlayCouponDetailsEntity.class); + lambdaWrapper.selectAll(PlayCouponInfoEntity.class); lambdaWrapper.eq(PlayCouponDetailsEntity::getCustomId, customId); - return this.baseMapper.selectList(lambdaWrapper); + lambdaWrapper.leftJoin(PlayCouponInfoEntity.class, PlayCouponInfoEntity::getId, PlayCouponDetailsEntity::getCouponId); + return this.baseMapper.selectJoinList(PlayCouponDetailsReturnVo.class, lambdaWrapper); } /** diff --git a/play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxCouponController.java b/play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxCouponController.java index d500fac..66d2c2d 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxCouponController.java +++ b/play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxCouponController.java @@ -9,6 +9,7 @@ import com.starry.admin.modules.play.module.vo.PlayCommodityInfoVo; import com.starry.admin.modules.play.service.IPlayCommodityInfoService; import com.starry.admin.modules.shop.module.entity.PlayCouponDetailsEntity; import com.starry.admin.modules.shop.module.entity.PlayCouponInfoEntity; +import com.starry.admin.modules.shop.module.vo.PlayCouponDetailsReturnVo; import com.starry.admin.modules.shop.service.IPlayCouponDetailsService; import com.starry.admin.modules.shop.service.IPlayCouponInfoService; import com.starry.admin.modules.weichat.entity.WxCouponOrderQueryVo; @@ -77,7 +78,7 @@ public class WxCouponController { @CustomUserLogin @PostMapping("/custom/queryAll") public R queryAll() { - List obtainedCoupons = couponDetailsService.selectByCustomId(ThreadLocalRequestDetail.getCustomUserInfo().getId()); + List obtainedCoupons = couponDetailsService.selectByCustomId(ThreadLocalRequestDetail.getCustomUserInfo().getId()); List couponInfoEntities = couponInfoService.queryAll(); List returnVos = new ArrayList<>(couponInfoEntities.size()); for (PlayCouponInfoEntity couponInfoEntity : couponInfoEntities) { @@ -85,7 +86,7 @@ public class WxCouponController { continue; } WxCouponReceiveReturnVo vo = ConvertUtil.entityToVo(couponInfoEntity, WxCouponReceiveReturnVo.class); - for (PlayCouponDetailsEntity obtainedCoupon : obtainedCoupons) { + for (PlayCouponDetailsReturnVo obtainedCoupon : obtainedCoupons) { if (obtainedCoupon.getCouponId().equals(couponInfoEntity.getId())) { vo.setObtained("1"); } @@ -97,16 +98,16 @@ public class WxCouponController { /** - * 顾客查询本人优惠券列表 + * 顾客查询订单可使用优惠券 */ @CustomUserLogin @PostMapping("/custom/queryByOrder") public R queryByOrder(@Validated @RequestBody WxCouponOrderQueryVo vo) { - List list = couponDetailsService.selectByCustomId(ThreadLocalRequestDetail.getCustomUserInfo().getId()); + List list = couponDetailsService.selectByCustomId(ThreadLocalRequestDetail.getCustomUserInfo().getId()); PlayCommodityInfoVo commodityInfo = playCommodityInfoService.queryCommodityInfo(vo.getCommodityId()); // 优惠券列表 List couponReturnVos = new ArrayList<>(); - for (PlayCouponDetailsEntity couponDetails : list) { + for (PlayCouponDetailsReturnVo couponDetails : list) { PlayCouponInfoEntity couponInfo = couponInfoService.selectPlayCouponInfoById(couponDetails.getCouponId()); WxCouponOrderReturnVo wxCouponReturnVo = ConvertUtil.entityToVo(couponDetails, WxCouponOrderReturnVo.class); String couponReasonForUnavailableUse = couponInfoService.getCouponReasonForUnavailableUse(couponInfo, vo.getPlaceType(), vo.getCommodityId(), vo.getCommodityQuantity(), commodityInfo.getCommodityPrice());