lzq
/
njzscloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

取消修改

localizer
ljw 2025-10-28 16:47:28 +08:00
parent bdcbebaf8a
commit 4dedb2a61c
2 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
njzscloud-svr/src/main/java/com/njzscloud/supervisory/order/service/OrderInfoService.java
View File

@ -880,14 +880,11 @@ public class OrderInfoService extends ServiceImpl<OrderInfoMapper, OrderInfoEnti
OrderInfoEntity orderInfo = this.getById(orderId); OrderInfoEntity orderInfo = this.getById(orderId);
Assert.notNull(orderInfo, () -> Exceptions.clierr("订单不存在")); Assert.notNull(orderInfo, () -> Exceptions.clierr("订单不存在"));
OrderStatus orderStatus = orderInfo.getOrderStatus(); OrderStatus orderStatus = orderInfo.getOrderStatus();
if (!SecurityUtil.isAdmin()) {
Assert.isTrue(orderStatus == OrderStatus.YiYuYue Assert.isTrue(orderStatus == OrderStatus.YiYuYue
|| orderStatus == OrderStatus.DaiPaiDan || orderStatus == OrderStatus.DaiPaiDan
|| orderStatus == OrderStatus.DaiJieDan || orderStatus == OrderStatus.DaiJieDan
|| orderStatus == OrderStatus.YiJieDan || orderStatus == OrderStatus.YiJieDan,
|| orderStatus == OrderStatus.QingYunZhong,
() -> Exceptions.clierr("当前订单状态，无法取消"));
if (!SecurityUtil.isAdmin()) {
Assert.isFalse(orderStatus == OrderStatus.QingYunZhong,
() -> Exceptions.clierr("当前订单状态，无法取消")); () -> Exceptions.clierr("当前订单状态，无法取消"));
AuditStatus auditStatus = orderInfo.getAuditStatus(); AuditStatus auditStatus = orderInfo.getAuditStatus();
Assert.isFalse(auditStatus == AuditStatus.TongGuo, () -> Exceptions.clierr("当前订单状态，无法取消")); Assert.isFalse(auditStatus == AuditStatus.TongGuo, () -> Exceptions.clierr("当前订单状态，无法取消"));
@ -903,12 +900,21 @@ public class OrderInfoService extends ServiceImpl<OrderInfoMapper, OrderInfoEnti
// 获取支付上下文 // 获取支付上下文
PaymentContextResult ctx = this.paymentContext(orderId); PaymentContextResult ctx = this.paymentContext(orderId);
paymentService.refund(dto, ctx); paymentService.refund(dto, ctx);
} this.lambdaUpdate()
.eq(OrderInfoEntity::getId, orderId)
.set(OrderInfoEntity::getPaymentStatus, PaymentStatus.YiTuiKuan)
.set(OrderInfoEntity::getRefundMoney, orderInfo.getSettleMoney())
.set(OrderInfoEntity::getRefundTime, LocalDateTime.now())
.set(OrderInfoEntity::getCancelReason, reason)
.set(OrderInfoEntity::getOrderStatus, OrderStatus.YiQuXiao)
.update();
} else {
this.updateById(new OrderInfoEntity() this.updateById(new OrderInfoEntity()
.setId(orderInfo.getId()) .setId(orderInfo.getId())
.setCancelReason(reason) .setCancelReason(reason)
.setOrderStatus(OrderStatus.YiQuXiao) .setOrderStatus(OrderStatus.YiQuXiao)
); );
}
Long driverId = orderInfo.getDriverId(); Long driverId = orderInfo.getDriverId();
Long truckId = orderInfo.getTruckId(); Long truckId = orderInfo.getTruckId();
if (driverId != null) baseMapper.busyDriver(driverId, Boolean.FALSE); if (driverId != null) baseMapper.busyDriver(driverId, Boolean.FALSE);

5
njzscloud-svr/src/main/java/com/njzscloud/supervisory/wxPay/controller/PaymentController.java
View File

@ -275,6 +275,7 @@ public class PaymentController {
orderInfoService.lambdaUpdate() orderInfoService.lambdaUpdate()
.eq(OrderInfoEntity::getId, refundRequest.getOrderId()) .eq(OrderInfoEntity::getId, refundRequest.getOrderId())
.set(OrderInfoEntity::getPaymentStatus, PaymentStatus.YiTuiKuan) .set(OrderInfoEntity::getPaymentStatus, PaymentStatus.YiTuiKuan)
.set(OrderInfoEntity::getRefundMoney, refundRequest.getRefundAmount())
.set(OrderInfoEntity::getRefundTime, LocalDateTime.now()) .set(OrderInfoEntity::getRefundTime, LocalDateTime.now())
.update(); .update();
} }
@ -290,10 +291,12 @@ public class PaymentController {
try { try {
WxPayRefundNotifyResult result = wxPayService.parseRefundNotifyResult(xmlData); WxPayRefundNotifyResult result = wxPayService.parseRefundNotifyResult(xmlData);
String orderSn = extractOrderIdFromOutTradeNo(result.getReqInfo().getOutTradeNo()); String orderSn = extractOrderIdFromOutTradeNo(result.getReqInfo().getOutTradeNo());
OrderInfoEntity entity = orderInfoService.getOne(Wrappers.<OrderInfoEntity>lambdaQuery().eq(OrderInfoEntity::getSn, orderSn));
// 更新订单状态为已退款 // 更新订单状态为已退款
orderInfoService.lambdaUpdate() orderInfoService.lambdaUpdate()
.eq(OrderInfoEntity::getSn, orderSn) .eq(OrderInfoEntity::getId, entity.getId())
.set(OrderInfoEntity::getPaymentStatus, PaymentStatus.YiTuiKuan) .set(OrderInfoEntity::getPaymentStatus, PaymentStatus.YiTuiKuan)
.set(OrderInfoEntity::getRefundMoney, entity.getSettleMoney())
.set(OrderInfoEntity::getRefundTime, LocalDateTime.now()) .set(OrderInfoEntity::getRefundTime, LocalDateTime.now())
.update(); .update();
return WxPayNotifyResponse.success("退款成功!"); return WxPayNotifyResponse.success("退款成功!");