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

Merge branch 'dev' of http://192.168.2.2:8099/jsowell/jsowell-charger-web into dev

Browse Source
This commit is contained in:
Lemon
2024-01-14 16:36:37 +08:00
parent ed31db97ad d990412cda
commit c35b86c728
11 changed files with 263 additions and 302 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -220,10 +220,6 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService {
return orderListVOS;
}
// 批量查手续费
// List<String> orderCodeList = orderListVOS.stream().map(OrderListVO::getOrderCode).collect(Collectors.toList());
// Map<String, ClearingBillDetail> billDetailMap = clearingBillDetailService.selectByOrderCodeList(orderCodeList);
for (OrderListVO orderListVO : orderListVOS) {
// 如果是微信支付，通过订单号查询微信支付单号
// logger.info("如果是微信支付，通过订单号查询微信支付单号 orderListVO:{}", JSON.toJSONString(orderListVO));
@@ -252,11 +248,6 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService {
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);
@@ -2338,7 +2329,7 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService {
if (StringUtils.equals(orderListVO.getOrderStatus(), OrderStatusEnum.IN_THE_CHARGING.getValue())) {
// 修改数据库订单状态
OrderBasicInfo info = OrderBasicInfo.builder()
.id(Long.parseLong(orderListVO.getId()))
.id(Integer.parseInt(orderListVO.getId()))
.orderStatus(OrderStatusEnum.ABNORMAL.getValue())
.build();
updateOrderBasicInfo(info);

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

@@ -74,7 +74,7 @@ public class OrderPayRecordServiceImpl implements OrderPayRecordService {
@Override
public List<OrderDetailInfoVO.PayRecord> selectOrderPayInfoList(String orderCode) {
// 缓存
String redisKey = "select_order_pay_info_list:" + orderCode;
String redisKey = CacheConstants.SELECT_ORDER_PAY_INFO_LIST + orderCode;
List<OrderDetailInfoVO.PayRecord> resultList = redisCache.getCacheList(redisKey);
if (CollectionUtils.isNotEmpty(resultList)) {
return resultList;