Merge branch 'release' into test

order-management-consumer/src/main/java/com/dxhy/order/consumer/constant/ExcelErrorMessageEnum.java

@@ -262,7 +262,7 @@ public enum ExcelErrorMessageEnum {
     
     ORDERINFO_SSFLBM_SL_NULL("9611", "该商品税率没有维护，不能为空"),
     
-    ORDERINFO_9701("9701", "企业自编码长度超过16位"),
+    ORDERINFO_9701("9701", "企业自编码长度超过18位"),
     
     ORDERINFO_9702("9702", "编码表版本号长度超过10位"),
     

order-management-consumer/src/main/java/com/dxhy/order/consumer/dao/InterfaceRequestDataMapper.java

@@ -1,6 +1,7 @@
 package com.dxhy.order.consumer.dao;
 
 import com.dxhy.order.model.InterfaceRequestData;
+import org.apache.ibatis.annotations.Param;
 
 public interface InterfaceRequestDataMapper {
     int deleteByPrimaryKey(String id);
@@ -11,6 +12,8 @@ public interface InterfaceRequestDataMapper {
 
     InterfaceRequestData selectByPrimaryKey(String id);
 
+    InterfaceRequestData selectByBatchId(@Param("batchId") String batchId, @Param("ywlx")String ywlx);
+
     int updateByPrimaryKeySelective(InterfaceRequestData record);
 
     int updateByPrimaryKeyWithBLOBs(InterfaceRequestData record);

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

@@ -7,6 +7,7 @@ import cn.hutool.core.util.NumberUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.csp.sentinel.annotation.SentinelResource;
 import com.dxhy.order.constant.*;
+import com.dxhy.order.consumer.dao.InterfaceRequestDataMapper;
 import com.dxhy.order.exception.InterfaceException;
 import com.dxhy.order.exception.OrderReceiveException;
 import com.dxhy.order.model.*;
@@ -103,6 +104,9 @@ public class InterfaceServiceImplV5 implements InterfaceServiceV5 {
     
     @Resource
     private OrderItemInfoService orderItemInfoService;
+
+    @Resource
+    private InterfaceRequestDataMapper interfaceRequestDataMapper;
     
     @Resource
     private QuickCodeInfoService quickCodeInfoService;
@@ -443,6 +447,8 @@ public class InterfaceServiceImplV5 implements InterfaceServiceV5 {
         OrderInfo orderInfo = orderInfoService.selectOrderInfoByOrderId(orderProcessInfo.getOrderInfoId(), shList);
         
         OrderInvoiceInfo orderInvoiceInfo = orderInvoiceInfoService.selectOrderInvoiceInfoByFpqqlsh(orderProcessInfo.getFpqqlsh(), shList);
+
+        InterfaceRequestData interfaceRequestData = interfaceRequestDataMapper.selectByBatchId(orderProcessInfo.getBzdh(), "GenerateQdInvoice");
         String ddzt = orderProcessInfo.getDdzt();
         String sbyy = orderProcessInfo.getSbyy();
         if (orderInfo == null) {
@@ -460,7 +466,7 @@ public class InterfaceServiceImplV5 implements InterfaceServiceV5 {
         /**
          * 数据组装
          */
-        DdfpxxV5 ddfpxx = BeanTransitionV5Utils.transitionOrderInvoiceInfoV5(orderInfo, orderProcessInfo, orderInvoiceInfo);
+        DdfpxxV5 ddfpxx = BeanTransitionV5Utils.transitionOrderInvoiceInfoV5(orderInfo, orderProcessInfo, orderInvoiceInfo,interfaceRequestData);
         
         /**
          * 订单状态返回:

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

@@ -4,9 +4,12 @@ import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.dxhy.order.constant.ConfigureConstant;
 import com.dxhy.order.constant.OrderInfoEnum;
+import com.dxhy.order.consumer.openapi.protocol.po.PoCommonRequestParam;
+import com.dxhy.order.consumer.openapi.protocol.po.generateinvoice.sap.FpkjReqSap;
 import com.dxhy.order.model.*;
 import com.dxhy.order.utils.CommonUtils;
 import com.dxhy.order.consumer.openapi.protocol.v5.order.*;
+import com.dxhy.order.utils.JsonUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 
@@ -33,7 +36,7 @@ public class BeanTransitionV5Utils {
      * @param orderInvoiceInfo
      * @return
      */
-    public static DdfpxxV5 transitionOrderInvoiceInfoV5(OrderInfo orderInfo, OrderProcessInfo orderProcessInfo, OrderInvoiceInfo orderInvoiceInfo) {
+    public static DdfpxxV5 transitionOrderInvoiceInfoV5(OrderInfo orderInfo, OrderProcessInfo orderProcessInfo, OrderInvoiceInfo orderInvoiceInfo,InterfaceRequestData generateQdInvoice) {
         DdfpxxV5 ddfpxxV5 = transitionOrderInvoiceInfoV5(orderInfo, orderInvoiceInfo);
         ddfpxxV5.setYWLX(orderProcessInfo.getYwlx());
         ddfpxxV5.setKPFS(orderProcessInfo.getKpfs());
@@ -41,6 +44,17 @@ public class BeanTransitionV5Utils {
         ddfpxxV5.setDDLX(orderProcessInfo.getDdlx());
         ddfpxxV5.setBillNum(orderProcessInfo.getBzdh());
         ddfpxxV5.setCompanyCode(orderProcessInfo.getGsdm());
+        if(OrderInfoEnum.SYS_SOURCE_SNYXX.getKey().equals(orderProcessInfo.getXtly())){
+            try {
+                String requestData = generateQdInvoice.getRequestData();
+                PoCommonRequestParam poCommonRequestParam = JsonUtils.getInstance().parseObject(requestData, PoCommonRequestParam.class);
+                String zdata = poCommonRequestParam.getIS_INPUT().getZDATA();
+                FpkjReqSap req = JsonUtils.getInstance().parseObject(zdata, FpkjReqSap.class);
+                ddfpxxV5.setDDH(StringUtils.isBlank(req.getZJSDH())?"":req.getZJSDH());
+            } catch (Exception e) {
+                log.error("商旅匹配结算单号{}",e.getMessage());
+            }
+        }
         return ddfpxxV5;
     }
 

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

@@ -4,18 +4,18 @@ spring:
     nacos:
       config:
         # Nacos config 地址
-        server-addr: nacos-1.itax.local:33000
+        server-addr: 172.31.36.147:33000
         #server-addr: 172.31.36.147:33000
 #        server-addr: 172.31.36.143:33000
         # Nacos config 命名空间,对应配置中的名称(sims_order_namespace)
-        namespace: aaf40845-1c5a-4f09-9a14-a368e704892c
+        namespace: a049b41c-b0a8-4a66-91b1-f3f3cab0e524
         # Nacos config 分组
         group: sims-order-config
         # Nacos config 登录用户名
         username: nacos
         # Nacos config 登录密码
 #        password: Invoice.nacos.!1
-        password: FaP!a0_NacOs
+        password: Invoice.nacos.!1
         # Nacos config 配置文件前缀
         prefix: sims-order-api
         # Nacos config 配置文件后缀,拼接完URL需要对应NacosServer中的dataId对应配置,${prefix}-${spring.profiles.active}.${file-extension}
@@ -56,9 +56,9 @@ spring:
       # Nacos discovery 配置
       discovery:
         # Nacos discovery 服务地址
-        server-addr: nacos-1.itax.local:33000
+        server-addr: 172.31.36.147:33000
         username: nacos
-        password: FaP!a0_NacOs
+        password: Invoice.nacos.!1
     #sentinel配置相关
     sentinel:
       #sentinel是否开启控制

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

@@ -6,11 +6,11 @@ spring:
     name: order-api
   profiles:
     # Spring 配置文件读取
-    active: @deployType@
+#    active: @deployType@
 #    active: own
-#    active: std
+    active: std
 #    active: dev
-    #active: test
+#    active: test
   jackson:
     # jackson 日期格式化
     date-format: yyyy-MM-dd HH:mm:ss

order-management-consumer/src/main/resources/mybatis/mapper/InterfaceRequestDataMapper.xml

@@ -25,6 +25,9 @@
     from interface_request_data
     where id = #{id,jdbcType=VARCHAR}
   </select>
+  <select id="selectByBatchId" resultMap="ResultMapWithBLOBs">
+      select Blob_Column_List from interface_request_data where batch_id = #{batchId} and ywlx = #{ywlx} order by create_time desc limit 1
+  </select>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.String" >
     delete from interface_request_data
     where id = #{id,jdbcType=VARCHAR}