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

Merge branch 'dev' into feature-insuranceRefund

Browse Source
This commit is contained in:
Lemon
2026-03-13 09:52:17 +08:00
parent 9eb9d44348 7842fc88ef
commit 7c6336b0c6
9 changed files with 926 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
jsowell-pile/src/main/java/com/jsowell/pile/mapper/AdapayUnsplitRecordMapper.java
View File

@@ -31,6 +31,8 @@ public interface AdapayUnsplitRecordMapper {
int batchInsert(@Param("list") List<AdapayUnsplitRecord> list);
int batchInsertOrUpdateSelective(@Param("list") List<AdapayUnsplitRecord> list);
List<AdapayUnsplitRecord> queryUnsplitOrders(@Param("startTime") String startTime, @Param("endTime") String endTime);
List<AdapayUnsplitRecordVO> queryList();

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

@@ -28,6 +28,8 @@ public interface AdapayUnsplitRecordService{
int batchInsert(List<AdapayUnsplitRecord> list);
int batchInsertOrUpdateSelective(List<AdapayUnsplitRecord> list);
List<AdapayUnsplitRecord> queryUnsplitOrders(String startTime, String endTime);
List<AdapayUnsplitRecordVO> queryList();

3
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/ClearingWithdrawInfoServiceImpl.java
View File

@@ -92,6 +92,9 @@ public class ClearingWithdrawInfoServiceImpl implements ClearingWithdrawInfoServ
@Override
public List<ClearingBillVO> selectWithdrawInfoByOrderCodeList(List<String> orderCodeList) {
if (CollectionUtils.isEmpty(orderCodeList)) {
return Lists.newArrayList();
}
return clearingWithdrawInfoMapper.selectWithdrawInfoByOrderCodeList(orderCodeList);
}

3
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/SettleOrderReportServiceImpl.java
View File

@@ -109,6 +109,9 @@ public class SettleOrderReportServiceImpl implements SettleOrderReportService {
// 查询订单支付信息 分页
int pageNum = dto.getPageNum() != null ? dto.getPageNum() : 1;
int pageSize = dto.getPageSize() != null ? dto.getPageSize() : 10;
if (CollectionUtils.isEmpty(orderCodes)) {
return new PageResponse();
}
PageHelper.startPage(pageNum, pageSize);
List<ClearingBillVO> clearingBillVOList = clearingWithdrawInfoService.selectWithdrawInfoByOrderCodeList(orderCodes);
PageInfo<ClearingBillVO> pageInfo = new PageInfo<>(clearingBillVOList);

5
jsowell-pile/src/main/java/com/jsowell/web/controller/pile/AdapayUnsplitRecordServiceImpl.java
View File

@@ -69,6 +69,11 @@ public class AdapayUnsplitRecordServiceImpl implements AdapayUnsplitRecordServic
return adapayUnsplitRecordMapper.batchInsert(list);
}
@Override
public int batchInsertOrUpdateSelective(List<AdapayUnsplitRecord> list) {
return adapayUnsplitRecordMapper.batchInsertOrUpdateSelective(list);
}
@Override
public List<AdapayUnsplitRecord> queryUnsplitOrders(String startTime, String endTime) {
return adapayUnsplitRecordMapper.queryUnsplitOrders(startTime, endTime);