`提交支付宝 退款回调`

liquidnet-bus-api/liquidnet-service-dragon-api/src/main/java/com/liquidnet/service/dragon/dto/AliRefundCallBackBodyDto.java

+package com.liquidnet.service.dragon.dto;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+
+@Data
+public class AliRefundCallBackBodyDto {
+    @JsonProperty("out_trade_no")
+    private String outTradeNo;
+    @JsonProperty("trade_no")
+    private String tradeNo;
+    @JsonProperty("out_request_no")
+    private String outRequestNo;
+}

liquidnet-bus-service/liquidnet-service-dragon/liquidnet-service-dragon-impl/src/main/java/com/liquidnet/service/dragon/service/impl/DragonOrderRefundsServiceImpl.java

@@ -16,21 +16,16 @@ import com.liquidnet.service.dragon.channel.wepay.resp.AliPayRefundReturnCallBac
 import com.liquidnet.service.dragon.channel.wepay.resp.WePayRefundReturnCallBackDto;
 import com.liquidnet.service.dragon.channel.wepay.resp.WePayRefundReturnCallBackInfoDto;
 import com.liquidnet.service.dragon.constant.DragonConstant;
-import com.liquidnet.service.dragon.dto.DragonRefundAppDto;
-import com.liquidnet.service.dragon.dto.DragonRefundChannelDto;
-import com.liquidnet.service.dragon.dto.NotifyUrlDto;
-import com.liquidnet.service.dragon.dto.RefundContentDto;
+import com.liquidnet.service.dragon.dto.*;
 import com.liquidnet.service.dragon.channel.wepay.resp.WePayRefundReturnDto;
 import com.liquidnet.service.dragon.service.IDragonOrderRefundsService;
 import com.liquidnet.service.dragon.utils.PayAlipayUtils;
 import com.liquidnet.service.dragon.utils.PayWepayUtils;
 import com.liquidnet.service.dragon.utils.XmlUtil;
-import io.github.classgraph.json.JSONUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.http.HttpEntity;
 import org.apache.http.client.methods.CloseableHttpResponse;
 import org.apache.http.client.methods.HttpPost;
-import org.apache.http.client.utils.DateUtils;
 import org.apache.http.entity.StringEntity;
 import org.apache.http.util.EntityUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -420,7 +415,8 @@ public class DragonOrderRefundsServiceImpl implements IDragonOrderRefundsService
                     "\"out_request_no\":\"" + callBackDto.getOutBizNo() + "\"}"); //设置业务参数
             AlipayTradeFastpayRefundQueryResponse response = PayAlipayUtils.getInstance().getHttpClient().execute(request);
             log.debug("AlipayTradeFastpayRefundQueryRequest -> data = " + JSON.toJSONString(response));
-            if (response.getRefundChannelStatus().equalsIgnoreCase("SUCCESS")) {
+
+            if (response.isSuccess()) {
                 try {
                     sendMySqlRedis(
                             SqlMapping.get("dragon_order_refund_log.insert"),
@@ -428,11 +424,11 @@ public class DragonOrderRefundsServiceImpl implements IDragonOrderRefundsService
                     );
                     sendMySqlRedis(
                             SqlMapping.get("dragon_order_refund_success.update"),
-                            new Object[]{nowTime, response.getGmtRefundPay(), DragonConstant.RefundStatusEnum.STATUS_REFUNDED.getCode(), response.getOutRequestNo()}
+                            new Object[]{nowTime, callBackDto.getGmtRefund(), DragonConstant.RefundStatusEnum.STATUS_REFUNDED.getCode(), response.getOutRequestNo()}
                     );
 
                     NotifyUrlDto dto = new NotifyUrlDto();
-                    if (response.getRefundChannelStatus().equalsIgnoreCase("SUCCESS")) {
+                    if (response.getMsg().equalsIgnoreCase("SUCCESS")) {
                         dto.setStatus(1);
                     } else {
                         dto.setStatus(0);
@@ -440,9 +436,9 @@ public class DragonOrderRefundsServiceImpl implements IDragonOrderRefundsService
                     dto.setOrderRefundCode(response.getOutRequestNo());
                     dto.setRefundCode(response.getOutTradeNo());
                     dto.setRefundPrice(response.getRefundAmount());
-                    dto.setRefundAt(DateUtil.format(response.getGmtRefundPay(), DateUtil.Formatter.yyyyMMddHHmmss));
+                    dto.setRefundAt(callBackDto.getGmtRefund());
                     dto.setRefundPrice(response.getRefundAmount());
-                    dto.setRefundError(response.getSubMsg());
+                    dto.setRefundError("");
                     sendNotifyUrl(dto);
                     return "success";
                 } catch (Exception e) {