添加支付时间,退款时间
parent
5500d57b73
commit
fb123655a9
|
|
@ -38,6 +38,7 @@ import org.springframework.transaction.annotation.Transactional;
|
|||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
/**
|
||||
* 支付相关接口
|
||||
|
|
@ -172,6 +173,7 @@ public class PaymentController {
|
|||
.set(OrderInfoEntity::getPaymentStatus, PaymentStatus.YiZhiFu)
|
||||
.set(OrderInfoEntity::getOrderStatus, OrderStatus.YiWanCheng.getVal())
|
||||
.set(OrderInfoEntity::getPaymentCategory, paymentParam.getPaymentCategory())
|
||||
.set(OrderInfoEntity::getPayTime, LocalDateTime.now())
|
||||
.update();
|
||||
|
||||
log.info("订单支付成功,订单ID:{},支付方式:{},支付金额:{}",
|
||||
|
|
@ -247,6 +249,7 @@ public class PaymentController {
|
|||
.set(OrderInfoEntity::getPaymentStatus, PaymentStatus.YiZhiFu)
|
||||
.set(OrderInfoEntity::getOrderStatus, OrderStatus.YiWanCheng.getVal())
|
||||
.set(OrderInfoEntity::getSn, callbackDto.getResource().getCiphertext()) // 需要解密获取
|
||||
.set(OrderInfoEntity::getPayTime, LocalDateTime.now())
|
||||
.update();
|
||||
|
||||
log.info("微信支付成功,订单ID:{},微信交易号:{}", orderId, callbackDto.getResource().getCiphertext());
|
||||
|
|
@ -287,6 +290,7 @@ public class PaymentController {
|
|||
orderInfoService.lambdaUpdate()
|
||||
.eq(OrderInfoEntity::getSn, refundDto.getOutTradeNo())
|
||||
.set(OrderInfoEntity::getPaymentStatus, PaymentStatus.YiTuiKuan)
|
||||
.set(OrderInfoEntity::getRefundTime, LocalDateTime.now())
|
||||
.update();
|
||||
|
||||
log.info("微信支付退款成功,订单号:{},退款单号:{}", refundDto.getOutTradeNo(), result.getRefundId());
|
||||
|
|
@ -364,6 +368,7 @@ public class PaymentController {
|
|||
orderInfoService.lambdaUpdate()
|
||||
.eq(OrderInfoEntity::getId, refundRequest.getOrderId())
|
||||
.set(OrderInfoEntity::getPaymentStatus, PaymentStatus.YiTuiKuan)
|
||||
.set(OrderInfoEntity::getRefundTime, LocalDateTime.now())
|
||||
.update();
|
||||
|
||||
log.info("微信退款成功,订单ID:{},退款单号:{}", refundRequest.getOrderId(), refundDto.getOutRefundNo());
|
||||
|
|
@ -398,6 +403,7 @@ public class PaymentController {
|
|||
orderInfoService.lambdaUpdate()
|
||||
.eq(OrderInfoEntity::getId, refundRequest.getOrderId())
|
||||
.set(OrderInfoEntity::getPaymentStatus, PaymentStatus.YiTuiKuan)
|
||||
.set(OrderInfoEntity::getRefundTime, LocalDateTime.now())
|
||||
.update();
|
||||
|
||||
log.info("公司退款成功,订单ID:{},退款金额:{}", refundRequest.getOrderId(), refundRequest.getRefundAmount());
|
||||
|
|
|
|||
|
|
@ -285,4 +285,6 @@ public class OrderInfoEntity {
|
|||
*/
|
||||
private BigDecimal refundMoney;
|
||||
|
||||
private LocalDateTime refundTime;
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -202,7 +202,12 @@ public class OrderPagingResult {
|
|||
/**
|
||||
* 支付时间
|
||||
*/
|
||||
private LocalDateTime paymentTime;
|
||||
private LocalDateTime payTime;
|
||||
|
||||
/**
|
||||
* 退款时间
|
||||
*/
|
||||
private LocalDateTime refundTime;
|
||||
|
||||
/**
|
||||
* 客户备注
|
||||
|
|
|
|||
|
|
@ -40,6 +40,8 @@
|
|||
a.modifier_id,
|
||||
a.create_time,
|
||||
a.modify_time,
|
||||
a.pay_time,
|
||||
a.refund_time,
|
||||
a.expect_time,
|
||||
a.estimated_quantity,
|
||||
a.deleted,
|
||||
|
|
|
|||
Loading…
Reference in New Issue