update 修改查询停车减免接口字段

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<ParkingOrderVO> queryParkingOrderList(String memberId);
+
+    /**
+     * 分页查询停车优免记录（联表查询站点名称和优免信息）
+     *
+     * @param queryDTO 查询条件
+     * @return 停车优免记录列表
+     */
+    List<ParkingCouponRecordVO> selectParkingCouponRecordList(ParkingCouponRecordQueryDTO queryDTO);
 }

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<ParkingCouponRecordVO> list = carCouponRecordMapper.selectParkingCouponRecordList(dto);
+        List<ParkingCouponRecordVO> list = carCouponRecordService.selectParkingCouponRecordList(dto);
 
         // 构建 PageInfo
         PageInfo<ParkingCouponRecordVO> pageInfo = new PageInfo<>(list);

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<ParkingOrderVO> queryParkingOrderList(String memberId) {
         return carCouponRecordMapper.queryParkingOrderList(memberId);
     }
+
+    @Override
+    public List<ParkingCouponRecordVO> selectParkingCouponRecordList(ParkingCouponRecordQueryDTO queryDTO) {
+        List<ParkingCouponRecordVO> 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;
+    }
 }

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;
 }

jsowell-pile/src/main/resources/mapper/pile/CarCouponRecordMapper.xml

@@ -31,6 +31,7 @@
         <result property="startTime" column="start_time" />
         <result property="endTime" column="end_time" />
         <result property="createTime" column="create_time" />
+        <result property="mobileNumber" column="mobile_number" />
     </resultMap>
 
     <sql id="selectCarCouponRecordVo">
@@ -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
         <where>
             ccr.del_flag = '0'
             <if test="stationId != null">