Merge branch 'dev-new' of http://10.1.1.216/xm/sdenergy/sims/sims-order-sdenergy into dev-new

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

@@ -113,6 +113,10 @@ public class ConfigurerInfo {
      * 订单驳回状态更新接口 (销售结算报账单的驳回状态传给发票系统(ERP-FI-INT-046))
      */
     public static final String ORDER_STATUS_UPDATE = "OrderStatusUpdate";
+    /**
+     * 调用进项自动认证
+     */
+    public static final String transferTojx="transferTojx";
 
     /**
      * 请求执行状态查询接口

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

@@ -1254,6 +1254,8 @@ public enum OrderInfoEnum {
     INTERFACE_BUSINESS_ID_FPKJ("FI840","发票开具"),
     INTERFACE_BUSINESS_ID_FPZFTS("FI844","发票作废回推"),
     INTERFACE_BUSINESS_ID_DDZTGX("FI841","订单状态更新"),
+    INTERFACE_BUSINESS_ID_JXTBSHUJU("FI847","自动认证"),
+    INTERFACE_BUSINESS_ID_JXSZC("FI849","进项税转出"),
 
     /**
      * 发票备注配置项枚举

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

@@ -82,6 +82,10 @@ public class InvoiceOpenGateRestApi {
                 interfaceName = ConfigurerInfo.GENERATE_QD_INVOICE;
             }else if(OrderInfoEnum.INTERFACE_BUSINESS_ID_DDZTGX.getKey().equals(requestParam.getIS_INPUT().getIFYWID())){
                 interfaceName = ConfigurerInfo.ORDER_STATUS_UPDATE;
+            }else if(OrderInfoEnum.INTERFACE_BUSINESS_ID_JXTBSHUJU.getKey().
+                    equals(requestParam.getIS_INPUT().getIFYWID()) ||
+                    OrderInfoEnum.INTERFACE_BUSINESS_ID_JXSZC.getKey().equals(requestParam.getIS_INPUT().getIFYWID())){
+                interfaceName = ConfigurerInfo.transferTojx;
             }else {
                 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

@@ -1,6 +1,7 @@
 package com.dxhy.order.consumer.openapi.api;
 
 import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.http.HttpUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.dxhy.order.baseservice.config.BaseServiceConfig;
 import com.dxhy.order.baseservice.module.buyer.protocol.GmfxxcxReqBO;
@@ -39,6 +40,7 @@ import com.dxhy.order.consumer.openapi.protocol.v6.sdenergy.MdmGmfxxtbReqBO;
 import com.dxhy.order.consumer.openapi.service.*;
 import com.dxhy.order.consumer.utils.BeanTransitionUtils;
 import com.dxhy.order.exception.OrderReceiveException;
+import com.dxhy.order.utils.HttpUtils;
 import com.dxhy.order.utils.JsonUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -48,6 +50,7 @@ import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.joda.time.DateTime;
 import org.joda.time.Duration;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
@@ -55,6 +58,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -92,6 +96,8 @@ public class InvoiceRestApiV6 {
 
     @Resource
     private UserInfoService userInfoService;
+    @Value("${jx.jxUrl}")
+    private String jxUrl;
 
     /**
      * 统一SDK对外接口方法
@@ -375,6 +381,13 @@ public class InvoiceRestApiV6 {
             //
             // returnJsonString = JsonUtils.getInstance().toJsonStringNullToEmpty(respBO);
             return returnJsonString = "";
+        }else if(ConfigurerInfo.transferTojx.equals(interfaceName)){
+            log.info("开始调用进项接口");
+            Map<String,String> headMap = new HashMap<>();
+            headMap.put("token",ConfigureConstant.POTOKEN);
+            String s = HttpUtils.doPostWithHeader(jxUrl,reqStr,headMap);
+            log.info("进项接口返回：{}",s);
+            return s;
         } else {
             returnJsonString = "";
         }