feature 退款代码逻辑完善

zhsw-common/src/main/java/com/rongwei/zhsw/system/wechat/impl/RefundServiceImpl.java

@@ -180,9 +180,6 @@ public class RefundServiceImpl implements RefundService {
     @Override
     public R refundNotice(PrepayNoticeVo prepayNoticeVo, String dsKey) {
         log.info("微信退款申请成功回调函数: {},: {}", prepayNoticeVo, dsKey);
-        if (StringUtils.isBlank(dsKey) || StringUtils.isNotBlank(dsKey)) {
-            throw new CustomException("asdasda");
-        }
         List<String> dsKeys;
         if (StringUtils.isBlank(dsKey)) {
             List<TenantDo> tenantList = (List<TenantDo>) redisService.getRedisCatchObj("allTenants");
@@ -243,7 +240,7 @@ public class RefundServiceImpl implements RefundService {
             log.error("退款记录失败");
             throw new CustomException("退款失败");
         }
-        if ("SUCCESS".equals(weChatRefundNoticeVo.getRefundStatus())) {
+        if (!"SUCCESS".equals(weChatRefundNoticeVo.getRefundStatus())) {
             log.error("退款失败");
             // 更新缴费记录相关信息
             swRefundRequestRecordService.getBaseMapper().updateWeChatRefundInfo(deKey, outRefundNo,

zhsw-entity/src/main/java/com/rongwe/zhsw/system/vo/WeChatRefundNoticeVo.java

@@ -1,5 +1,6 @@
 package com.rongwe.zhsw.system.vo;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
 
 import java.util.Date;
@@ -16,24 +17,30 @@ public class WeChatRefundNoticeVo {
     private String mchid;
 
     // 微信支付订单号
+    @JsonProperty("transaction_id")
     private String transactionId;
 
     // 商户系统内部订单号
+    @JsonProperty("out_trade_no")
     private String outTradeNo;
 
     // 微信退款单号
+    @JsonProperty("refund_id")
     private String refundId;
 
     // 商户退款单号
+    @JsonProperty("out_refund_no")
     private String outRefundNo;
 
     // 退款状态（SUCCESS/PROCESSING等）
+    @JsonProperty("refund_status")
     private String refundStatus;
 
-    // 退款成功时间（ISO 8601格式）
+    @JsonProperty("success_time")
     private Date successTime;
 
     // 收款方账户信息（银行+卡类型+末四位）
+    @JsonProperty("user_received_account")
     private String userReceivedAccount;
 
     // 金额相关嵌套对象
@@ -49,9 +56,11 @@ public class WeChatRefundNoticeVo {
         private Integer refund;
 
         // 付款方支付总金额（单位：分）
+        @JsonProperty("payer_total")
         private Integer payerTotal;
 
         // 付款方实退金额（单位：分）
+        @JsonProperty("payer_refund")
         private Integer payerRefund;
     }
 }