发票url处理

order-application-service/src/main/java/cn/freemud/adapter/OrderInvoiceAdapter.java

@@ -2,6 +2,7 @@ package cn.freemud.adapter;
 
 import cn.freemud.base.entity.BaseResponse;
 import cn.freemud.constant.CommonsConstant;
+import cn.freemud.entities.dto.order.InvoiceCreateResponse;
 import cn.freemud.entities.dto.pay.InvoiceCreateRequest;
 import cn.freemud.entities.dto.pay.InvoiceProductDetailRequest;
 import cn.freemud.entities.dto.pay.OrderInvoiceRequest;
@@ -11,8 +12,8 @@ import cn.freemud.enums.OrderStatus;
 import cn.freemud.enums.ResponseResult;
 import cn.freemud.utils.ResponseUtil;
 import com.freemud.application.sdk.api.ordercenter.entities.v1.OrderBeanV1;
-import com.freemud.application.sdk.api.ordercenter.enums.NewOrderStatus;
 import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang.StringUtils;
 
 import java.math.BigDecimal;
 import java.util.ArrayList;
@@ -128,4 +129,18 @@ public class OrderInvoiceAdapter {
         request.setOrderCodes(orderCodes);
         return request;
     }
+
+    public static void handleInvoiceData(InvoiceCreateResponse response){
+        if(null == response || StringUtils.isEmpty(response.getScanUrl())){
+            return ;
+        }
+        String scanUrl = response.getScanUrl();
+        if(scanUrl.startsWith("<![CDATA[")){
+            scanUrl = scanUrl.substring(9,scanUrl.length());
+        }
+        if(scanUrl.endsWith("]]>")){
+            scanUrl = scanUrl.substring(0,scanUrl.length()-3);
+        }
+        response.setScanUrl(scanUrl);
+    }
 }

order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java

@@ -4402,6 +4402,9 @@ public class OrderServiceImpl implements Orderservice {
             return ResponseUtil.error(invoiceResponse.getCode(), invoiceResponse.getMessage());
         }
 
+        // 【3.1】.发票格式处理
+        OrderInvoiceAdapter.handleInvoiceData(invoiceResponse.getData());
+
         // 【4】. 录入发票记录，修改订单发票状态
         OrderInvoiceRequest orderInvoiceRequest = OrderInvoiceAdapter.convert2OrderInvoiceRequest(invoiceCreateRequest, request.getOrderCodes()
                 , invoiceResponse.getData().getScanUrl() , userLoginInfoDto.getMemberId());
@@ -4414,6 +4417,4 @@ public class OrderServiceImpl implements Orderservice {
         responseVo.setScanUrl(invoiceResponse.getData().getScanUrl());
         return ResponseUtil.success(responseVo);
     }
-
-
 }