From 21c28dc8ab078a31e18e9ce8ce53825391f294cb Mon Sep 17 00:00:00 2001 From: Lemon Date: Fri, 20 Mar 2026 13:48:42 +0800 Subject: [PATCH] =?UTF-8?q?update=20=20=E4=BF=AE=E6=94=B9=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E5=81=9C=E8=BD=A6=E5=87=8F=E5=85=8D=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pile/service/CarCouponRecordService.java | 10 ++++++++ .../impl/BusinessFinancialServiceImpl.java | 6 ++--- .../impl/CarCouponRecordServiceImpl.java | 24 +++++++++++++++++++ .../pile/vo/web/ParkingCouponRecordVO.java | 3 +++ .../mapper/pile/CarCouponRecordMapper.xml | 6 ++++- 5 files changed, 45 insertions(+), 4 deletions(-) diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/CarCouponRecordService.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/CarCouponRecordService.java index e6731b9fb..be6acc79f 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/CarCouponRecordService.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/CarCouponRecordService.java @@ -1,7 +1,9 @@ package com.jsowell.pile.service; import com.jsowell.pile.domain.CarCouponRecord; +import com.jsowell.pile.dto.ParkingCouponRecordQueryDTO; import com.jsowell.pile.vo.uniapp.customer.ParkingOrderVO; +import com.jsowell.pile.vo.web.ParkingCouponRecordVO; import java.util.List; @@ -66,4 +68,12 @@ public interface CarCouponRecordService { public CarCouponRecord selectCarCouponRecord(String orderCode); List queryParkingOrderList(String memberId); + + /** + * 分页查询停车优免记录（联表查询站点名称和优免信息） + * + * @param queryDTO 查询条件 + * @return 停车优免记录列表 + */ + List selectParkingCouponRecordList(ParkingCouponRecordQueryDTO queryDTO); } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/BusinessFinancialServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/BusinessFinancialServiceImpl.java index 2b0f74857..2e069d914 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/BusinessFinancialServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/BusinessFinancialServiceImpl.java @@ -9,8 +9,8 @@ import com.jsowell.common.core.domain.vo.AuthorizedDeptVO; import com.jsowell.common.core.page.PageResponse; import com.jsowell.pile.dto.MerchantOrderReportDTO; import com.jsowell.pile.dto.ParkingCouponRecordQueryDTO; -import com.jsowell.pile.mapper.CarCouponRecordMapper; import com.jsowell.pile.service.BusinessFinancialService; +import com.jsowell.pile.service.CarCouponRecordService; import com.jsowell.pile.service.ClearingWithdrawInfoService; import com.jsowell.pile.service.PileStationInfoService; import com.jsowell.pile.service.SettleOrderReportService; @@ -41,7 +41,7 @@ public class BusinessFinancialServiceImpl implements BusinessFinancialService { private ClearingWithdrawInfoService clearingWithdrawInfoService; @Autowired - private CarCouponRecordMapper carCouponRecordMapper; + private CarCouponRecordService carCouponRecordService; @Autowired private PileStationInfoService pileStationInfoService; @@ -134,7 +134,7 @@ public class BusinessFinancialServiceImpl implements BusinessFinancialService { PageHelper.startPage(dto.getPageNum(), dto.getPageSize()); // 查询列表 - List list = carCouponRecordMapper.selectParkingCouponRecordList(dto); + List list = carCouponRecordService.selectParkingCouponRecordList(dto); // 构建 PageInfo PageInfo pageInfo = new PageInfo<>(list); diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/CarCouponRecordServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/CarCouponRecordServiceImpl.java index f43d61142..e1ceb0616 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/CarCouponRecordServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/CarCouponRecordServiceImpl.java @@ -4,9 +4,11 @@ import com.jsowell.common.constant.CacheConstants; import com.jsowell.common.core.redis.RedisCache; import com.jsowell.common.util.DateUtils; import com.jsowell.pile.domain.CarCouponRecord; +import com.jsowell.pile.dto.ParkingCouponRecordQueryDTO; import com.jsowell.pile.mapper.CarCouponRecordMapper; import com.jsowell.pile.service.CarCouponRecordService; import com.jsowell.pile.vo.uniapp.customer.ParkingOrderVO; +import com.jsowell.pile.vo.web.ParkingCouponRecordVO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -117,4 +119,26 @@ public class CarCouponRecordServiceImpl implements CarCouponRecordService { public List queryParkingOrderList(String memberId) { return carCouponRecordMapper.queryParkingOrderList(memberId); } + + @Override + public List selectParkingCouponRecordList(ParkingCouponRecordQueryDTO queryDTO) { + List list = carCouponRecordMapper.selectParkingCouponRecordList(queryDTO); + + // 循环list，将各参数值换成汉字 + for (ParkingCouponRecordVO parkingCouponRecordVO : list) { + String conditionType = parkingCouponRecordVO.getConditionType(); + if ("1".equals(conditionType)) { + parkingCouponRecordVO.setConditionType("固定电量"); + } else if ("2".equals(conditionType)) { + parkingCouponRecordVO.setConditionType("固定时长"); + } + String discountType = parkingCouponRecordVO.getDiscountType(); + if ("1".equals(discountType)) { + parkingCouponRecordVO.setDiscountType("减免停车时长（单位：分钟）"); + } else if ("2".equals(discountType)) { + parkingCouponRecordVO.setDiscountType("减免停车金额（单位：元）"); + } + } + return list; + } } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/ParkingCouponRecordVO.java b/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/ParkingCouponRecordVO.java index fcbecaa4e..55d6f206f 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/ParkingCouponRecordVO.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/ParkingCouponRecordVO.java @@ -69,4 +69,7 @@ public class ParkingCouponRecordVO { @ApiModelProperty("创建时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private String createTime; + + @ApiModelProperty("会员手机号") + private String mobileNumber; } diff --git a/jsowell-pile/src/main/resources/mapper/pile/CarCouponRecordMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/CarCouponRecordMapper.xml index 0b4c85987..73e13ceaf 100644 --- a/jsowell-pile/src/main/resources/mapper/pile/CarCouponRecordMapper.xml +++ b/jsowell-pile/src/main/resources/mapper/pile/CarCouponRecordMapper.xml @@ -31,6 +31,7 @@ + @@ -143,11 +144,14 @@ cpd.discount_value, cpd.start_time, cpd.end_time, - DATE_FORMAT(ccr.create_time, '%Y-%m-%d %H:%i:%s') AS create_time + DATE_FORMAT(ccr.create_time, '%Y-%m-%d %H:%i:%s') AS create_time, + mb.mobile_number FROM car_coupon_record ccr INNER JOIN pile_station_info psi ON ccr.station_id = psi.id LEFT JOIN charge_parking_discount cpd ON ccr.station_id = cpd.station_id AND cpd.del_flag = '0' + LEFT JOIN order_basic_info obi ON ccr.order_code = obi.order_code + LEFT JOIN member_basic_info mb ON obi.member_id = mb.id ccr.del_flag = '0'