发票校验逻辑

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

@@ -159,19 +159,18 @@ public class OrderInvoiceAdapter {
 
     /**
      * 发票格式处理
-     * @param response
+     * @param scanUrl
      */
-    public void handleInvoiceData(InvoiceCreateResponse response){
-        if(null == response || StringUtils.isEmpty(response.getScanUrl())){
-            return ;
+    public String handleInvoiceData(String scanUrl){
+        if(StringUtils.isEmpty(scanUrl)){
+            return null;
         }
-        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);
+        return scanUrl;
     }
 }

order-application-service/src/main/java/cn/freemud/enums/ResponseResult.java

@@ -187,7 +187,7 @@ public enum ResponseResult {
     ORDER_QUERY_ANY_ERR("45080", "部分订单查询失败",""),
     ORDER_INVOICE_OPEN_ERR("45081", "订单状态不符合开票原则",""),
     ORDER_INVOICE_QUERY_ERROR("45082", "订单发票查询失败",""),
-    ORDER_INVOICE_IS_OPENED("45083", "存在选中的订单已开过发票，请重新选择",""),
+    ORDER_INVOICE_IS_OPENED("45083", "存在选中的订单已开过发票，请重新选择订单",""),
 
     /**
      * 售后单

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

@@ -4405,19 +4405,20 @@ public class OrderServiceImpl implements Orderservice {
             return ResponseUtil.error(invoiceResponse.getCode(), invoiceResponse.getMessage());
         }
 
+        InvoiceCreateResponse invoiceData = invoiceResponse.getData();
         // 【3.1】.发票格式处理
-        orderInvoiceAdapter.handleInvoiceData(invoiceResponse.getData());
+        invoiceData.setScanUrl(orderInvoiceAdapter.handleInvoiceData(invoiceData.getScanUrl()));
 
         // 【4】. 录入发票记录，修改订单发票状态
         OrderInvoiceRequest orderInvoiceRequest = orderInvoiceAdapter.convert2OrderInvoiceRequest(invoiceCreateRequest, request.getOrderCodes()
-                , invoiceResponse.getData().getScanUrl() , userLoginInfoDto.getMemberId());
+                , invoiceData.getScanUrl() , userLoginInfoDto.getMemberId());
         BaseResponse orderInvoiceResponse = orderServiceClient.createInvoice(orderInvoiceRequest);
         if (!Objects.equals(ResponseCodeConstant.RESPONSE_SUCCESS_STR, orderInvoiceResponse.getCode())) {
             return orderInvoiceResponse;
         }
 
         InvoiceCreateResponseVo responseVo = new InvoiceCreateResponseVo();
-        responseVo.setScanUrl(invoiceResponse.getData().getScanUrl());
+        responseVo.setScanUrl(invoiceData.getScanUrl());
         return ResponseUtil.success(responseVo);
     }
 }