|
|
@@ -493,8 +493,7 @@ public class PayCallService extends SuperService {
|
|
|
|
|
|
BigDecimal payAmount = entity.getPayAmount();
|
|
|
payAmount = payAmount.stripTrailingZeros();
|
|
|
- ResultContent resultContent = chinaumsSenselessPayService.refund(entity.getProjectOid(), entity.getShopOid(),
|
|
|
- entity.getUserId(), payAmount, paymentNo, refundNo, param.getRemark(), targetOrderId);
|
|
|
+ ResultContent resultContent = chinaumsSenselessPayService.refund(entity.getProjectOid(), entity.getShopOid(), entity.getUserId(), payAmount, paymentNo, refundNo, param.getRemark(), targetOrderId);
|
|
|
if (resultContent.isSuccess()) {
|
|
|
entity.setIsRefund(Boolean.FALSE);
|
|
|
entity.setRefundRemark(param.getRemark());
|
|
|
@@ -519,15 +518,16 @@ public class PayCallService extends SuperService {
|
|
|
* 银联云闪付 退款回调
|
|
|
*
|
|
|
* @param param state
|
|
|
- * NEW_ORDER 新订单" +
|
|
|
- * "UNKNOWN 不明确的交易状态" +
|
|
|
- * "TRADE_CLOSED 在指定时间段内未支付时关闭的交易;在交易完成撤销成功时关闭的交易;支付失败的交易;TRADE_CLOSED的交易不允许进行任何操作" +
|
|
|
- * "WAIT_BUYER_PAY 交易创建,等待买家付款" +
|
|
|
- * "TRADE_SUCCESS 支付成功" +
|
|
|
- * "TRADE_REFUND 订单转入退货流程,退货可能是部分也可能是全部"
|
|
|
+ * NEW_ORDER 新订单" +
|
|
|
+ * "UNKNOWN 不明确的交易状态" +
|
|
|
+ * "TRADE_CLOSED 在指定时间段内未支付时关闭的交易;在交易完成撤销成功时关闭的交易;支付失败的交易;TRADE_CLOSED的交易不允许进行任何操作" +
|
|
|
+ * "WAIT_BUYER_PAY 交易创建,等待买家付款" +
|
|
|
+ * "TRADE_SUCCESS 支付成功" +
|
|
|
+ * "TRADE_REFUND 订单转入退货流程,退货可能是部分也可能是全部"
|
|
|
* @return
|
|
|
*/
|
|
|
public ResultContent unionFrictionlessPayRefundFinish(UnionFrictionlessPayFinishModel param) {
|
|
|
+ log.info("回调云闪付退款回调");
|
|
|
String paymentNo = param.getMerOrderId();
|
|
|
com.github.microservice.pay.client.ret.ResultContent<List<TransactionLogModel>> resultContent = param.getTransactionLogModelList();
|
|
|
String state = param.getStatus();
|