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

新增刷数据接口

Browse Source
This commit is contained in:
autumn.g@foxmail.com
2023-05-24 17:04:45 +08:00
parent 3e9629bf22
commit 9e425be3b1
3 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
jsowell-admin/src/main/java/com/jsowell/api/uniapp/JumpController.java
View File

@@ -108,8 +108,8 @@ public class JumpController extends BaseController {
logger.info("临时刷数据接口 param:{}", dto); logger.info("临时刷数据接口 param:{}", dto);
RestApiResponse<?> response = null; RestApiResponse<?> response = null;
try { try {
orderBasicInfoService.tempUpdateVirtualAmount(dto); String s = orderBasicInfoService.tempUpdateVirtualAmount(dto);
response = new RestApiResponse<>(); response = new RestApiResponse<>(s);
} catch (BusinessException e) { } catch (BusinessException e) {
logger.warn("临时刷数据接口 warn", e); logger.warn("临时刷数据接口 warn", e);
response = new RestApiResponse<>(e.getCode(), e.getMessage()); response = new RestApiResponse<>(e.getCode(), e.getMessage());

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

@@ -255,5 +255,5 @@ public interface IOrderBasicInfoService {
List<OrderPeriodAmountVO> transformPeriodAmountByOrderDetail(OrderDetail orderDetail); List<OrderPeriodAmountVO> transformPeriodAmountByOrderDetail(OrderDetail orderDetail);
void tempUpdateVirtualAmount(QueryOrderDTO dto); String tempUpdateVirtualAmount(QueryOrderDTO dto);
} }

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

@@ -163,9 +163,6 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService {
orderListVO.setPileConnectorCode(orderListVO.getPileSn() + orderListVO.getConnectorCode()); orderListVO.setPileConnectorCode(orderListVO.getPileSn() + orderListVO.getConnectorCode());
orderListVO.setOrderStatusDescribe(transformOrderStatusDescribe(orderListVO.getOrderStatus(), orderListVO.getPayStatus())); orderListVO.setOrderStatusDescribe(transformOrderStatusDescribe(orderListVO.getOrderStatus(), orderListVO.getPayStatus()));
} }
// 异步修改 虚拟金额和结算金额
tempUpdateVirtualAmount(orderListVOS);
} }
return orderListVOS; return orderListVOS;
} }
@@ -177,6 +174,7 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService {
} }
// 订单总消费金额 // 订单总消费金额
BigDecimal orderAmount = new BigDecimal(orderListVO.getOrderAmount()); BigDecimal orderAmount = new BigDecimal(orderListVO.getOrderAmount());
// 使用虚拟金额消费 金额 // 使用虚拟金额消费 金额
BigDecimal virtualAmount = BigDecimal.ZERO; BigDecimal virtualAmount = BigDecimal.ZERO;
// 结算金额 // 结算金额
@@ -194,10 +192,11 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService {
BigDecimal bigDecimal = orderPayRecord.getRefundAmount() == null ? BigDecimal.ZERO : orderPayRecord.getRefundAmount(); BigDecimal bigDecimal = orderPayRecord.getRefundAmount() == null ? BigDecimal.ZERO : orderPayRecord.getRefundAmount();
virtualAmount = orderPayRecord.getPayAmount().subtract(bigDecimal); virtualAmount = orderPayRecord.getPayAmount().subtract(bigDecimal);
settleAmount = orderAmount.subtract(virtualAmount); settleAmount = orderAmount.subtract(virtualAmount);
} else {
settleAmount = orderAmount;
} }
} }
} else {
} else if (StringUtils.equals(orderListVO.getPayMode(), OrderPayModeEnum.PAYMENT_OF_WECHATPAY.getValue())) {
/* /*
微信支付 虚拟金额为0 结算金额等于订单消费金额 微信支付 虚拟金额为0 结算金额等于订单消费金额
*/ */
@@ -205,6 +204,7 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService {
} }
OrderBasicInfo build = OrderBasicInfo.builder() OrderBasicInfo build = OrderBasicInfo.builder()
.id(Long.parseLong(orderListVO.getId()))
.orderCode(orderListVO.getOrderCode()) .orderCode(orderListVO.getOrderCode())
.virtualAmount(virtualAmount) .virtualAmount(virtualAmount)
.settleAmount(settleAmount) .settleAmount(settleAmount)
@@ -1690,11 +1690,13 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService {
} }
@Override @Override
public void tempUpdateVirtualAmount(QueryOrderDTO dto) { public String tempUpdateVirtualAmount(QueryOrderDTO dto) {
dto.setOrderStatus(OrderStatusEnum.ORDER_COMPLETE.getValue());
List<OrderListVO> orderListVOS = orderBasicInfoMapper.selectOrderBasicInfoList(dto); List<OrderListVO> orderListVOS = orderBasicInfoMapper.selectOrderBasicInfoList(dto);
if (CollectionUtils.isEmpty(orderListVOS)) { if (CollectionUtils.isEmpty(orderListVOS)) {
return; return "没有订单需要修改";
} }
tempUpdateVirtualAmount(orderListVOS); tempUpdateVirtualAmount(orderListVOS);
return "共修改" + orderListVOS.size() + "条订单数据";
} }
} }