停车支付

src/main/java/com/charging/chargingparking/entity/ParkingPay.java

@@ -22,6 +22,12 @@ public class ParkingPay implements Serializable {
     @TableId
     private String id;
 
+    /**
+     * 车牌号
+     */
+    @TableField(exist = false)
+    private String carNum;
+
     /**
      * 停车记录表
      */

src/main/java/com/charging/chargingparking/modules/backController/BackParkingPayController.java

@@ -3,14 +3,24 @@ package com.charging.chargingparking.modules.backController;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.charging.chargingparking.dto.MessageResult;
+import com.charging.chargingparking.dto.PojoUtils;
+import com.charging.chargingparking.entity.ParkingInfo;
 import com.charging.chargingparking.entity.ParkingPay;
+import com.charging.chargingparking.entity.ParkingRecord;
+import com.charging.chargingparking.modules.common.dto.Sort;
+import com.charging.chargingparking.service.ParkingInfoService;
 import com.charging.chargingparking.service.ParkingPayService;
+import com.charging.chargingparking.service.ParkingRecordService;
+import com.charging.chargingparking.utils.StringUtils;
+import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 
 /**
@@ -22,6 +32,9 @@ import org.springframework.web.bind.annotation.RestController;
 @RequestMapping("/backParkingPay")
 public class BackParkingPayController {
 
+    @Autowired
+    private ParkingRecordService parkingRecordService;
+
     @Autowired
     private ParkingPayService parkingPayService;
 
@@ -45,4 +58,61 @@ public class BackParkingPayController {
 
         return messageResult;
     }
+
+    @ApiOperation(value = "列表")
+    @RequestMapping(value = "pageList", method = RequestMethod.POST)
+    public MessageResult<Map> pageList(
+            String carNum, String payTimeRange,
+            @RequestParam(value = "pageIndex", defaultValue = "1") int pageIndex,
+            @RequestParam(value = "pageSize", defaultValue = "20") int pageSize,
+            @RequestAttribute String subject) {
+
+
+        //当前用户ID
+        System.out.println(subject);
+
+        MessageResult<Map> msgResult = new MessageResult<>();
+
+        Map<String, Object> searchParams = new HashMap<>();
+
+        List<Sort> sortList = new ArrayList<>();
+        sortList.add(new Sort("a.create_time", "desc"));
+
+        if (StringUtils.isNotEmpty(carNum)) {
+            searchParams.put("carNum", "%" + carNum + "%");
+        }
+
+        if (StringUtils.isNotEmpty(payTimeRange)) {
+            String[] timeRangeArray = payTimeRange.split(",");
+            String startTime = "";
+            String endTime = "";
+            if (timeRangeArray.length == 1) {
+                startTime = timeRangeArray[0];
+                startTime += " 00:00:00";
+            } else if (timeRangeArray.length == 2) {
+                startTime = timeRangeArray[0];
+                endTime = timeRangeArray[1];
+                startTime += " 00:00:00";
+                endTime += " 23:59:59";
+            }
+
+            searchParams.put("pay_time_start", startTime);
+            searchParams.put("pay_time_end", endTime);
+        }
+
+
+        com.github.pagehelper.Page<ParkingPay> page = parkingPayService.pageSearch(searchParams, pageIndex, pageSize, sortList);
+
+        for (ParkingPay parkingPay : page) {
+            ParkingRecord parkingRecord = parkingRecordService.getById(parkingPay.getParkingRecordId());
+            if (parkingRecord != null) {
+                parkingPay.setCarNum(parkingRecord.getCarNum());
+            }
+        }
+
+        msgResult.setResult(true);
+        msgResult.setData(PojoUtils.pageWrapper(page));
+
+        return msgResult;
+    }
 }

src/main/java/com/charging/chargingparking/modules/backController/BackParkingRecordController.java

@@ -79,8 +79,8 @@ public class BackParkingRecordController {
     @ApiOperation(value = "列表")
     @RequestMapping(value = "pageList", method = RequestMethod.POST)
     public MessageResult<Map> pageList(
-            String carNum, String parkId, String inParkingTimeStart,String inParkingTimeEnd,
-            String outParkingTimeStart, String outParkingTimeEnd,
+            String carNum, String parkId, String inParkingTimeRange,
+            String outParkingTimeRange,
             String status,
             @RequestParam(value = "pageIndex", defaultValue = "1") int pageIndex,
             @RequestParam(value = "pageSize", defaultValue = "20") int pageSize,
@@ -107,25 +107,27 @@ public class BackParkingRecordController {
         if (StringUtils.isNotEmpty(status)) {
             searchParams.put("status", status);
         }
-        if(StringUtils.isNotEmpty(inParkingTimeStart))
-        {
-            searchParams.put("inParkingTimeStart",inParkingTimeStart);
-        }
-        if(StringUtils.isNotEmpty(inParkingTimeEnd))
-        {
-            searchParams.put("inParkingTimeEnd",inParkingTimeEnd);
-        }
-        if(StringUtils.isNotEmpty(outParkingTimeStart))
-        {
-            searchParams.put("outParkingTimeStart",outParkingTimeStart);
-        }
-        if(StringUtils.isNotEmpty(outParkingTimeEnd))
-        {
-            searchParams.put("outParkingTimeEnd",outParkingTimeEnd);
+
+        if (StringUtils.isNotEmpty(inParkingTimeRange)) {
+            String[] timeRangeArray = inParkingTimeRange.split(",");
+            String startTime = "";
+            String endTime = "";
+            if (timeRangeArray.length == 1) {
+                startTime = timeRangeArray[0];
+                startTime += " 00:00:00";
+            } else if (timeRangeArray.length == 2) {
+                startTime = timeRangeArray[0];
+                endTime = timeRangeArray[1];
+                startTime += " 00:00:00";
+                endTime += " 23:59:59";
+            }
+
+            searchParams.put("inParkingTimeStart", startTime);
+            searchParams.put("inParkingTimeEnd", endTime);
         }
-/*
-        if (StringUtils.isNotEmpty(rangeDate)) {
-            String[] timeRangeArray = rangeDate.split(",");
+
+        if (StringUtils.isNotEmpty(outParkingTimeRange)) {
+            String[] timeRangeArray = outParkingTimeRange.split(",");
             String startTime = "";
             String endTime = "";
             if (timeRangeArray.length == 1) {
@@ -138,11 +140,10 @@ public class BackParkingRecordController {
                 endTime += " 23:59:59";
             }
 
-            searchParams.put("startTime", startTime);
-            searchParams.put("endTime", endTime);
+            searchParams.put("outParkingTimeStart", startTime);
+            searchParams.put("outParkingTimeEnd", endTime);
         }
 
-*/
         com.github.pagehelper.Page<ParkingRecord> page = parkingRecordService.pageSearch(searchParams, pageIndex, pageSize, sortList);
 
         for (ParkingRecord parkingMember : page) {

src/main/resources/mapper/ParkingPayMapper.xml

@@ -55,30 +55,22 @@
             limit 1
     </select>
 
-
     <select id="search" parameterType="hashmap" resultMap="BaseResultMap">
         <![CDATA[
-			select * from base_parking_member a
-			inner join base_parking_info b on a.park_id = b.id
+			select * from base_parking_pay a join base_parking_record b
 		]]>
-        where a.del_flag=false and b.del_flag=false
-        <if test="searchParams.parkName != null">
-            and b.parking_name like #{searchParams.parkName}
-        </if>
-        <if test="searchParams.memberCarNum != null">
-            and a.member_car_num = #{searchParams.memberCarNum}
-        </if>
-        <if test="searchParams.cloudDelFlag != null">
-            and a.cloud_del_flag = #{searchParams.cloudDelFlag}
+        where a.del_flag=false and b.del_flag=false and a.parking_record_id = b.id
+        <if test="searchParams.carNum != null">
+            and b.car_num like #{searchParams.carNum}
         </if>
-        <if test="searchParams.startTime != null">
+        <if test="searchParams.pay_time_start != null">
             <![CDATA[
-                  and a.member_start_time >= #{searchParams.startTime}
+                  and a.pay_time >= #{searchParams.pay_time_start}
             ]]>
         </if>
-        <if test="searchParams.endTime != null">
+        <if test="searchParams.pay_time_end != null">
             <![CDATA[
-                  and a.member_start_time <= #{searchParams.endTime}
+                  and a.pay_time <= #{searchParams.pay_time_end}
             ]]>
         </if>
         <foreach item="sort" collection="sortList" open="order by" separator=",">

src/main/resources/mapper/ParkingRecordMapper.xml

@@ -68,9 +68,9 @@
         <if test="searchParams.status != null">
             and a.release_status = #{searchParams.status}
         </if>
-        <if test="searchParams.startTime != null">
+        <if test="searchParams.inParkingTimeStart != null">
             <![CDATA[
-                  and a.in_parking_time >= #{searchParams.startTime}
+                  and a.in_parking_time >= #{searchParams.inParkingTimeStart}
             ]]>
         </if>
         <if test="searchParams.inParkingTimeEnd != null">
@@ -88,25 +88,7 @@
                   and a.out_parking_time <= #{searchParams.outParkingTimeEnd}
             ]]>
         </if>
-    <!--
-        <if test="searchParams.carNum != null">
-            and a.carNum like #{searchParams.parkName}
-        </if>
 
-        <if test="searchParams.cloudDelFlag != null">
-            and a.cloud_del_flag = #{searchParams.cloudDelFlag}
-        </if>
-        <if test="searchParams.startTime != null">
-            <![CDATA[
-                  and a.member_start_time >= #{searchParams.startTime}
-            ]]>
-        </if>
-        <if test="searchParams.endTime != null">
-            <![CDATA[
-                  and a.member_start_time <= #{searchParams.endTime}
-            ]]>
-        </if>
-        -->
         <foreach item="sort" collection="sortList" open="order by" separator=",">
             ${sort.name} ${sort.order}
         </foreach>