Merge branch '瑞丰相关接口改造' into release

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

@@ -1277,6 +1277,10 @@ public enum OrderInfoEnum {
     INTERFACE_BUSINESS_ID_FPKJTS("FI843","发票开具回推"),
     INTERFACE_BUSINESS_ID_FPKJ("FI840","发票开具"),
     INTERFACE_BUSINESS_SNYX_FPKJ("FI883","发票开具"),
+    /**
+     * 瑞丰发票开具接口
+     */
+    INTERFACE_BUSINESS_RF_FPKJ("FI1010","发票开具"),
     INTERFACE_BUSINESS_ID_FPZFTS("FI844","发票作废回推"),
     INTERFACE_BUSINESS_ID_GSCLIENT("FI846","获取公司client"),
     INTERFACE_BUSINESS_ID_DDZTGX("FI841","订单状态更新"),

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

@@ -79,7 +79,8 @@ public class InvoiceOpenGateRestApi {
             PoCommonRequestParam requestParam = JsonUtils.getInstance().parseObject(param, PoCommonRequestParam.class);
             String interfaceName = "";
             if(OrderInfoEnum.INTERFACE_BUSINESS_ID_FPKJ.getKey().equals(requestParam.getIS_INPUT().getIFYWID())
-                    ||OrderInfoEnum.INTERFACE_BUSINESS_SNYX_FPKJ.getKey().equals(requestParam.getIS_INPUT().getIFYWID())){
+                    ||OrderInfoEnum.INTERFACE_BUSINESS_SNYX_FPKJ.getKey().equals(requestParam.getIS_INPUT().getIFYWID())
+                    ||OrderInfoEnum.INTERFACE_BUSINESS_RF_FPKJ.getKey().equals(requestParam.getIS_INPUT().getIFYWID())){
                 interfaceName = ConfigurerInfo.GENERATE_QD_INVOICE;
             }else if(OrderInfoEnum.INTERFACE_BUSINESS_ID_DDZTGX.getKey().equals(requestParam.getIS_INPUT().getIFYWID())){
                 interfaceName = ConfigurerInfo.ORDER_STATUS_UPDATE;

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

@@ -3552,6 +3552,7 @@ public class BeanTransitionUtils {
             ddtxxBO.setPZGZRQ(req.getZGZRQ());
             ddtxxBO.setYZFP(ConfigureConstant.STRING_0);
             ddtxxBO.setORIGINDDH(req.getZJSDH());
+            ddtxxBO.setBZ(req.getZZBZ());
             ddtxxBO.setKB(ObjectUtil.isNull(req.getITITEM().get(0).getKTYPE())?"":req.getITITEM().get(0).getKTYPE()+(ObjectUtil.isNull(req.getITITEM().get(0).getKNAME())?"":req.getITITEM().get(0).getKNAME()));
             //清单标志先赋值成0，没有农产品业务，成品油的人工拆分出来做处理
             ddtxxBO.setQDBZ("0");

order-management-consumer/src/main/resources/bootstrap-test.yaml

@@ -4,14 +4,14 @@ spring:
     nacos:
       config:
         # Nacos config 地址
-        server-addr: 172.31.36.143:33000
-        #server-addr: 172.31.36.147:33000
+#        server-addr: 172.31.36.143:33000
+        server-addr: 172.31.36.146:33000
         # Nacos config 命名空间,对应配置中的名称(sims_order_namespace)
         namespace: a049b41c-b0a8-4a66-91b1-f3f3cab0e524
         # Nacos config 分组
         group: sims-order-config
         # Nacos config 登录用户名
-        username: nacos
+        username: admin
         # Nacos config 登录密码
         password: Invoice.nacos.!1
         # Nacos config 配置文件前缀
@@ -54,7 +54,7 @@ spring:
       # Nacos discovery 配置
       discovery:
         # Nacos discovery 服务地址
-        server-addr: 172.31.36.143:33000
+        server-addr: 172.31.36.146:33000
         #Nacos config 命名空间,对应配置中的名称(sims_order_namespace)
         namespace: ${spring.cloud.nacos.config.namespace}
         # Nacos config 登录用户名