update

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

@@ -145,7 +145,7 @@ public class OrderInvoiceAdapter {
             , List<String> orderCodes, String memberId ){
         OrderInvoiceRequest request = new OrderInvoiceRequest();
         request.setPartnerId(invoiceCreateRequest.getPartnerId());
-        request.setInvoiceType(CommonsConstant.CONSTANTS_TWO_INTEGER);
+        request.setInvoiceType(InvoiceTypeCodeEnum.ELECTRONIC_INVOICE.getFmType());
         request.setContent(INVOICE_CONTENT);
         request.setAmount(invoiceCreateRequest.getProductDetailList().get(0).getGoodsTotalPrice().multiply(new BigDecimal(100)).intValue());
         request.setInvoiceUrl(invoiceData.getScanUrl());

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

@@ -14,7 +14,7 @@ public class OrderInvoiceRequest {
     @NotEmpty(message = "商户号不能为空")
     private String partnerId;
 
-    @ApiModelProperty("发票类型 1:普通发票 2:增值发票")
+    @ApiModelProperty("发票类型")
     @NotNull(message = "发票类型不能为空")
     private Integer invoiceType;
 

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

@@ -7,11 +7,11 @@ import lombok.Getter;
 @AllArgsConstructor
 public enum InvoiceTypeCodeEnum {
 
-    SPECIAL_INVOICE("1", "004", "增值税专用发票"),
-    COMMON_INVOICE("2", "007", "增值税普通发票"),
-    ELECTRONIC_INVOICE("3", "026", "增值税电子发票"),
-    ROLL_INVOICE("4", "025", "增值税卷式发票"),
-    SPECIAL_ELECTRONIC_INVOICE("5", "028", "增值税专用电子发票"),
+    SPECIAL_INVOICE(4, "004", "增值税专用发票"),
+    COMMON_INVOICE(7, "007", "增值税普通发票"),
+    ELECTRONIC_INVOICE(26, "026", "增值税电子发票"),
+    ROLL_INVOICE(25, "025", "增值税卷式发票"),
+    SPECIAL_ELECTRONIC_INVOICE(28, "028", "增值税专用电子发票"),
 
 
     ;
@@ -19,7 +19,7 @@ public enum InvoiceTypeCodeEnum {
     /**
      * 非码类型
      */
-    private String fmType;
+    private Integer fmType;
 
     /**
      * 百望类型