irving/peipei-backend
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects 1 Releases Wiki Activity

fix

Browse Source
This commit is contained in:
admin
2024-07-09 23:39:05 +08:00
parent 33488603f7
commit 1bcef5c803
3 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
play-admin/src/main/java/com/starry/admin/modules/shop/service/IPlayCouponDetailsService.java
View File

@@ -48,7 +48,7 @@ public interface IPlayCouponDetailsService extends IService<PlayCouponDetailsEnt
* @author admin * @author admin
* @since 2024/7/5 11:37 * @since 2024/7/5 11:37
**/ **/
List<PlayCouponDetailsEntity> selectByCustomId(String customId); List<PlayCouponDetailsReturnVo> selectByCustomId(String customId);
/** /**

7
play-admin/src/main/java/com/starry/admin/modules/shop/service/impl/PlayCouponDetailsServiceImpl.java
View File

@@ -118,10 +118,13 @@ public class PlayCouponDetailsServiceImpl extends ServiceImpl<PlayCouponDetailsM
} }
@Override @Override
public List<PlayCouponDetailsEntity> selectByCustomId(String customId) { public List<PlayCouponDetailsReturnVo> selectByCustomId(String customId) {
MPJLambdaWrapper<PlayCouponDetailsEntity> lambdaWrapper = new MPJLambdaWrapper<>(); MPJLambdaWrapper<PlayCouponDetailsEntity> lambdaWrapper = new MPJLambdaWrapper<>();
lambdaWrapper.selectAll(PlayCouponDetailsEntity.class);
lambdaWrapper.selectAll(PlayCouponInfoEntity.class);
lambdaWrapper.eq(PlayCouponDetailsEntity::getCustomId, customId); 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);
} }
/** /**

11
play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxCouponController.java
View File

@@ -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.play.service.IPlayCommodityInfoService;
import com.starry.admin.modules.shop.module.entity.PlayCouponDetailsEntity; 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.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.IPlayCouponDetailsService;
import com.starry.admin.modules.shop.service.IPlayCouponInfoService; import com.starry.admin.modules.shop.service.IPlayCouponInfoService;
import com.starry.admin.modules.weichat.entity.WxCouponOrderQueryVo; import com.starry.admin.modules.weichat.entity.WxCouponOrderQueryVo;
@@ -77,7 +78,7 @@ public class WxCouponController {
@CustomUserLogin @CustomUserLogin
@PostMapping("/custom/queryAll") @PostMapping("/custom/queryAll")
public R queryAll() { public R queryAll() {
List<PlayCouponDetailsEntity> obtainedCoupons = couponDetailsService.selectByCustomId(ThreadLocalRequestDetail.getCustomUserInfo().getId()); List<PlayCouponDetailsReturnVo> obtainedCoupons = couponDetailsService.selectByCustomId(ThreadLocalRequestDetail.getCustomUserInfo().getId());
List<PlayCouponInfoEntity> couponInfoEntities = couponInfoService.queryAll(); List<PlayCouponInfoEntity> couponInfoEntities = couponInfoService.queryAll();
List<WxCouponReceiveReturnVo> returnVos = new ArrayList<>(couponInfoEntities.size()); List<WxCouponReceiveReturnVo> returnVos = new ArrayList<>(couponInfoEntities.size());
for (PlayCouponInfoEntity couponInfoEntity : couponInfoEntities) { for (PlayCouponInfoEntity couponInfoEntity : couponInfoEntities) {
@@ -85,7 +86,7 @@ public class WxCouponController {
continue; continue;
} }
WxCouponReceiveReturnVo vo = ConvertUtil.entityToVo(couponInfoEntity, WxCouponReceiveReturnVo.class); WxCouponReceiveReturnVo vo = ConvertUtil.entityToVo(couponInfoEntity, WxCouponReceiveReturnVo.class);
for (PlayCouponDetailsEntity obtainedCoupon : obtainedCoupons) { for (PlayCouponDetailsReturnVo obtainedCoupon : obtainedCoupons) {
if (obtainedCoupon.getCouponId().equals(couponInfoEntity.getId())) { if (obtainedCoupon.getCouponId().equals(couponInfoEntity.getId())) {
vo.setObtained("1"); vo.setObtained("1");
} }
@@ -97,16 +98,16 @@ public class WxCouponController {
/** /**
* 顾客查询本人优惠券列表 * 顾客查询订单可使用优惠券
*/ */
@CustomUserLogin @CustomUserLogin
@PostMapping("/custom/queryByOrder") @PostMapping("/custom/queryByOrder")
public R queryByOrder(@Validated @RequestBody WxCouponOrderQueryVo vo) { public R queryByOrder(@Validated @RequestBody WxCouponOrderQueryVo vo) {
List<PlayCouponDetailsEntity> list = couponDetailsService.selectByCustomId(ThreadLocalRequestDetail.getCustomUserInfo().getId()); List<PlayCouponDetailsReturnVo> list = couponDetailsService.selectByCustomId(ThreadLocalRequestDetail.getCustomUserInfo().getId());
PlayCommodityInfoVo commodityInfo = playCommodityInfoService.queryCommodityInfo(vo.getCommodityId()); PlayCommodityInfoVo commodityInfo = playCommodityInfoService.queryCommodityInfo(vo.getCommodityId());
// 优惠券列表 // 优惠券列表
List<WxCouponOrderReturnVo> couponReturnVos = new ArrayList<>(); List<WxCouponOrderReturnVo> couponReturnVos = new ArrayList<>();
for (PlayCouponDetailsEntity couponDetails : list) { for (PlayCouponDetailsReturnVo couponDetails : list) {
PlayCouponInfoEntity couponInfo = couponInfoService.selectPlayCouponInfoById(couponDetails.getCouponId()); PlayCouponInfoEntity couponInfo = couponInfoService.selectPlayCouponInfoById(couponDetails.getCouponId());
WxCouponOrderReturnVo wxCouponReturnVo = ConvertUtil.entityToVo(couponDetails, WxCouponOrderReturnVo.class); WxCouponOrderReturnVo wxCouponReturnVo = ConvertUtil.entityToVo(couponDetails, WxCouponOrderReturnVo.class);
String couponReasonForUnavailableUse = couponInfoService.getCouponReasonForUnavailableUse(couponInfo, vo.getPlaceType(), vo.getCommodityId(), vo.getCommodityQuantity(), commodityInfo.getCommodityPrice()); String couponReasonForUnavailableUse = couponInfoService.getCouponReasonForUnavailableUse(couponInfo, vo.getPlaceType(), vo.getCommodityId(), vo.getCommodityQuantity(), commodityInfo.getCommodityPrice());