提交 order

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/returns/PayInnerResultVo.java

+package com.liquidnet.service.kylin.dto.vo.returns;
+
+import com.liquidnet.service.kylin.dto.vo.middle.PayDataVo;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+@Data
+public class PayInnerResultVo implements Serializable {
+
+    private String code;
+
+    private String orderCode;
+
+    private Integer status;
+
+    private String orderId;
+
+    private String showUrl;
+
+    private String returnUrl;
+
+    private BigDecimal price;
+
+    private PayDataVo payData;
+
+}

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/returns/PayResultVo.java

@@ -12,19 +12,6 @@ public class PayResultVo implements Serializable {
     private static final long serialVersionUID = 1541552316829686035L;
 
     private String code;
-
-    private String order_code;
-
-    private Integer status;
-
-    private String order_id;
-
-    private String showUrl;
-
-    private String returnUrl;
-
-    private BigDecimal price;
-
-    private PayDataVo pay_data;
-
+    private String message;
+    private PayInnerResultVo payInnerResultVo;
 }

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

@@ -394,6 +394,80 @@ public class DragonOrderRefundsServiceImpl implements IDragonOrderRefundsService
         }
     }
 
+    public String aliPayRefundCallBack(HttpServletRequest request, HttpServletResponse response) {
+        InputStream inStream;
+        ByteArrayOutputStream outSteam;
+        LocalDateTime nowTime = LocalDateTime.now();
+        try {
+            inStream = request.getInputStream();
+            outSteam = new ByteArrayOutputStream();
+            byte[] buffer = new byte[1024];
+            int len = 0;
+            while ((len = inStream.read(buffer)) != -1) {
+                outSteam.write(buffer, 0, len);
+            }
+            // 获取微信调用我们notify_url的返回信息
+            String jsonStr = new String(outSteam.toByteArray(), "utf-8");
+            outSteam.close();
+            inStream.close();
+            log.debug("JSON = " + jsonStr);
+            WePayRefundReturnCallBackDto callBackDto = XmlUtil.toBean(jsonStr, WePayRefundReturnCallBackDto.class);
+            log.debug("DATA = " + callBackDto);
+            if (callBackDto.getReturnCode().equalsIgnoreCase("SUCCESS")) {
+                String reqInfo = PayWepayUtils.getInstance().unCodeReqInfo(callBackDto.getReqInfo());
+                log.debug("REQINFO = " + reqInfo);
+                WePayRefundReturnCallBackInfoDto info = XmlUtil.toBean(reqInfo, WePayRefundReturnCallBackInfoDto.class);
+                String outRefundNo = info.getOutRefundNo();
+                String refundAt = info.getSuccessTime();
+                try {
+                    sendMySqlRedis(
+                            SqlMapping.get("dragon_order_refund_log.insert"),
+                            new Object[]{outRefundNo, info.getRefundRequestSource(), JSON.toJSONString(info), nowTime, nowTime}
+                    );
+                    sendMySqlRedis(
+                            SqlMapping.get("dragon_order_refund_success.update"),
+                            new Object[]{nowTime, refundAt, DragonConstant.RefundStatusEnum.STATUS_REFUNDED.getCode(), outRefundNo}
+                    );
+
+                    NotifyUrlDto dto = new NotifyUrlDto();
+                    if (info.getRefundStatus().equalsIgnoreCase("SUCCESS")) {
+                        dto.setStatus(1);
+                    } else {
+                        dto.setStatus(0);
+                    }
+//                    dto.setOrderCode();
+//                    dto.setCode();
+//                    dto.setType();
+//                    dto.setPrice();
+//                    dto.setPaymentType();
+//                    dto.setPaymentId();
+//                    dto.setPaymentAt();
+
+                    dto.setOrderRefundCode(info.getOutRefundNo());
+                    dto.setRefundCode(info.getOutTradeNo());
+                    dto.setRefundPrice(info.getRefundFee());
+//                    dto.setRefundReason();
+                    dto.setRefundId(info.getRefundId());
+//                    dto.setRefundType(info.getrefund);
+                    dto.setRefundAt(refundAt);
+                    dto.setRefundError(callBackDto.getReturnMsg());
+                    sendNotifyUrl(dto);
+                    return "<xml><return_code><![CDATA[SUCCESS]]></return_code><return_msg><![CDATA[OK]]></return_msg></xml>";
+                } catch (Exception e) {
+                    e.printStackTrace();
+                    log.error("");
+                    return "<xml><return_code><![CDATA[FAIL]]></return_code><return_msg><![CDATA[ERROR]]></return_msg></xml>";
+                }
+            } else {
+                return "<xml><return_code><![CDATA[FAIL]]></return_code><return_msg><![CDATA[ERROR]]></return_msg></xml>";
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            log.error("");
+            return "<xml><return_code><![CDATA[FAIL]]></return_code><return_msg><![CDATA[ERROR]]></return_msg></xml>";
+        }
+    }
+
     /**
      * 给 REDIS 队列发送消息 数据库相关
      *

liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/java/com/liquidnet/service/order/service/impl/KylinOrderTicketsServiceImpl.java

@@ -557,16 +557,16 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
         currentTime = System.currentTimeMillis() - currentTime;
         log.debug("调用 PHP 支付 -> time:" + (currentTime) + "毫秒");
         PayResultVo payResultVo = JsonUtils.fromJson(returnData, PayResultVo.class);
-        payResultVo.setOrder_id(orderTicketId);
-        payResultVo.setPrice(orderTickets.getPriceActual());
-        orderTickets.setPayCode(payResultVo.getCode());
+        payResultVo.getPayInnerResultVo().setOrderId(orderTicketId);
+        payResultVo.getPayInnerResultVo().setPrice(orderTickets.getPriceActual());
+        orderTickets.setPayCode(payResultVo.getPayInnerResultVo().getCode());
         sqls.add(SqlMapping.get("kylin_order_ticket.add"));
         LinkedList<Object[]> sqlsDataA = new LinkedList<>();
         sqlsDataA.add(orderTickets.getAddObject());
 
         if (payOrderParam.getPayType().equals("alipay") && payOrderParam.getDeviceFrom().equals("wap")) {
-            payResultVo.setShowUrl(payOrderParam.getShowUrl() + orderTicketId);
-            payResultVo.setReturnUrl(payOrderParam.getReturnUrl() + orderTicketId);
+            payResultVo.getPayInnerResultVo().setShowUrl(payOrderParam.getShowUrl() + orderTicketId);
+            payResultVo.getPayInnerResultVo().setReturnUrl(payOrderParam.getReturnUrl() + orderTicketId);
         }
         // 生成vo
         KylinOrderTicketVo orderTicketVo = new KylinOrderTicketVo();
@@ -624,7 +624,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
             }
             String returnCheckData = HttpUtil.get(checkUrl + "?code=" + orderTicketData.getPayCode(), null);
             PayResultVo checkVo = JsonUtils.fromJson(returnCheckData, PayResultVo.class);
-            if (checkVo.getStatus() == 1) {
+            if (checkVo.getPayInnerResultVo().getStatus() == 1) {
                 return ResponseDto.failure(ErrorMapping.get("20027"));
             }
             if (!orderTicketData.getPayType().equals("no")) {
@@ -659,11 +659,11 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
 
                 String returnData = HttpUtil.post(payUrl + payAgainParam.getDeviceFrom() + "/" + payAgainParam.getPayType(), httpData);
                 PayResultVo payResultVo = JsonUtils.fromJson(returnData, PayResultVo.class);
-                payResultVo.setOrder_id(orderTicketData.getOrderTicketsId());
-                payResultVo.setPrice(orderTicketData.getPriceActual());
+                payResultVo.getPayInnerResultVo().setOrderId(orderTicketData.getOrderTicketsId());
+                payResultVo.getPayInnerResultVo().setPrice(orderTicketData.getPriceActual());
                 if (payAgainParam.getPayType().equals("alipay") && payAgainParam.getDeviceFrom().equals("wap")) {
-                    payResultVo.setShowUrl(payAgainParam.getShowUrl());
-                    payResultVo.setReturnUrl(payAgainParam.getReturnUrl());
+                    payResultVo.getPayInnerResultVo().setShowUrl(payAgainParam.getShowUrl());
+                    payResultVo.getPayInnerResultVo().setReturnUrl(payAgainParam.getReturnUrl());
                 }
 
                 KylinOrderTickets orderTickets = new KylinOrderTickets();
@@ -899,7 +899,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
         } else {
             String returnCheckData = HttpUtil.get(checkUrl + "?code=" + orderTicketData.getPayCode(), null);
             PayResultVo checkVo = JsonUtils.fromJson(returnCheckData, PayResultVo.class);
-            if (checkVo.getStatus() == 1) {
+            if (checkVo.getPayInnerResultVo().getStatus() == 1) {
                 return ResponseDto.success(1);
             } else {
                 return ResponseDto.success(0);