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

查询待支付订单, 添加订单号

Browse Source
This commit is contained in:
Guoqs
2025-04-01 17:04:34 +08:00
parent c437aa7ed1
commit f12cca4b9d
5 changed files with 64 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -139,4 +139,6 @@ public interface OrderPileOccupyMapper {
* @return
*/
int makeOrderFree(String occupyCode);
}
List<OrderPileOccupy> queryUnPayOrderListByMemberId(String memberId);
}

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

@@ -84,6 +84,8 @@ public interface OrderPileOccupyService{
Map<String, Object> payOccupyPileOrder(PayOrderDTO dto);
List<OrderPileOccupy> queryUnPayOrderListByMemberId(String memberId);
Map<String, Object> queryUnPayOrder(String memberId);
/**

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

@@ -413,17 +413,23 @@ public class OrderPileOccupyServiceImpl implements OrderPileOccupyService {
return orderPileOccupyMapper.queryUnPayOrderByMemberId(memberId);
}
@Override
public List<OrderPileOccupy> queryUnPayOrderListByMemberId(String memberId) {
return orderPileOccupyMapper.queryUnPayOrderListByMemberId(memberId);
}
@Override
public Map<String, Object> queryUnPayOrder(String memberId) {
Map<String, Object> resultMap = Maps.newHashMap();
OrderPileOccupy orderPileOccupy = orderPileOccupyMapper.queryUnPayOrderByMemberId(memberId);
if (orderPileOccupy != null) {
resultMap.put("occupyCode", orderPileOccupy.getOccupyCode());
List<OrderPileOccupy> orderPileOccupyList = this.queryUnPayOrderListByMemberId(memberId);
if (CollectionUtils.isNotEmpty(orderPileOccupyList)) {
List<String> occupyOrderCode = orderPileOccupyList.stream().map(OrderPileOccupy::getOccupyCode).collect(Collectors.toList());
resultMap.put("occupyOrderCode", occupyOrderCode);
}
List<OrderBasicInfo> orderList = orderBasicInfoService.queryRepayOrder(memberId);
if (CollectionUtils.isNotEmpty(orderList)) {
List<String> orderCodeList = orderList.stream().map(OrderBasicInfo::getOrderCode).collect(Collectors.toList());
resultMap.put("occupyCode", orderCodeList);
resultMap.put("chargerOrderCode", orderCodeList);
}
return resultMap;
}

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

@@ -949,6 +949,20 @@
limit 1
</select>
<select id="queryUnPayOrderListByMemberId" resultMap="BaseResultMap">
select
<include refid="Base_Column_List"/>
from
order_pile_occupy
where
del_flag = '0'
and
pay_status = '0'
and status = '2'
and member_id = #{memberId,jdbcType=VARCHAR}
order by create_time desc
</select>
<select id="selectOrderPileOccupyList" parameterType="com.jsowell.pile.domain.OrderPileOccupy" resultMap="BaseResultMap">
select
<include refid="Base_Column_List"/>
@@ -1026,4 +1040,4 @@
</where>
order by t1.create_time desc
</select>
</mapper>
</mapper>