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

update

Browse Source
This commit is contained in:
autumn.g@foxmail.com
2023-12-04 09:12:29 +08:00
parent fb458fa9b3
commit 8965cd0526
3 changed files with 43 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/AdapayCallbackRecordServiceImpl.java
View File

@@ -1,5 +1,6 @@
package com.jsowell.pile.service.impl;
import com.google.common.collect.Maps;
import com.jsowell.common.constant.CacheConstants;
import com.jsowell.common.core.redis.RedisCache;
import com.jsowell.common.util.StringUtils;
@@ -11,6 +12,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
import java.util.Map;
@Slf4j
@Service
@@ -56,6 +58,21 @@ public class AdapayCallbackRecordServiceImpl implements AdapayCallbackRecordServ
return record;
}
/**
* 批量查询支付回调记录
* @param orderCodeList
* @return
*/
public Map<String, AdapayCallbackRecord> selectByOrderCodeList(List<String> orderCodeList) {
Map<String, AdapayCallbackRecord> resultMap = Maps.newHashMap();
// 批量取缓存
// 没有从缓存取到的查数据库
return resultMap;
}
@Override
public AdapayCallbackRecord selectByPaymentId(String paymentId) {
if (StringUtils.isBlank(paymentId)) {

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

@@ -222,8 +222,8 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService {
}
// 批量查手续费
List<String> orderCodeList = orderListVOS.stream().map(OrderListVO::getOrderCode).collect(Collectors.toList());
Map<String, ClearingBillDetail> billDetailMap = clearingBillDetailService.selectByOrderCodeList(orderCodeList);
// List<String> orderCodeList = orderListVOS.stream().map(OrderListVO::getOrderCode).collect(Collectors.toList());
// Map<String, ClearingBillDetail> billDetailMap = clearingBillDetailService.selectByOrderCodeList(orderCodeList);
for (OrderListVO orderListVO : orderListVOS) {
// 如果是微信支付，通过订单号查询微信支付单号
@@ -253,13 +253,30 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService {
orderListVO.setChargingTime(DateUtils.getDatePoor(DateUtils.parseDate(chargeEndTime), DateUtils.parseDate(chargeStartTime)));
}
// 交易手续费
// ClearingBillDetail clearingBillDetail = billDetailMap.get(orderListVO.getOrderCode());
// if (Objects.nonNull(clearingBillDetail)) {
// orderListVO.setFeeAmount(clearingBillDetail.getFeeAmt() + "");
// }
}
batchQueryFeeAmt(orderListVOS);
return orderListVOS;
}
private void batchQueryFeeAmt(List<OrderListVO> orderListVOS) {
// 批量查手续费
List<String> orderCodeList = orderListVOS.stream().map(OrderListVO::getOrderCode).collect(Collectors.toList());
Map<String, ClearingBillDetail> billDetailMap = clearingBillDetailService.selectByOrderCodeList(orderCodeList);
for (OrderListVO orderListVO : orderListVOS) {
// 交易手续费
ClearingBillDetail clearingBillDetail = billDetailMap.get(orderListVO.getOrderCode());
if (Objects.nonNull(clearingBillDetail)) {
orderListVO.setFeeAmount(clearingBillDetail.getFeeAmt() + "");
}
}
return orderListVOS;
}
/*private void tempUpdateVirtualAmount(OrderListVO orderListVO) {
@@ -360,12 +377,15 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService {
// @DataScope(deptAlias = "t3")
public OrderTotalDataVO getOrderTotalData(QueryOrderDTO dto) {
OrderTotalDataVO vo = new OrderTotalDataVO();
// 只计算订单完成状态的
dto.setOrderStatus(OrderStatusEnum.ORDER_COMPLETE.getValue());
// 查询出所有符合条件的订单
List<OrderListVO> list = selectOrderBasicInfoList(dto);
BigDecimal sumOrderAmount = BigDecimal.ZERO;
BigDecimal sumUsedElectricity = BigDecimal.ZERO;
BigDecimal sumSettleAmount = BigDecimal.ZERO;
vo.setDateDescription("创建时间 " + dto.getStartTime() + " - " + dto.getEndTime());
// 计算金额
if (CollectionUtils.isNotEmpty(list)) {
for (OrderListVO orderListVO : list) {
BigDecimal orderAmount = StringUtils.isBlank(orderListVO.getOrderAmount())