Browse Source

基础配置

release
张彭杰 1 year ago
parent
commit
88dc763b90
3 changed files with 5 additions and 1 deletions
  1. 3
      dating-agency-mall-entity/src/main/java/com/qniao/dam/domain/aggregate/paymentorderrefund/entity/PaymentOrderRefund.java
  2. 1
      dating-agency-mall-server/src/main/java/com/qniao/dam/application/service/marriagebounty/MarriageBountyOrderApplicationService.java
  3. 2
      dating-agency-mall-server/src/main/java/com/qniao/dam/application/service/paymentchannelorder/processor/wechat/WeChatPayProcessor.java

3
dating-agency-mall-entity/src/main/java/com/qniao/dam/domain/aggregate/paymentorderrefund/entity/PaymentOrderRefund.java

@ -22,6 +22,9 @@ public class PaymentOrderRefund extends Entity<PaymentOrderRefund> {
@ApiModelProperty("支付单号") @ApiModelProperty("支付单号")
private Long paymentOrderId; private Long paymentOrderId;
@ApiModelProperty("渠道支付单号")
private Long paymentChannelOrder;
@ApiModelProperty("付款方式") @ApiModelProperty("付款方式")
private PaymentMethodEnum paymentMethod; private PaymentMethodEnum paymentMethod;

1
dating-agency-mall-server/src/main/java/com/qniao/dam/application/service/marriagebounty/MarriageBountyOrderApplicationService.java

@ -133,6 +133,7 @@ public class MarriageBountyOrderApplicationService extends BaseApplicationServic
} }
paymentOrderRefund.setTradeOrderId(paymentOrder.getOrderId()); paymentOrderRefund.setTradeOrderId(paymentOrder.getOrderId());
paymentOrderRefund.setPaymentOrderId(paymentOrder.getId()); paymentOrderRefund.setPaymentOrderId(paymentOrder.getId());
paymentOrderRefund.setPaymentChannelOrder(paymentChannelOrder.getId());
paymentOrderRefund.setPaymentMethod(paymentOrder.getPaymentMethod()); paymentOrderRefund.setPaymentMethod(paymentOrder.getPaymentMethod());
paymentOrderRefund.setTransactionId(paymentChannelOrder.getExtOrderNo()); paymentOrderRefund.setTransactionId(paymentChannelOrder.getExtOrderNo());
paymentOrderRefund.setOrderAmount(paymentChannelOrder.getAmount()); paymentOrderRefund.setOrderAmount(paymentChannelOrder.getAmount());

2
dating-agency-mall-server/src/main/java/com/qniao/dam/application/service/paymentchannelorder/processor/wechat/WeChatPayProcessor.java

@ -93,7 +93,7 @@ public class WeChatPayProcessor extends IChannelPayService {
public void refund(PaymentOrderRefund paymentOrderRefund) { public void refund(PaymentOrderRefund paymentOrderRefund) {
try { try {
Map<String, Object> reqParams = new HashMap<>(); Map<String, Object> reqParams = new HashMap<>();
reqParams.put("out_trade_no", paymentOrderRefund.getPaymentOrderId().toString());
reqParams.put("out_trade_no", paymentOrderRefund.getPaymentChannelOrder().toString());
reqParams.put("out_refund_no", paymentOrderRefund.getId().toString()); reqParams.put("out_refund_no", paymentOrderRefund.getId().toString());
reqParams.put("amount", new HashMap<String, Object>() { reqParams.put("amount", new HashMap<String, Object>() {
{ {

Loading…
Cancel
Save