Merge remote-tracking branch 'origin/beta' into beta

jianshui-common/src/main/java/com/jianshui/common/enums/InvoiceType.java

@@ -0,0 +1,57 @@
+package com.jianshui.common.enums;
+
+public enum InvoiceType {
+
+    /*
+     * 数电专用发票
+     */
+    INVOICE_TYPE_001("81","001"),
+
+    /*
+     * 数电普通发票
+     */
+    INVOICE_TYPE_002("82","002"),
+
+    /*
+     * 增值税专用发票
+     */
+    INVOICE_TYPE_004("s","004"),
+
+    /*
+     * 增值税普通发票
+     */
+    INVOICE_TYPE_007("c","007"),
+
+    /*
+     * 增值税电子普通发票
+     */
+    INVOICE_TYPE_026("p","026"),
+
+    /*
+     * 增值税电子专用发票
+     */
+    INVOICE_TYPE_028("b","028");
+
+
+    private String orginCode;
+
+    private String eleCode;
+    InvoiceType(String orginCode,String eleCode){
+        this.orginCode = orginCode;
+        this.eleCode = eleCode;
+    }
+
+    public static String getEleCode(String orginCode){
+
+        for (InvoiceType value : InvoiceType.values()) {
+
+            if(value.orginCode.equals(orginCode)){
+                return value.eleCode;
+            }
+        }
+
+
+        return orginCode;
+    }
+
+}

jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/api/ElephantInvoiceApiV6ServiceImpl.java

@@ -22,6 +22,7 @@ import com.jianshui.common.constant.WebServiceConstant;
 import com.jianshui.common.core.domain.AjaxResult;
 import com.jianshui.common.core.domain.entity.Companyservice;
 import com.jianshui.common.enums.ErrorCode;
+import com.jianshui.common.enums.InvoiceType;
 import com.jianshui.common.exception.jianshui.JianshiSystemErrorException;
 import com.jianshui.common.exception.jianshui.JianshuiParamErrorException;
 import com.jianshui.common.exception.jianshui.JianshuiServiceException;
@@ -1011,6 +1012,8 @@ public class ElephantInvoiceApiV6ServiceImpl implements IInvoiceApiService {
     @Override
     public HXResponse redConfirmationApply(JSONObject decryptResult, Companyservice companyservice) {
 
+        String fpdm = decryptResult.getString("lzfppzdm");
+        decryptResult.put("lzfppzdm", InvoiceType.getEleCode(fpdm));
         decryptResult = JsonKeyCase.JsonKeyCase(decryptResult);
         log.info("调用大象V6接口报文key转大写后的报文为{}",decryptResult);
         DxhyInterfaceResponse dxhyInterfaceResponse = null;