diff --git a/dating-agency-mall-entity/src/main/java/com/qniao/dam/domain/aggregate/paymentorderrefund/entity/PaymentOrderRefund.java b/dating-agency-mall-entity/src/main/java/com/qniao/dam/domain/aggregate/paymentorderrefund/entity/PaymentOrderRefund.java index 3150b61..135b51e 100644 --- a/dating-agency-mall-entity/src/main/java/com/qniao/dam/domain/aggregate/paymentorderrefund/entity/PaymentOrderRefund.java +++ b/dating-agency-mall-entity/src/main/java/com/qniao/dam/domain/aggregate/paymentorderrefund/entity/PaymentOrderRefund.java @@ -29,7 +29,7 @@ public class PaymentOrderRefund extends Entity { private BigDecimal orderAmount; @ApiModelProperty("退款金额") - private BigDecimal refundFee; + private BigDecimal refundAmount; @ApiModelProperty("微信支付订单号") private String transactionId; diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/application/service/marriagebounty/MarriageBountyOrderApplicationService.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/application/service/marriagebounty/MarriageBountyOrderApplicationService.java index f99196e..510503c 100644 --- a/dating-agency-mall-server/src/main/java/com/qniao/dam/application/service/marriagebounty/MarriageBountyOrderApplicationService.java +++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/application/service/marriagebounty/MarriageBountyOrderApplicationService.java @@ -32,7 +32,6 @@ import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.math.BigDecimal; import java.util.*; -import java.util.function.Function; import java.util.stream.Collectors; @Service @@ -137,7 +136,7 @@ public class MarriageBountyOrderApplicationService extends BaseApplicationServic paymentOrderRefund.setPaymentMethod(paymentOrder.getPaymentMethod()); paymentOrderRefund.setTransactionId(paymentChannelOrder.getExtOrderNo()); paymentOrderRefund.setOrderAmount(paymentChannelOrder.getAmount()); - paymentOrderRefund.setRefundFee(refundFee); + paymentOrderRefund.setRefundAmount(refundFee); paymentOrderRefundList.add(paymentOrderRefund); } MarriageBountyOrder applyRefundMarriageBountyOrder = new MarriageBountyOrder(); diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/application/service/paymentchannelorder/processor/wechat/WeChatPayProcessor.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/application/service/paymentchannelorder/processor/wechat/WeChatPayProcessor.java index ebd3749..a9f6b0f 100644 --- a/dating-agency-mall-server/src/main/java/com/qniao/dam/application/service/paymentchannelorder/processor/wechat/WeChatPayProcessor.java +++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/application/service/paymentchannelorder/processor/wechat/WeChatPayProcessor.java @@ -3,15 +3,11 @@ package com.qniao.dam.application.service.paymentchannelorder.processor.wechat; import cn.hutool.core.util.ObjectUtil; import cn.hutool.json.JSONUtil; import com.alibaba.fastjson.JSONObject; -import com.qniao.dam.api.command.paymentchannelorder.user.request.ThirdPartyField; import com.qniao.dam.application.service.paymentchannelorder.processor.IChannelPayService; import com.qniao.dam.application.service.paymentchannelorder.processor.wechat.utils.WXPayV3Util; import com.qniao.dam.domain.aggregate.paymentchannelorder.entity.PaymentChannelOrder; import com.qniao.dam.domain.aggregate.paymentorderrefund.entity.PaymentOrderRefund; import com.qniao.dam.domian.aggregate.paymentorderrefund.constant.PaymentOrderRefundStatusEnum; -import com.qniao.dau.application.UecServerApplicationService; -import com.qniao.dau.application.request.GetWechatSessionDto; -import com.qniao.dau.application.response.WeChatAppletUserSessionVo; import com.qniao.framework.exception.BizException; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; @@ -22,7 +18,6 @@ import java.math.BigDecimal; import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; import java.util.HashMap; -import java.util.List; import java.util.Map; @Service @@ -101,7 +96,7 @@ public class WeChatPayProcessor extends IChannelPayService { reqParams.put("out_trade_no", paymentOrderRefund.getPaymentOrderId().toString()); reqParams.put("amount", new HashMap() { { - put("refund", paymentOrderRefund.getRefundFee().multiply(BigDecimal.valueOf(100)).intValue()); + put("refund", paymentOrderRefund.getRefundAmount().multiply(BigDecimal.valueOf(100)).intValue()); put("total", paymentOrderRefund.getOrderAmount().multiply(BigDecimal.valueOf(100)).intValue()); put("currency", "CNY"); }