|
|
@@ -156,6 +156,9 @@ public class PaymentServiceImpl implements IPaymentService {
|
|
|
}
|
|
|
|
|
|
if(YmUtil.SUCCESS.equals(back.getResult().getId()) || YmUtil.FAIL.equals(back.getResult().getId())){
|
|
|
+ paymentRecords.setRefundSn(refundReceive.getSn());
|
|
|
+ paymentRecords.setRefundId(refundReceive.getRefundId());
|
|
|
+ paymentRecordsService.updateById(paymentRecords);
|
|
|
return VaultsResponse.success(back.getResult().getId());
|
|
|
}
|
|
|
|
|
|
@@ -291,13 +294,24 @@ public class PaymentServiceImpl implements IPaymentService {
|
|
|
|
|
|
@Override
|
|
|
public String payReverseNotification(PayNotification payNotification) {
|
|
|
- /*QueryWrapper<PaymentRecords> queryMapper = new QueryWrapper<>();
|
|
|
- queryMapper.eq("pay_id",payNotification.getPos_seq());
|
|
|
+ QueryWrapper<PaymentRecords> queryMapper = new QueryWrapper<>();
|
|
|
+ queryMapper.eq("trade_no",payNotification.getTrade_no());
|
|
|
try {
|
|
|
PaymentRecords pr = paymentRecordsService.getOne(queryMapper);
|
|
|
- //支付通知
|
|
|
+ //退款通知
|
|
|
if(!pr.getTransType().equals("2")){
|
|
|
-
|
|
|
+ pr.setTransType(pr.getTransType());
|
|
|
+ pr.setEndTime(payNotification.getEnd_time());
|
|
|
+ RefundReceive refundReceive = new RefundReceive();
|
|
|
+ refundReceive.setRefundId(pr.getRefundId());
|
|
|
+ refundReceive.setSn(pr.getRefundSn());
|
|
|
+ refundReceive.setOperatorId(pr.getOperatorId());
|
|
|
+ VaultsResponse vaultsResponse = orderFeignClient.changeOrderRefund(refundReceive);
|
|
|
+ if(vaultsResponse.validate()){
|
|
|
+ paymentRecordsService.updateById(pr);
|
|
|
+ }else {
|
|
|
+ return "fail";
|
|
|
+ }
|
|
|
}else{
|
|
|
log.info("重复推送支付成功消息---"+pr.getPaySn());
|
|
|
}
|
|
|
@@ -306,7 +320,7 @@ public class PaymentServiceImpl implements IPaymentService {
|
|
|
}catch (Exception e){
|
|
|
e.printStackTrace();
|
|
|
return "fail";
|
|
|
- }*/
|
|
|
+ }
|
|
|
return "success";
|
|
|
|
|
|
}
|