autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-05-14 23:08: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

70
jsowell-admin/src/test/resources/payment_ids
View File

@@ -1,36 +1,34 @@
002212025030719382010744049501247139840 002212025032915142210751955601597734912
002212025030719563810744054105780006912 002212025032919093310752014787236806656
002212025030720004310744055134645907456 002212025032920030110752028244699078656
002212025030721111810744072895195803648 002212025032920285610752034766063448064
002212025030721380110744079620944789504 002212025032921074210752044521727410176
002212025030722072910744087036189773824 002212025032921283110752049762299731968
002212025030722132710744088537997561856 002212025032922102310752060299081920512
002212025030722192210744090026037493760 002212025032923135510752076287633514496
002212025030722550110744098998728314880 002212025032923211210752078119734157312
002212025030723423710744110974292180992 002212025033000474110752099882703876096
002212025030805292510744198248994275328 002212025033002041010752119131252670464
002212025030808554110744250158658613248 002212025033002315410752126111907504128
002212025030810021210744266897726410752 002212025033002325510752126364861255680
002212025030810524610744279623020326912 002212025033009231610752229633576353792
002212025030812184410744301257437491200 002212025033011374810752263490099044352
002212025030813573910744326153365184512 002212025033012152110752272941978406912
002212025030814204710744331972939493376 002212025033012413410752279538750377984
002212025030814493010744339201237766144 002212025033012483010752281281870094336
002212025030815441210744352967786770432 002212025033013052810752285554038104064
002212025030815565310744356155980025856 002212025033013292710752291588776583168
002212025030817010010744372291815133184 002212025033014100310752301806019506176
002212025030817021410744372602568949760 002212025033014104410752301975624716288
002212025030817054810744373499642003456 002212025033014330810752307615012478976
002212025030817332810744380463881416704 002212025033016395110752339504127991808
002212025030817455010744383575298199552 002212025033016463710752341205360824320
002212025030818045210744388367630766080 002212025033016524710752342758734409728
002212025030818111410744389967211974656 002212025033017123710752347748914257920
002212025030818290110744394441994625024 002212025033017155610752348584297029632
002212025030819011310744402545598148608 002212025033017350110752353387578380288
002212025030819104310744404935923609600 002212025033017583110752359300771319808
002212025030819110810744405041255165952 002212025033018144810752363397305954304
002212025030819165410744406495237521408 002212025033018543710752373420931891200
002212025030820033810744418252571099136 002212025033019321710752382899547893760
002212025030820311210744425190327402496 002212025033021190810752409787475611648
002212025030821023510744433088702984192
002212025030821030310744433209268031488

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

@@ -139,4 +139,6 @@ public interface OrderPileOccupyMapper {
* @return * @return
*/ */
int makeOrderFree(String occupyCode); 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); Map<String, Object> payOccupyPileOrder(PayOrderDTO dto);
List<OrderPileOccupy> queryUnPayOrderListByMemberId(String memberId);
Map<String, Object> queryUnPayOrder(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); return orderPileOccupyMapper.queryUnPayOrderByMemberId(memberId);
} }
@Override
public List<OrderPileOccupy> queryUnPayOrderListByMemberId(String memberId) {
return orderPileOccupyMapper.queryUnPayOrderListByMemberId(memberId);
}
@Override @Override
public Map<String, Object> queryUnPayOrder(String memberId) { public Map<String, Object> queryUnPayOrder(String memberId) {
Map<String, Object> resultMap = Maps.newHashMap(); Map<String, Object> resultMap = Maps.newHashMap();
OrderPileOccupy orderPileOccupy = orderPileOccupyMapper.queryUnPayOrderByMemberId(memberId); List<OrderPileOccupy> orderPileOccupyList = this.queryUnPayOrderListByMemberId(memberId);
if (orderPileOccupy != null) { if (CollectionUtils.isNotEmpty(orderPileOccupyList)) {
resultMap.put("occupyCode", orderPileOccupy.getOccupyCode()); List<String> occupyOrderCode = orderPileOccupyList.stream().map(OrderPileOccupy::getOccupyCode).collect(Collectors.toList());
resultMap.put("occupyOrderCode", occupyOrderCode);
} }
List<OrderBasicInfo> orderList = orderBasicInfoService.queryRepayOrder(memberId); List<OrderBasicInfo> orderList = orderBasicInfoService.queryRepayOrder(memberId);
if (CollectionUtils.isNotEmpty(orderList)) { if (CollectionUtils.isNotEmpty(orderList)) {
List<String> orderCodeList = orderList.stream().map(OrderBasicInfo::getOrderCode).collect(Collectors.toList()); List<String> orderCodeList = orderList.stream().map(OrderBasicInfo::getOrderCode).collect(Collectors.toList());
resultMap.put("occupyCode", orderCodeList); resultMap.put("chargerOrderCode", orderCodeList);
} }
return resultMap; return resultMap;
} }

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

@@ -949,6 +949,20 @@
limit 1 limit 1
</select> </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 id="selectOrderPileOccupyList" parameterType="com.jsowell.pile.domain.OrderPileOccupy" resultMap="BaseResultMap">
select select
<include refid="Base_Column_List"/> <include refid="Base_Column_List"/>
@@ -1026,4 +1040,4 @@
</where> </where>
order by t1.create_time desc order by t1.create_time desc
</select> </select>
</mapper> </mapper>