autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-05-04 01:50:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

update 后管占桩订单页面

Browse Source
This commit is contained in:
Lemon
2023-09-11 09:21:55 +08:00
parent 660e666f93
commit 0764ebbc43
7 changed files with 106 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
jsowell-pile/src/main/java/com/jsowell/pile/mapper/OrderPileOccupyMapper.java
View File

@@ -4,6 +4,7 @@ import com.jsowell.pile.domain.OrderPileOccupy;
import com.jsowell.pile.dto.QueryOccupyOrderDTO;
import com.jsowell.pile.vo.uniapp.OccupyOrderDetailVO;
import com.jsowell.pile.vo.uniapp.OrderPileOccupyVO;
import com.jsowell.pile.vo.web.OccupyOrderVO;
import org.apache.ibatis.annotations.Param;
import java.util.List;
@@ -123,6 +124,14 @@ public interface OrderPileOccupyMapper {
*/
public List<OrderPileOccupy> selectOrderPileOccupyList(OrderPileOccupy orderPileOccupy);
/**
* 查询占桩订单列表
*
* @param orderPileOccupy 占桩订单
* @return 占桩订单集合
*/
public List<OccupyOrderVO> getOrderPileOccupyList(OrderPileOccupy orderPileOccupy);
/**
* 使该笔订单免费
* @param occupyCode

10
jsowell-pile/src/main/java/com/jsowell/pile/service/OrderPileOccupyService.java
View File

@@ -4,6 +4,8 @@ import com.jsowell.common.core.page.PageResponse;
import com.jsowell.pile.domain.OrderPileOccupy;
import com.jsowell.pile.dto.*;
import com.jsowell.pile.vo.uniapp.OccupyOrderDetailVO;
import com.jsowell.pile.vo.uniapp.OrderPileOccupyVO;
import com.jsowell.pile.vo.web.OccupyOrderVO;
import java.util.List;
import java.util.Map;
@@ -41,6 +43,14 @@ public interface OrderPileOccupyService{
*/
public List<OrderPileOccupy> selectOrderPileOccupyList(OrderPileOccupy orderPileOccupy);
/**
* 查询占桩订单列表
*
* @param orderPileOccupy 占桩订单
* @return 占桩订单集合
*/
List<OccupyOrderVO> getOrderPileOccupyList(OrderPileOccupy orderPileOccupy);
List<OrderPileOccupy> queryOccupyOrderList(QueryOccupyOrderDTO dto);
/**

6
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderPileOccupyServiceImpl.java
View File

@@ -30,6 +30,7 @@ import com.jsowell.pile.vo.uniapp.MemberVO;
import com.jsowell.pile.vo.uniapp.OccupyOrderDetailVO;
import com.jsowell.pile.vo.uniapp.OrderPileOccupyVO;
import com.jsowell.pile.vo.web.BillingTemplateVO;
import com.jsowell.pile.vo.web.OccupyOrderVO;
import com.jsowell.pile.vo.web.OrderListVO;
import com.jsowell.pile.vo.web.UpdateMemberBalanceDTO;
import lombok.extern.slf4j.Slf4j;
@@ -149,6 +150,11 @@ public class OrderPileOccupyServiceImpl implements OrderPileOccupyService {
return orderPileOccupyMapper.selectOrderPileOccupyList(orderPileOccupy);
}
@Override
public List<OccupyOrderVO> getOrderPileOccupyList(OrderPileOccupy orderPileOccupy) {
return orderPileOccupyMapper.getOrderPileOccupyList(orderPileOccupy);
}
/**
* 查询占桩订单列表
*

27
jsowell-pile/src/main/java/com/jsowell/pile/vo/web/OccupyOrderVO.java Normal file
View File

@@ -0,0 +1,27 @@
package com.jsowell.pile.vo.web;
import lombok.Data;
import java.math.BigDecimal;
/**
* 占桩订单查询VO
*
* @author Lemon
* @Date 2023/9/11 9:06
*/
@Data
public class OccupyOrderVO {
private String id;
private String occupyCode;
private String status;
private String memberId;
private String stationId;
private String stationName;
private String startTime;
private String endTime;
private String payStatus;
private BigDecimal orderAmount;
private String pileSn;
private String connectorCode;
}

29
jsowell-pile/src/main/resources/mapper/pile/OrderPileOccupyMapper.xml
View File

@@ -934,4 +934,33 @@
status = '1', pay_status = '2'
where occupy_code = #{occupyCode,jdbcType=VARCHAR}
</update>
<select id="getOrderPileOccupyList" resultType="com.jsowell.pile.vo.web.OccupyOrderVO">
SELECT
t1.id,
t1.occupy_code AS occupyCode,
t1.STATUS,
t1.member_id AS memberId,
t1.station_id AS stationId,
t2.station_name AS stationName,
t1.start_time AS startTime,
t1.end_time AS endTime,
t1.pay_status AS payStatus,
t1.order_amount AS orderAmount,
t1.pile_sn AS pileSn,
t1.connector_code AS connectorCode
FROM
order_pile_occupy t1
JOIN pile_station_info t2 ON t1.station_id = t2.id
AND t1.del_flag = '0'
<where>
<if test="occupyCode != null and occupyCode != ''"> and t1.occupy_code = #{occupyCode}</if>
<if test="memberId != null and memberId != ''"> and t1.member_id = #{memberId}</if>
<if test="stationId != null and stationId != ''"> and t1.station_id = #{stationId}</if>
<if test="startTime != null "> and t1.start_time = #{startTime}</if>
<if test="orderAmount != null "> and t1.order_amount = #{orderAmount}</if>
<if test="pileSn != null and pileSn != ''"> and t1.pile_sn = #{pileSn}</if>
<if test="pileConnectorCode != null and pileConnectorCode != ''"> and t1.pile_connector_code = #{pileConnectorCode}</if>
</where>
</select>
</mapper>