cashierdesk / dili-cashier · Commits

Commit 5103e910d179f78f23c441f64a03abdf137a66d7

Authored by dengwei
1 parent 4e2aed34
build: skipped

feat update property

Inline Side-by-side
Showing 2 changed files with 9 additions and 8 deletions
cashier-mall/src/main/java/com/diligrp/cashier/mall/domain/rtmall/dto/HourlyRefundCallbackDTO.java
  View file @5103e91
@@ -40,9 +40,9 @@ public class HourlyRefundCallbackDTO extends RtMarkBaseCO { @@ -40,9 +40,9 @@ public class HourlyRefundCallbackDTO extends RtMarkBaseCO {
40 private String refundId; 40 private String refundId;
41 41
42 /** 42 /**
43 - * 支付金额（分） 43 + * 退款金额（分）
44 */ 44 */
45 - private Long payFee; 45 + private Long refundFee;
46 46
47 /** 47 /**
48 * 退款状态 48 * 退款状态
@@ -72,7 +72,7 @@ public class HourlyRefundCallbackDTO extends RtMarkBaseCO { @@ -72,7 +72,7 @@ public class HourlyRefundCallbackDTO extends RtMarkBaseCO {
72 dto.setTradeId(mallBizOrder.getTradeId()); 72 dto.setTradeId(mallBizOrder.getTradeId());
73 dto.setRefundBn(mallBizRefund.getRefundBn()); 73 dto.setRefundBn(mallBizRefund.getRefundBn());
74 dto.setRefundId(mallBizRefund.getRefundTradeId()); 74 dto.setRefundId(mallBizRefund.getRefundTradeId());
75 - dto.setPayFee(mallBizRefund.getRefundFee()); 75 + dto.setRefundFee(mallBizRefund.getRefundFee());
76 if (Objects.equals(mallBizRefund.getRefundState(), PaymentState.SUCCESS.getCode())) { 76 if (Objects.equals(mallBizRefund.getRefundState(), PaymentState.SUCCESS.getCode())) {
77 dto.setRefundStatus("SUCCESS"); 77 dto.setRefundStatus("SUCCESS");
78 } else { 78 } else {
@@ -116,12 +116,12 @@ public class HourlyRefundCallbackDTO extends RtMarkBaseCO { @@ -116,12 +116,12 @@ public class HourlyRefundCallbackDTO extends RtMarkBaseCO {
116 this.refundId = refundId; 116 this.refundId = refundId;
117 } 117 }
118 118
119 - public Long getPayFee() {  
120 - return payFee; 119 + public Long getRefundFee() {
  120 + return refundFee;
121 } 121 }
122 122
123 - public void setPayFee(Long payFee) {  
124 - this.payFee = payFee; 123 + public void setRefundFee(Long refundFee) {
  124 + this.refundFee = refundFee;
125 } 125 }
126 126
127 public String getRefundStatus() { 127 public String getRefundStatus() {
cashier-mall/src/main/java/com/diligrp/cashier/mall/service/biz/impl/PayNotifyServiceImpl.java
  View file @5103e91
@@ -64,8 +64,9 @@ public class PayNotifyServiceImpl implements PayNotifyService { @@ -64,8 +64,9 @@ public class PayNotifyServiceImpl implements PayNotifyService {
64 @ParamLogPrint(desc = "RefundResultBO") 64 @ParamLogPrint(desc = "RefundResultBO")
65 public void onEvent(RefundResultBO event) { 65 public void onEvent(RefundResultBO event) {
66 MallBizRefund mallBizRefund = mallBizRefundDao.getByRefundTradeId(event.getRefundId()); 66 MallBizRefund mallBizRefund = mallBizRefundDao.getByRefundTradeId(event.getRefundId());
  67 + // 本地记录如果不是待支付，直接忽略
67 if (ObjectUtils.notEqual(mallBizRefund.getRefundState(), PaymentState.PENDING.getCode())) { 68 if (ObjectUtils.notEqual(mallBizRefund.getRefundState(), PaymentState.PENDING.getCode())) {
68 - LOG.info("refundOnEvent refundState is pending ignore, refund_trade_id: {}", mallBizRefund.getRefundTradeId()); 69 + LOG.info("mallBizRefund state is pending ignore, refund_trade_id: {}", mallBizRefund.getRefundTradeId());
69 return; 70 return;
70 } 71 }
71 72