|
|
@@ -563,6 +563,42 @@ public class FacetofaceService {
|
|
|
return order;
|
|
|
}
|
|
|
|
|
|
+ // ========== 收款记录查询 ==========
|
|
|
+
|
|
|
+ /** 收款记录分页列表 */
|
|
|
+ public PageResult<F2fTradeRecordVO> tradeList(int pageNo, int pageSize,
|
|
|
+ String enterpriseId, String tradeStatus, String startDate, String endDate) {
|
|
|
+ LambdaQueryWrapper<F2fTradeRecordEntity> w = new LambdaQueryWrapper<>();
|
|
|
+ if (StrUtil.isNotBlank(enterpriseId)) {
|
|
|
+ w.eq(F2fTradeRecordEntity::getEnterpriseId, enterpriseId);
|
|
|
+ }
|
|
|
+ if (StrUtil.isNotBlank(tradeStatus)) {
|
|
|
+ w.eq(F2fTradeRecordEntity::getTradeStatus, tradeStatus);
|
|
|
+ }
|
|
|
+ if (StrUtil.isNotBlank(startDate)) {
|
|
|
+ w.ge(F2fTradeRecordEntity::getCreatedTime, OffsetDateTime.parse(startDate + "T00:00:00+08:00"));
|
|
|
+ }
|
|
|
+ if (StrUtil.isNotBlank(endDate)) {
|
|
|
+ w.le(F2fTradeRecordEntity::getCreatedTime, OffsetDateTime.parse(endDate + "T23:59:59+08:00"));
|
|
|
+ }
|
|
|
+ w.orderByDesc(F2fTradeRecordEntity::getId);
|
|
|
+ Page<F2fTradeRecordEntity> page = new Page<>(pageNo, pageSize);
|
|
|
+ Page<F2fTradeRecordEntity> result = tradeRecordMapper.selectPage(page, w);
|
|
|
+ return PageResult.of(pageNo, pageSize, result.getTotal(),
|
|
|
+ result.getRecords().stream()
|
|
|
+ .map(e -> BeanUtil.copyProperties(e, F2fTradeRecordVO.class))
|
|
|
+ .collect(Collectors.toList()));
|
|
|
+ }
|
|
|
+
|
|
|
+ /** 收款记录详情 */
|
|
|
+ public F2fTradeRecordVO tradeDetail(Long id) {
|
|
|
+ F2fTradeRecordEntity e = tradeRecordMapper.selectById(id);
|
|
|
+ if (e == null) {
|
|
|
+ throw new BusinessException(404, "收款记录不存在");
|
|
|
+ }
|
|
|
+ return BeanUtil.copyProperties(e, F2fTradeRecordVO.class);
|
|
|
+ }
|
|
|
+
|
|
|
// ========== 定时轮询 ==========
|
|
|
|
|
|
/** 获取待轮询的交易记录 */
|