Merge branch '2021年9月15日-开票历史列表接口+详情接口+发票所含订单接口-黄兆良' into qa

order-application-service/src/main/java/cn/freemud/entities/vo/QueryInvoiceRep.java

@@ -11,7 +11,7 @@ public class QueryInvoiceRep {
     //C端
     private Date createTime;//开票日期
     private Integer invoiceType;//发票类型,004：增值税专用发票；007：增值税普通发票；026：增 值税电子发票；025：增值税卷式发票；028:增值税专用电子发票（万象）
-    private BigDecimal amount;//发票金额，保留两位小数（聚合：所有订单实付金额）
+    private Integer amount;//发票金额，单位是分（聚合：所有订单实付金额）
     private Integer orderQuantity;//订单数量
 
     //补充

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

@@ -4454,7 +4454,7 @@ public class OrderServiceImpl implements Orderservice {
             queryInvoiceReq.setEndTime(new Date());//如果前端传null，聚合当前时间
         }else{
             queryInvoiceReq.setStartTime(DateUtil.convert2Date(queryInvoiceReq.getSelectMonth()+"-01",DateUtil.FORMAT_YMD));//yyyy-MM拼接-01
-            queryInvoiceReq.setEndTime((DateUtil.addMonths(DateUtil.convert2Date(queryInvoiceReq.getSelectMonth()+":01",DateUtil.FORMAT_YMD),1)));////yyyy-（MM+1）拼接下月-01
+            queryInvoiceReq.setEndTime((DateUtil.addMonths(DateUtil.convert2Date(queryInvoiceReq.getSelectMonth()+"-01",DateUtil.FORMAT_YMD),1)));////yyyy-（MM+1）拼接下月-01
         }
         ApiLog.printLog("queryInvoiceListqueryInvoiceReq2",JSON.toJSONString(queryInvoiceReq),null,null);
         QueryInvoiceRepDto queryInvoiceRepDto = orderClient.queryInvoiceList(queryInvoiceReq);
@@ -4462,6 +4462,18 @@ public class OrderServiceImpl implements Orderservice {
         if(queryInvoiceRepDto == null || !Objects.equals(ResponseCodeConstant.RESPONSE_SUCCESS_STR, queryInvoiceRepDto.getCode())){
             return ResponseUtil.error(ResponseResult.QUERY_INVOICE_ERR);
         }
+        if(queryInvoiceRepDto.getResult() != null){
+            for (QueryInvoiceRep queryInvoiceRep : queryInvoiceRepDto.getResult().getItemList()) {
+                String scanUrl = queryInvoiceRep.getInvoiceUrl();
+                if(scanUrl.startsWith("<![CDATA[")){
+                    scanUrl = scanUrl.substring(9,scanUrl.length());
+                }
+                if(scanUrl.endsWith("]]>")){
+                    scanUrl = scanUrl.substring(0,scanUrl.length()-3);
+                }
+                queryInvoiceRep.setInvoiceUrl(scanUrl);
+            }
+        }
         return ResponseUtil.success(queryInvoiceRepDto.getResult());
     }
 }