Merge branch 'dev' into gongquanlin

order-management-base-service/src/main/java/com/dxhy/order/baseservice/config/BaseServiceConfig.java

@@ -216,14 +216,20 @@ public class BaseServiceConfig {
     /**
      * 调用山能PO username
      */
-    @Value("${order.push.po:userName:}")
+    @Value("${order.push.po.userName:}")
     private String poUserName;
 
     /**
      * 调用山能PO password
      */
-    @Value("${order.push.po:password:}")
+    @Value("${order.push.po.password:}")
     private String poPassword;
+
+    /**
+     * 调用山能PO client
+     */
+    @Value("${order.push.po.client:}")
+    private String poClient;
     
     
     /**

order-management-common/src/main/java/com/dxhy/order/constant/OrderInfoEnum.java

@@ -347,14 +347,15 @@ public enum OrderInfoEnum {
 
     /**
      * 山能业务系统发票类型
-     * 1-增值税普通发票
+     */
-     * 0-增值税专用发票
+    SN_INVOICE_TYPE_10("10", "增值税专用发票"),
-     * 2-增值税电子普通发票
+    SN_INVOICE_TYPE_11("11", "增值税普通发票"),
-     * 待补全全电发票类型"
+    SN_INVOICE_TYPE_12("12", "增值税电子普通发票"),
-     */
+    SN_INVOICE_TYPE_14("14", "机动车销售统一发票"),
-    SN_INVOICE_TYPE_0("0", "增值税专用发票"),
+    SN_INVOICE_TYPE_15("15", "二手车销售统一发票"),
-    SN_INVOICE_TYPE_1("1", "增值税普通发票"),
+    SN_INVOICE_TYPE_25("25", "增值税电子专用发票"),
-    SN_INVOICE_TYPE_2("2", "增值税电子普通发票"),
+    SN_INVOICE_TYPE_26("26", "电子发票（增值税专用发票）"),
+    SN_INVOICE_TYPE_27("27", "电子发票（普通发票）"),
 
     /**
      * 开票类型（0：蓝票；1：红票）
@@ -1227,7 +1228,7 @@ public enum OrderInfoEnum {
     /**
      * 系统标识
      */
-    SYS_SIGN_FP("JS","发票平台"),
+    SYS_SIGN_FP("FPXT","发票平台"),
 
     /**
      * 接口业务ID

order-management-common/src/main/java/com/dxhy/order/utils/CommonUtils.java

@@ -363,16 +363,31 @@ public class CommonUtils {
      */
     public static String transSnFplxdm(String fpzldm) {
         String fplxdm;
-        if (OrderInfoEnum.SN_INVOICE_TYPE_0.getKey().equals(fpzldm)) {
+        if (OrderInfoEnum.SN_INVOICE_TYPE_10.getKey().equals(fpzldm)) {
             //增值税专用发票
             fplxdm = OrderInfoEnum.ORDER_INVOICE_TYPE_004.getKey();
-        } else if (OrderInfoEnum.SN_INVOICE_TYPE_1.getKey().equals(fpzldm)) {
+        } else if (OrderInfoEnum.SN_INVOICE_TYPE_11.getKey().equals(fpzldm)) {
             //增值税普通发票
             fplxdm = OrderInfoEnum.ORDER_INVOICE_TYPE_007.getKey();
-        } else if (OrderInfoEnum.SN_INVOICE_TYPE_2.getKey().equals(fpzldm)) {
+        } else if (OrderInfoEnum.SN_INVOICE_TYPE_12.getKey().equals(fpzldm)) {
             //增值税电子普通发票
             fplxdm = OrderInfoEnum.ORDER_INVOICE_TYPE_026.getKey();
-        } else {
+        } else if (OrderInfoEnum.SN_INVOICE_TYPE_14.getKey().equals(fpzldm)) {
+            //机动车销售统一发票
+            fplxdm = OrderInfoEnum.ORDER_INVOICE_TYPE_005.getKey();
+        }else if (OrderInfoEnum.SN_INVOICE_TYPE_15.getKey().equals(fpzldm)) {
+            //二手车销售统一发票
+            fplxdm = OrderInfoEnum.ORDER_INVOICE_TYPE_006.getKey();
+        }else if (OrderInfoEnum.SN_INVOICE_TYPE_25.getKey().equals(fpzldm)) {
+            //增值税电子专用发票
+            fplxdm = OrderInfoEnum.ORDER_INVOICE_TYPE_028.getKey();
+        }else if (OrderInfoEnum.SN_INVOICE_TYPE_26.getKey().equals(fpzldm)) {
+            //全电专
+            fplxdm = OrderInfoEnum.ORDER_INVOICE_TYPE_001.getKey();
+        }else if (OrderInfoEnum.SN_INVOICE_TYPE_27.getKey().equals(fpzldm)) {
+            //全电普
+            fplxdm = OrderInfoEnum.ORDER_INVOICE_TYPE_002.getKey();
+        }else {
             fplxdm = fpzldm;
         }
         log.debug("{}山能业务系统发票种类转换为标品开票接口发票种类,请求参数为:{},输出参数为:{}", LOGGER_MSG, fpzldm, fplxdm);

order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/PushInvoiceServiceImpl.java

@@ -372,13 +372,13 @@ public class PushInvoiceServiceImpl implements PushInvoiceService {
                 }
                 Map<String, String> requestMap = commonDisposeService.getRequestParameter(pushInfo.getNsrsbh(), pushInfo.getZipCode(), pushInfo.getEncryptCode(), content, pushInfo.getPushUrl(), pushInfo.getInterfaceType(), pushInfo.getVersionIdent());
                 if(OrderInfoEnum.SYS_SOURCE_SAP.getKey().equals(xtly)){
-                    fptsParam = convertToYwxtParam(fpTsMqData,xtly,content);
+                    fptsParam = convertToYwxtParam(fpTsMqData,xtly,content,baseServiceConfig.getPoClient());
                 }else {
                     fptsParam = JsonUtils.getInstance().toJsonString(requestMap);
                 }
 
                 try {
-                    log.info("{}推送企业开始,推送企业url:{},推送参数:{}", LOGGER_MSG, pushInfo.getPushUrl(), fptsParam.substring(0,400));
+                    log.info("{}推送企业开始,推送企业url:{},推送参数:{}", LOGGER_MSG, pushInfo.getPushUrl(), fptsParam);
                     long startTime = System.currentTimeMillis();
                     String result = "";
                     if (ConfigurerInfo.INTERFACE_VERSION_V5.equals(pushInfo.getVersionIdent())
@@ -865,7 +865,7 @@ public class PushInvoiceServiceImpl implements PushInvoiceService {
         return content;
     }
 
-    public String convertToYwxtParam(CommonTsMqData fpTsMqData,String xtly,String content){
+    public String convertToYwxtParam(CommonTsMqData fpTsMqData,String xtly,String content,String poClient){
         String ywxtParam = "";
 
         if(OrderInfoEnum.INTERFACE_TYPE_INVOICE_PUSH_STATUS_1.getKey().equals(fpTsMqData.getPushType())){
@@ -880,7 +880,6 @@ public class PushInvoiceServiceImpl implements PushInvoiceService {
                 fpkjtsReqSap.setZJSDH(ddfpxx.getDDH());
                 fpkjtsReqSap.setZFPDM(ddfpxx.getFPDM());
                 fpkjtsReqSap.setZFPHM(ddfpxx.getFPHM());
-                //TODO lfl 发票类型需要做转换
                 fpkjtsReqSap.setZFPLX(ddfpxx.getFPLXDM());
                 fpkjtsReqSap.setZXFBM(ddfpxx.getXHFSBH());
                 fpkjtsReqSap.setZGFBH(ddfpxx.getGMFSBH());
@@ -927,11 +926,11 @@ public class PushInvoiceServiceImpl implements PushInvoiceService {
                 isInput.setIFYWID(OrderInfoEnum.INTERFACE_BUSINESS_ID_FPKJTS.getKey());
                 isInput.setBSKEY(apiInvoiceCommonMapperService.getGenerateShotKey());
                 isInput.setZORG("");
-                isInput.setZFILED5("");
+                isInput.setZFILED5(poClient);
                 String jsonString = JsonUtils.getInstance().toJsonString(fpkjtsReqSap);
                 isInput.setZDATA(jsonString);
                 PoCommonRequestParam poCommonRequestParam = new PoCommonRequestParam();
-                poCommonRequestParam.setISINPUT(isInput);
+                poCommonRequestParam.setIS_INPUT(isInput);
 
                 ywxtParam = JsonUtils.getInstance().toJsonString(poCommonRequestParam);
             }
@@ -953,7 +952,7 @@ public class PushInvoiceServiceImpl implements PushInvoiceService {
                 String jsonString = JsonUtils.getInstance().toJsonString(fpzftsReqSap);
                 isInput.setZDATA(jsonString);
                 PoCommonRequestParam poCommonRequestParam = new PoCommonRequestParam();
-                poCommonRequestParam.setISINPUT(isInput);
+                poCommonRequestParam.setIS_INPUT(isInput);
 
                 ywxtParam = JsonUtils.getInstance().toJsonString(poCommonRequestParam);
             }

order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/api/InvoiceOpenGateRestApi.java

@@ -79,12 +79,12 @@ public class InvoiceOpenGateRestApi {
         try {
             PoCommonRequestParam requestParam = JsonUtils.getInstance().parseObject(param, PoCommonRequestParam.class);
             String interfaceName = "";
-            if(OrderInfoEnum.INTERFACE_BUSINESS_ID_FPKJ.getKey().equals(requestParam.getISINPUT().getIFYWID())){
+            if(OrderInfoEnum.INTERFACE_BUSINESS_ID_FPKJ.getKey().equals(requestParam.getIS_INPUT().getIFYWID())){
                 interfaceName = ConfigurerInfo.GENERATE_QD_INVOICE;
-            }else if(OrderInfoEnum.INTERFACE_BUSINESS_ID_DDZTGX.getKey().equals(requestParam.getISINPUT().getIFYWID())){
+            }else if(OrderInfoEnum.INTERFACE_BUSINESS_ID_DDZTGX.getKey().equals(requestParam.getIS_INPUT().getIFYWID())){
                 interfaceName = ConfigurerInfo.ORDER_STATUS_UPDATE;
             }else {
-                log.error("{}-山能对外接口PO业务接口ID:{},未定义", LOGGER_MESSAGE_V6, requestParam.getISINPUT().getIFYWID());
+                log.error("{}-山能对外接口PO业务接口ID:{},未定义", LOGGER_MESSAGE_V6, requestParam.getIS_INPUT().getIFYWID());
                 return "请传输正确的业务ID";
             }
             //保存请求报文

order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/api/InvoiceRestApiV6.java

@@ -211,7 +211,7 @@ public class InvoiceRestApiV6 {
         if (ConfigurerInfo.GENERATE_QD_INVOICE.equals(interfaceName)) {
             //全电开票接口
             PoCommonRequestParam poCommonRequestParam = JsonUtils.getInstance().parseObject(reqStr, PoCommonRequestParam.class);
-            Map zData = JsonUtils.getInstance().parseObject(poCommonRequestParam.getISINPUT().getZDATA(), Map.class);
+            Map zData = JsonUtils.getInstance().parseObject(poCommonRequestParam.getIS_INPUT().getZDATA(), Map.class);
             DeptEntity deptEntity = userInfoService.querySysDeptEntityByEnterpriseNumbers(zData.get("BUKRS").toString());
             DdpcxxReqBO ddpcxxReq = BeanTransitionUtils.transitionPoKpReq(poCommonRequestParam,deptEntity);
             DdpcxxRspV5 ddpcxxRspV5 = interfaceServiceV6.generateQdInvoiceV6(ddpcxxReq, secretId, null);

order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/protocol/po/PoCommonRequestParam.java

@@ -1,5 +1,6 @@
 package com.dxhy.order.consumer.openapi.protocol.po;
 
+import com.alibaba.fastjson.annotation.JSONField;
 import lombok.Data;
 
 /**
@@ -12,5 +13,6 @@ public class PoCommonRequestParam {
     /**
      * IsInput
      */
-    private IsInput ISINPUT;
+    @JSONField(name = "IS_INPUT")
+    private IsInput IS_INPUT;
 }

order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/InterfaceServiceImplV6.java

@@ -103,7 +103,7 @@ public class InterfaceServiceImplV6 implements InterfaceServiceV6 {
         InterfaceRequestData data = new InterfaceRequestData();
         data.setId(DistributedKeyMaker.generateShotKey());
         data.setYwlx(interfaceName);
-        data.setBatchId(poCommonRequestParam.getISINPUT().getBSKEY());
+        data.setBatchId(poCommonRequestParam.getIS_INPUT().getBSKEY());
         data.setRequestData(param);
         data.setCreateTime(new Date());
         interfaceRequestDataMapper.insert(data);

order-management-consumer/src/main/java/com/dxhy/order/consumer/utils/BeanTransitionUtils.java

@@ -3216,7 +3216,7 @@ public class BeanTransitionUtils {
      * @Date: 2023-02-06
      */
     public static DdpcxxReqBO transitionPoKpReq(PoCommonRequestParam poCommonRequestParam,DeptEntity deptEntity){
-        IsInput isinput = poCommonRequestParam.getISINPUT();
+        IsInput isinput = poCommonRequestParam.getIS_INPUT();
         DdpcxxReqBO ddpcxxReqBO = new DdpcxxReqBO();
         DdpcxxBO ddpcxxBO = new DdpcxxBO();
         List<DdzxxBO> ddzxxList = new ArrayList<>();