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

查询未分账订单

Browse Source
This commit is contained in:
autumn.g@foxmail.com
2023-08-22 14:01:17 +08:00
parent e6694e6f1c
commit 0c251260ad
4 changed files with 70 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4,6 +4,7 @@ import com.jsowell.common.core.page.PageResponse;
import com.jsowell.pile.domain.SettleOrderReport;
import com.jsowell.pile.dto.MerchantOrderReportDTO;
import com.jsowell.pile.dto.SettleOrderReportDTO;
import com.jsowell.pile.vo.web.ClearingBillVO;
import com.jsowell.pile.vo.web.MerchantOrderReportVO;
import java.util.List;
@@ -99,4 +100,6 @@ public interface ISettleOrderReportService {
int batchInsert(List<SettleOrderReport> list);
List<SettleOrderReport> queryOrderReport(List<String> stationIdList, String startTime, String endTime);
List<ClearingBillVO> queryUndividedOrder(SettleOrderReportDTO dto);
}

5
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java
View File

@@ -2811,6 +2811,11 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService {
}
}
@Override
public void queryUndividedOrder(SettleOrderReportDTO dto) {
}
/**
* 使用汇付支付
*

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

@@ -7,6 +7,7 @@ import com.jsowell.adapay.dto.QueryPaymentConfirmDTO;
import com.jsowell.adapay.response.QueryPaymentConfirmDetailResponse;
import com.jsowell.adapay.service.AdapayService;
import com.jsowell.common.core.page.PageResponse;
import com.jsowell.common.exception.BusinessException;
import com.jsowell.common.util.DateUtils;
import com.jsowell.common.util.PageUtils;
import com.jsowell.common.util.StringUtils;
@@ -69,6 +70,37 @@ public class SettleOrderReportServiceImpl implements ISettleOrderReportService {
return settleOrderReportMapper.selectByStationIdAndDate(stationId, date);
}
@Override
public List<ClearingBillVO> queryUndividedOrder(SettleOrderReportDTO dto) {
List<ClearingBillVO> resultList = Lists.newArrayList();
SettleOrderReport orderReport = selectByStationIdAndDate(dto.getStationId(), dto.getTradeDate());
if (orderReport == null) {
throw new BusinessException("00300002", "查询站点订单日报为空");
}
String orderCodes = orderReport.getOrderCodes();
List<String> orderCodeList = Lists.newArrayList(StringUtils.split(orderCodes, ","));
List<ClearingBillVO> clearingBillVOList = clearingWithdrawInfoService.selectWithdrawInfoByOrderCodeList(orderCodeList);
if (CollectionUtils.isEmpty(clearingBillVOList)) {
throw new BusinessException("00300005", "查询清分信息为空");
}
String wechatAppId = pileMerchantInfoService.queryAppIdByMerchantId(orderReport.getMerchantId());
for (ClearingBillVO clearingBillVO : clearingBillVOList) {
String paymentId = clearingBillVO.getPaymentId();
QueryPaymentConfirmDTO build = QueryPaymentConfirmDTO.builder()
.wechatAppId(wechatAppId)
.paymentId(paymentId)
.build();
QueryPaymentConfirmDetailResponse response = adapayService.queryPaymentConfirmList(build);
List<QueryPaymentConfirmDetailResponse.PaymentConfirmInfo> paymentConfirms = response.getPaymentConfirms();
if (paymentConfirms == null) {
resultList.add(clearingBillVO);
}
}
return resultList;
}
/**
* 查询站点订单日报明细
* 分页查询
@@ -320,5 +352,6 @@ public class SettleOrderReportServiceImpl implements ISettleOrderReportService {
public List<SettleOrderReport> queryOrderReport(List<String> stationIdList, String startTime, String endTime) {
return settleOrderReportMapper.queryOrderReport(stationIdList, startTime, endTime);
}
}