jiujian / client-customer-order-api

Go to a project
Toggle navigation Toggle navigation pinning
zhuyifan
3dba7a33 1 parent de053f16

feat(proto): 添加交易参考号字段以支持支付回调处理

Inline Side-by-side
Showing 4 changed files with 10 additions and 5 deletions
...@@ -104,7 +104,7 @@ public class SettlementDTO { ...@@ -104,7 +104,7 @@ public class SettlementDTO {
104 private String avoidRemark; 104 private String avoidRemark;
105 private String onlinePay; 105 private String onlinePay;
106 private String operationType; 106 private String operationType;
107 - private String transactionId; 107 + private String tradeReferenceNo;
108 } 108 }
109 109
110 @Data 110 @Data
......
...@@ -202,8 +202,10 @@ public class PayServiceClient { ...@@ -202,8 +202,10 @@ public class PayServiceClient {
202 .setPayStatus(PayStatusEnum.SUCCEED) 202 .setPayStatus(PayStatusEnum.SUCCEED)
203 .setShouldUpdateStatus(true) 203 .setShouldUpdateStatus(true)
204 .setStatus(OrderStatusEnum.PREPARING) 204 .setStatus(OrderStatusEnum.PREPARING)
205 - .setShouldUpdateTransactionId(StringUtils.isNotEmpty(paymentCallbackResult.getTradeReferenceNo())) 205 + .setShouldUpdateTransactionId(true)
206 - .setTransactionId(StringUtils.isNotEmpty(paymentCallbackResult.getTradeReferenceNo()) ? paymentCallbackResult.getTradeReferenceNo() : "") 206 + .setTransactionId(paymentCallbackResult.getTransSN())
207 + .setShouldUpdateTradeReferenceNo(StringUtils.isNotEmpty(paymentCallbackResult.getTradeReferenceNo()))
208 + .setTradeReferenceNo(StringUtils.isNotEmpty(paymentCallbackResult.getTradeReferenceNo()) ? paymentCallbackResult.getTradeReferenceNo() : "")
207 .build(); 209 .build();
208 final var updateResponse = 210 final var updateResponse =
209 orderServiceRpcClient.updateClientCustomerOrderPaymentResult(orderById, build); 211 orderServiceRpcClient.updateClientCustomerOrderPaymentResult(orderById, build);
......
...@@ -486,7 +486,7 @@ public class SettlementServiceImpl implements SettlementService { ...@@ -486,7 +486,7 @@ public class SettlementServiceImpl implements SettlementService {
486 dataCell13.setCellStyle(dataStyle); 486 dataCell13.setCellStyle(dataStyle);
487 487
488 Cell dataCell14 = dataRow.createCell(columnNum++); 488 Cell dataCell14 = dataRow.createCell(columnNum++);
489 - dataCell14.setCellValue(orderDetail.getTransactionId() != null ? orderDetail.getTransactionId() : ""); 489 + dataCell14.setCellValue(orderDetail.getTradeReferenceNo() != null ? orderDetail.getTradeReferenceNo() : "");
490 dataCell14.setCellStyle(dataStyle); 490 dataCell14.setCellStyle(dataStyle);
491 491
492 // 合并备注和忌口备注，用分号分割，备注在前 492 // 合并备注和忌口备注，用分号分割，备注在前
...@@ -977,7 +977,7 @@ public class SettlementServiceImpl implements SettlementService { ...@@ -977,7 +977,7 @@ public class SettlementServiceImpl implements SettlementService {
977 .avoidRemark(order.getAvoidRemark()) 977 .avoidRemark(order.getAvoidRemark())
978 .onlinePay(onlinePayDesc) 978 .onlinePay(onlinePayDesc)
979 .operationType(operationType) 979 .operationType(operationType)
980 - .transactionId(operationType.equals("已退款") ? "" : order.getTransactionId()) 980 + .tradeReferenceNo(operationType.equals("已退款") ? "" : order.getTradeReferenceNo())
981 .build(); 981 .build();
982 } 982 }
983 983
......
...@@ -148,6 +148,7 @@ message SingleClientCustomerOrderRpcResponse { ...@@ -148,6 +148,7 @@ message SingleClientCustomerOrderRpcResponse {
148 string syncRoomNo = 36; 148 string syncRoomNo = 36;
149 bool isCanceled = 37; 149 bool isCanceled = 37;
150 string avoidRemark = 38; 150 string avoidRemark = 38;
151 + string tradeReferenceNo = 39;
151 } 152 }
152 153
153 message GetClientCustomerOrderByIdRpcRequest { 154 message GetClientCustomerOrderByIdRpcRequest {
...@@ -394,6 +395,8 @@ message ClientCustomerOrderModification { ...@@ -394,6 +395,8 @@ message ClientCustomerOrderModification {
394 bool isCanceled = 57; 395 bool isCanceled = 57;
395 bool shouldUpdateAvoidRemark = 58; 396 bool shouldUpdateAvoidRemark = 58;
396 string avoidRemark = 59; 397 string avoidRemark = 59;
398 + bool shouldUpdateTradeReferenceNo = 60;
399 + string tradeReferenceNo = 61;
397 } 400 }
398 401
399 message UpdateClientCustomerOrderRpcRequest { 402 message UpdateClientCustomerOrderRpcRequest {
......