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-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TSettlementConfirm.java
@@ -25,14 +25,14 @@ */ @Data @EqualsAndHashCode(callSuper = false) @TableName("t_settlement confirm") @TableName("t_settlement_confirm") @ApiModel(value="TSettlementConfirm对象", description="") public class TSettlementConfirm extends BasePojo { private static final long serialVersionUID = 1L; @ApiModelProperty(value = "主键") @TableId(value = "id", type = IdType.AUTO) @TableId(value = "id") private Long id; @ApiModelProperty(value = "站点id") @@ -58,7 +58,7 @@ @TableField("loss_electronic") private BigDecimal lossElectronic; @ApiModelProperty(value = "收入合计") @TableField("收入合计") @TableField("income") private BigDecimal income; @ApiModelProperty(value = "场地费") ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/TAppCouponServiceImpl.java
@@ -73,11 +73,17 @@ @Override public List<ExchangeRecordVO> pagelist(ExchangeRecordGoodsQuery dto) { List<Integer> integers = new ArrayList<>(); integers.add(1); integers.add(2); SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); QueryWrapper<TAppCoupon> wrapper = new QueryWrapper<>(); wrapper.eq("coupon_id",dto.getCouponId()); wrapper.in("ways_to_obtain",integers); if (dto.getStatus()!=null){ wrapper.eq("status",dto.getStatus()); } List<TAppCoupon> tAppCoupons = this.baseMapper.selectList(wrapper); List<ExchangeRecordVO> list = new ArrayList<>(); // 订单ids StringBuilder stringBuilder = new StringBuilder(); @@ -87,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-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TApplyChargingPileController.java
@@ -367,9 +367,9 @@ @ApiOperation(value = "下载", tags = {"管理后台-结算表记录"}) @PutMapping("/downloadSettlement") @Log(title = "【结算表记录】下载结算表", businessType = BusinessType.EXPORT) public R downloadSettlement(@RequestBody ExportUidDto uid,HttpServletResponse response) public R downloadSettlement(String uid,HttpServletResponse response) { TSettlementConfirm data = chargingOrderClient.downloadSettlement(uid.getUid()).getData(); TSettlementConfirm data = chargingOrderClient.downloadSettlement(uid).getData(); List<Site> data1 = siteClient.getSiteByIds(Arrays.asList(data.getSiteId())).getData(); if (!data1.isEmpty()){ data.setSiteName(data1.get(0).getName()); ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/FinancialSettlementController.java
@@ -82,8 +82,7 @@ } @ApiOperation(value = "充电时段统计-导出", tags = {"管理后台-财务结算"}) @PutMapping("/export") public void export(@RequestBody ChargingListQuery dto) { public void export(@RequestBody ChargingListQuery dto) { ChargingOrderTimeVO res = chargingOrderService.chargingList(dto); List<TChargingOrderExport> tChargingOrderExports = new ArrayList<>(); List<ChargingOrderListVO> exportList = res.getExportList(); ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java
@@ -625,7 +625,7 @@ @ResponseBody @PostMapping(value = "/watch/chargingOrder") @ApiOperation(value = "监控订单", tags = {"管理后台-订单管理"}) public AjaxResult<TCharingOrderVO> watchChargingOrder(@RequestBody ChargingOrderQuery dto) { public R<List<ChargingOrderAndUploadRealTimeMonitoringDataDto>> watchChargingOrder(@RequestBody ChargingOrderQuery dto) { Integer page = dto.getPageCurr(); Integer pageSize = dto.getPageSize(); List<Long> data = appUserClient.getUserIdsByPhone(dto.getPhone()).getData(); @@ -652,7 +652,7 @@ } return AjaxResult.success(res); return R.ok(dtos); }
@@ -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); }
@@ -221,6 +221,8 @@ //生成积分兑换成功的订单 R<Long> longR = orderClient.exchangeCreate(exchangeDto); if (exchangeDto.getGoodType()==2) { TCoupon coupon = couponService.getById(exchangeDto.getGoodId()); //如果是优惠卷，赠送优惠卷给用户 GrantCouponDto grantCouponDto = new GrantCouponDto(); grantCouponDto.setUserIds(userId.toString()); @@ -228,6 +230,14 @@ grantCouponDto.setWaysToObtain(1); grantCouponDto.setEndTime(LocalDateTime.now()); grantCouponDto.setType(3); switch (coupon.getValidityPeriodMode()){ case 1: grantCouponDto.setEndTime(coupon.getEndTime()); break; case 2: grantCouponDto.setEndTime(LocalDateTime.now().plusDays(coupon.getDays())); break; } appCouponClient.grantCoupon(grantCouponDto); } //生成消耗积分的记录
