ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/vo/ExchangeRecordVO.java
@@ -40,4 +40,5 @@ private Boolean delFlag; @ApiModelProperty(value = " 是否删除0否1是 前端忽略") private Long id; private Long appUserId; } ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/factory/ChargingPileFallbackFactory.java
@@ -33,6 +33,11 @@ } @Override public R<List<TChargingPile>> getChargingPileBySiteIds(List<Integer> siteIds) { return null; } @Override public R<BigDecimal> getServiceMoney(String param) { return R.fail("根据会员折扣、预付金额 计算服务费失败:"+throwable.getMessage()); } ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/TAppCouponServiceImpl.java
@@ -93,6 +93,8 @@ list.add(exchangeRecordVO); } for (ExchangeRecordVO exchangeRecordVO : list) { TAppUser tAppUser = tAppUserMapper.selectById(exchangeRecordVO.getAppUserId()); if (tAppUser!=null)exchangeRecordVO.setPhone(tAppUser.getPhone()); switch (exchangeRecordVO.getWaysToObtain()){ case 1: if (exchangeRecordVO.getId()!=null){ ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TCouponController.java
@@ -112,7 +112,7 @@ @PostMapping("/exchangeRecord") @ApiOperation(tags = {"管理后台-优惠券管理"},value = "优惠券查看详情-兑换记录") public AjaxResult<List<ExchangeRecordVO>> exchangeRecord(@RequestBody ExchangeRecordGoodsQuery dto) { public AjaxResult<PageInfo<ExchangeRecordVO>> exchangeRecord(@RequestBody ExchangeRecordGoodsQuery dto) { List<ExchangeRecordVO> data = appCouponClient.getExchangeRecordByCouponId(dto).getData(); for (ExchangeRecordVO record : data) { TCoupon byId = tCouponService.getById(record.getCouponId()); @@ -129,7 +129,7 @@ } PageInfo<ExchangeRecordVO> exchangeRecordVOPageInfo = new PageInfo<>(1, 99999999); exchangeRecordVOPageInfo.setRecords(data); return AjaxResult.ok(data); return AjaxResult.ok(exchangeRecordVOPageInfo); }
