订单发票数据入库增加endTime

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

 package cn.freemud.adapter;
 
 import cn.freemud.base.entity.BaseResponse;
+import cn.freemud.base.util.DateUtil;
 import cn.freemud.constant.CommonsConstant;
 import cn.freemud.entities.dto.order.InvoiceCreateResponse;
 import cn.freemud.entities.dto.order.QueryInvoiceByCodesResponse;
@@ -22,10 +23,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.UUID;
+import java.util.*;
 import java.util.stream.Collectors;
 
 @Component
@@ -143,16 +141,19 @@ public class OrderInvoiceAdapter {
         return request;
     }
 
-    public OrderInvoiceRequest convert2OrderInvoiceRequest(InvoiceCreateRequest invoiceCreateRequest
-            , List<String> orderCodes, String scanUrl, String memberId){
+    public OrderInvoiceRequest convert2OrderInvoiceRequest(InvoiceCreateRequest invoiceCreateRequest, InvoiceCreateResponse invoiceData
+            , List<String> orderCodes, String memberId ){
         OrderInvoiceRequest request = new OrderInvoiceRequest();
         request.setPartnerId(invoiceCreateRequest.getPartnerId());
         request.setInvoiceType(CommonsConstant.CONSTANTS_TWO_INTEGER);
         request.setContent(INVOICE_CONTENT);
         request.setAmount(invoiceCreateRequest.getProductDetailList().get(0).getGoodsTotalPrice().multiply(new BigDecimal(100)).intValue());
-        request.setInvoiceUrl(scanUrl);
+        request.setInvoiceUrl(invoiceData.getScanUrl());
         request.setUserId(memberId);
         request.setInvoiceNo(invoiceCreateRequest.getInvoiceNo());
+        request.setTaxRate(INVOICE_TAXRATE);
+        request.setPickUpNo(invoiceData.getCode());
+        request.setEndingDate(DateUtil.convert2String(invoiceData.getEndingDate(),DateUtil.FORMAT_YYYY_MM_DD_HHMMSS));
         request.setOrderCodes(orderCodes);
         return request;
     }

order-application-service/src/main/java/cn/freemud/entities/dto/pay/OrderInvoiceRequest.java

@@ -56,6 +56,18 @@ public class OrderInvoiceRequest {
     @NotBlank(message = "开票流水号不能为空")
     private String invoiceNo;
 
+    @ApiModelProperty("税率")
+    @NotBlank(message = "税率不能为空")
+    private String taxRate;
+
+    @ApiModelProperty("提取号")
+    @NotBlank(message = "提取号不能为空")
+    private String pickUpNo;
+
+    @ApiModelProperty("扫码开票截至时间")
+    @NotBlank(message = "扫码开票截至时间不能为空")
+    private String endingDate;
+
     @ApiModelProperty("关联订单号")
     @NotNull(message = "关联订单号不能为空")
     private List<String> orderCodes;

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

@@ -4410,8 +4410,8 @@ public class OrderServiceImpl implements Orderservice {
         invoiceData.setScanUrl(orderInvoiceAdapter.handleInvoiceData(invoiceData.getScanUrl()));
 
         // 【4】. 录入发票记录，修改订单发票状态
-        OrderInvoiceRequest orderInvoiceRequest = orderInvoiceAdapter.convert2OrderInvoiceRequest(invoiceCreateRequest, request.getOrderCodes()
-                , invoiceData.getScanUrl() , userLoginInfoDto.getMemberId());
+        OrderInvoiceRequest orderInvoiceRequest = orderInvoiceAdapter.convert2OrderInvoiceRequest(invoiceCreateRequest, invoiceData,
+                request.getOrderCodes(), userLoginInfoDto.getMemberId());
         BaseResponse orderInvoiceResponse = orderServiceClient.createInvoice(orderInvoiceRequest);
         if (!Objects.equals(ResponseCodeConstant.RESPONSE_SUCCESS_STR, orderInvoiceResponse.getCode())) {
             return orderInvoiceResponse;