Merge branch 'dev' into test

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

@@ -22,6 +22,6 @@ public interface IDragonOrderRefundsService {
 
     String wePayRefundCallBack(HttpServletRequest request , HttpServletResponse response);
 
-
+    String aliPayRefundCodeStatus(String outTradeNo ,String tradeNo ,String outBizNo,String callBackUrl);
 
 }

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

@@ -46,4 +46,16 @@ public class RefundController {
         return orderRefundsService.wePayRefundCallBack(request, response);
     }
 
+    @PostMapping("refund/alipay/result")
+    @ApiOperation("支付宝查询退款结果")
+    @ApiResponse(code = 200, message = "接口返回对象参数")
+    public String refundSingle(
+            @RequestParam(value = "orderCode") String orderCode,
+            @RequestParam(value = "paymentId") String paymentId,
+            @RequestParam(value = "orderRefundCode") String orderRefundCode,
+            @RequestParam(value = "callBackUrl") String callBackUrl) {
+        return orderRefundsService.aliPayRefundCodeStatus(orderCode, paymentId, orderRefundCode, callBackUrl);
+    }
+
+
 }

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

@@ -384,7 +384,7 @@ public class DragonOrderRefundsServiceImpl implements IDragonOrderRefundsService
                     dto.setRefundAt(refundAt);
                     dto.setRefundError(callBackDto.getReturnMsg());
                     log.debug("SEND WEPAY NOTIFTURL = " + JSON.toJSONString(dto));
-                    sendNotifyUrl(dto);
+                    sendNotifyUrl(dto,null);
 
                     mqHandleUtil.sendMySqlRedis(
                             SqlMapping.get("dragon_order_refund_log.insert"),
@@ -412,6 +412,63 @@ public class DragonOrderRefundsServiceImpl implements IDragonOrderRefundsService
         }
     }
 
+    @Override
+    public String aliPayRefundCodeStatus(String outTradeNo, String tradeNo, String outBizNo,String callBackUrl) {
+        try {
+            LocalDateTime nowTime = LocalDateTime.now();
+            AlipayTradeFastpayRefundQueryRequest request = new AlipayTradeFastpayRefundQueryRequest();//创建API对应的request类
+            request.setBizContent("{" +
+                    "\"out_trade_no\":\"" + outTradeNo + "\"," +
+                    "\"trade_no\":\"" + tradeNo + "\"," +
+                    "\"out_request_no\":\"" + outBizNo + "\"}"); //设置业务参数
+            AlipayTradeFastpayRefundQueryResponse response = PayAlipayUtils.getInstance().getHttpClient().execute(request);
+            log.info("AlipayTradeFastpayRefundQueryRequest -> data = " + JSON.toJSONString(response));
+
+            if (response.isSuccess()) {
+                try {
+                    NotifyUrlDto dto = new NotifyUrlDto();
+                    if (response.getMsg().equalsIgnoreCase("SUCCESS")) {
+                        dto.setStatus(1);
+                    } else {
+                        dto.setStatus(0);
+                    }
+                    dto.setOrderRefundCode(response.getOutRequestNo());
+                    dto.setRefundCode(response.getOutTradeNo());
+                    dto.setRefundPrice(response.getRefundAmount());
+                    dto.setRefundAt(DateUtil.format(response.getGmtRefundPay(), DateUtil.Formatter.yyyyMMddHHmmss));
+                    dto.setRefundPrice(response.getRefundAmount());
+                    dto.setRefundError("");
+                    sendNotifyUrl(dto,callBackUrl);
+
+                    mqHandleUtil.sendMySqlRedis(
+                            SqlMapping.get("dragon_order_refund_log.insert"),
+                            new Object[]{outBizNo, "ALIPAY", JSON.toJSONString(response), nowTime, nowTime},
+                            DragonConstant.MysqlRedisQueueEnum.DRAGON_REFUND_KEY.getCode()
+                    );
+
+                    mqHandleUtil.sendMySqlRedis(
+                            SqlMapping.get("dragon_order_refund_success.update"),
+                            new Object[]{nowTime, DateUtil.format(response.getGmtRefundPay(), DateUtil.Formatter.yyyyMMddHHmmss), DragonConstant.RefundStatusEnum.STATUS_REFUNDED.getCode(), response.getOutRequestNo()},
+                            DragonConstant.MysqlRedisQueueEnum.DRAGON_REFUND_KEY.getCode()
+                    );
+
+                    return "success";
+                } catch (Exception e) {
+                    e.printStackTrace();
+                    log.error("");
+                    return "fail";
+                }
+            } else {
+                log.error("response.isSuccess() -> fail ");
+                return "fail";
+            }
+
+        }catch (Exception e){
+
+        }
+        return null;
+    }
+
     public String aliPayRefundCallBack(String jsonStr) {
         LocalDateTime nowTime = LocalDateTime.now();
         try {
@@ -426,7 +483,6 @@ public class DragonOrderRefundsServiceImpl implements IDragonOrderRefundsService
 
             if (response.isSuccess()) {
                 try {
-
                     NotifyUrlDto dto = new NotifyUrlDto();
                     if (response.getMsg().equalsIgnoreCase("SUCCESS")) {
                         dto.setStatus(1);
@@ -440,7 +496,7 @@ public class DragonOrderRefundsServiceImpl implements IDragonOrderRefundsService
                     dto.setRefundPrice(response.getRefundAmount());
                     dto.setRefundError("");
                     log.debug("SEND ALIPAY NOTIFTURL = " + JSON.toJSONString(dto));
-                    sendNotifyUrl(dto);
+                    sendNotifyUrl(dto,null);
 
                     mqHandleUtil.sendMySqlRedis(
                             SqlMapping.get("dragon_order_refund_log.insert"),
@@ -471,7 +527,7 @@ public class DragonOrderRefundsServiceImpl implements IDragonOrderRefundsService
         }
     }
 
-    private void sendNotifyUrl(NotifyUrlDto notifyUrlDto) {
+    private void sendNotifyUrl(NotifyUrlDto notifyUrlDto,String url) {
         LocalDateTime nowTime = LocalDateTime.now();
         MultiValueMap<String, String> params = new LinkedMultiValueMap();
         params.add("orderRefundCode", notifyUrlDto.getOrderRefundCode());
@@ -480,8 +536,8 @@ public class DragonOrderRefundsServiceImpl implements IDragonOrderRefundsService
         params.add("refundError", notifyUrlDto.getRefundError());
         params.add("refundPrice", notifyUrlDto.getRefundPrice());
         params.add("status", notifyUrlDto.getStatus().toString());
-        String response = HttpUtil.post(dataUtils.getRefundNotifyUrl(DragonConstant.REFUND_REDIS_KET + notifyUrlDto.getOrderRefundCode()), params);
-        log.debug("RETURN RESPONSE=" + response);
+        String response = HttpUtil.post(url==null?dataUtils.getRefundNotifyUrl(DragonConstant.REFUND_REDIS_KET + notifyUrlDto.getOrderRefundCode()):url, params);
+        log.info("RETURN RESPONSE=" + response);
         if (response.equals("success")) {
             mqHandleUtil.sendMySqlRedis(
                     SqlMapping.get("dragon_order_refund_call_back.update"),
@@ -496,4 +552,5 @@ public class DragonOrderRefundsServiceImpl implements IDragonOrderRefundsService
             );
         }
     }
+
 }

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

@@ -412,6 +412,11 @@ public class DragonOrderRefundsServiceImpl implements IDragonOrderRefundsService
         }
     }
 
+    @Override
+    public String aliPayRefundCodeStatus(String outTradeNo, String tradeNo, String outBizNo,String callBackUrl) {
+        return null;
+    }
+
     public String aliPayRefundCallBack(String jsonStr) {
         LocalDateTime nowTime = LocalDateTime.now();
         try {