Merge branch 'master' into dev

service/src/main/java/com/kym/service/wechat/impl/WxPayServiceImpl.java

@@ -428,7 +428,7 @@ public class WxPayServiceImpl implements WxPayService {
             // 退款日志
             var refundLog = new RefundLog().setUserId(payLogs.get(0).getUserId()).setOutTradeNo(payLogs.get(0).getOutTradeNo())
                     .setTotal(payLogs.get(0).getTotal())
-                    .setRefund(refundAmount.get() - account.getDiscountAmount())
+                    .setRefund(refundAmount.get())
                     .setDiscountAmount(account.getDiscountAmount())
                     .setOutRefundNo(OrderUtils.getOrderNo());
             refundLogService.save(refundLog);