feat: 开票接口定制化字段入库

order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/thirdservice/user/model/DeptEntity.java

@@ -172,4 +172,14 @@ public class DeptEntity implements Serializable {
      * 组织类型（0:虚拟组织，1:实体组织）
      */
     private String groupType;
+
+    /**
+     * 开票组织名称
+     */
+    private String invoiceName;
+
+    /**
+     * 开票税号
+     */
+    private String invoiceNsrsbh;
 }

order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/protocol/v4/order/DdmxxxBO.java

@@ -120,5 +120,15 @@ public class DdmxxxBO implements Serializable {
     private String BYZD1;
     private String BYZD2;
     private String BYZD3;
+
+    /**
+     * 批号
+     */
+    private String PH;
+
+    /**
+     * 矿别
+     */
+    private String KB;
     
 }

order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/protocol/v4/order/DdtxxBO.java

@@ -6,6 +6,7 @@ import lombok.Setter;
 import lombok.ToString;
 
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * 订单全数据协议bean
@@ -321,5 +322,47 @@ public class DdtxxBO implements Serializable {
     private String BYZD3;
     private String BYZD4;
     private String BYZD5;
+
+    /**
+     * 报账单号
+     */
+    private String BZDH;
+    /**
+     * 系统来源
+     */
+    private String XTLY;
+    /**
+     * 公司代码
+     */
+    private String GSDM;
+    /**
+     * 驳回状态
+     */
+    private String BHZT;
+    /**
+     * 员工姓名
+     */
+    private String YGXM;
+    /**
+     * 开票凭证号
+     */
+    private String KPPZH;
+    /**
+     * 凭证过账日期
+     */
+    private String PZGZRQ;
+    /**
+     * 是否预制发票
+     */
+    private String YZFP;
+    /**
+     * 原始订单号
+     */
+    private String ORIGINDDH;
+    /**
+     * 原始订单ID
+     */
+    private String ORIGINORDERID;
+
     
 }

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

@@ -32,10 +32,7 @@ import com.dxhy.order.consumer.modules.order.service.OrderProcessService;
 import com.dxhy.order.consumer.modules.validate.service.ValidateInterfaceOrderService;
 import com.dxhy.order.consumer.modules.validate.service.ValidateOrderInfoService;
 import com.dxhy.order.consumer.openapi.protocol.v4.checklimit.RedisCheckLimit;
-import com.dxhy.order.consumer.openapi.protocol.v4.order.DdkzxxBO;
-import com.dxhy.order.consumer.openapi.protocol.v4.order.DdpcxxReqBO;
-import com.dxhy.order.consumer.openapi.protocol.v4.order.DdpcxxRspBO;
-import com.dxhy.order.consumer.openapi.protocol.v4.order.DdzxxBO;
+import com.dxhy.order.consumer.openapi.protocol.v4.order.*;
 import com.dxhy.order.consumer.openapi.service.AllocateInvoiceInterfaceServiceV3;
 import com.dxhy.order.consumer.openapi.service.CommonInterfaceService;
 import com.dxhy.order.consumer.utils.BeanTransitionUtils;
@@ -845,6 +842,29 @@ public class AllocateInvoiceInterfaceServiceImplV3 implements AllocateInvoiceInt
                     }
                 }
             }
+            //入库前 山能定制化新增字段赋值
+            DdtxxBO ddtxx = ddpcxxReq.getDDZXX().get(0).getDDTXX();
+            List<DdmxxxBO> ddmxxx = ddpcxxReq.getDDZXX().get(0).getDDMXXX();
+
+            for(OrderProcessInfo processInfo:insertProcessInfo){
+                processInfo.setBzdh(ddtxx.getBZDH());
+                processInfo.setXtly(ddtxx.getXTLY());
+                processInfo.setGsdm(ddtxx.getGSDM());
+                processInfo.setBhzt(ddtxx.getBHZT());
+                processInfo.setYgxm(ddtxx.getYGXM());
+                processInfo.setKppzh(ddtxx.getKPPZH());
+                processInfo.setPzgzrq(DateUtil.parse(ddtxx.getPZGZRQ(),"yyyy-MM-dd"));
+                processInfo.setYzfp(ddtxx.getYZFP());
+                processInfo.setOriginDdh(ddtxx.getDDH());
+                processInfo.setOriginOrderId(processInfo.getOrderInfoId());
+            }
+            for(OrderItemInfo itemInfo:insertOrderItem.get(0)){
+                itemInfo.setPh(ddmxxx.get(0).getPH());
+                itemInfo.setKb(ddmxxx.get(0).getKB());
+                //TODO lfl 这两在哪赋值？
+                itemInfo.setZnfm("");
+                itemInfo.setTswl("");
+            }
 
             /*
              * 手动导入判断

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

@@ -3464,14 +3464,14 @@ public class BeanTransitionUtils {
             FpkjReqSap req = JsonUtils.getInstance().parseObject(zdataString, FpkjReqSap.class);
             //批次信息
             ddpcxxBO.setDDQQPCH(isinput.getSAPKEY());
-            ddpcxxBO.setNSRSBH(deptEntity.getTaxpayerCode());
+            ddpcxxBO.setNSRSBH(deptEntity.getInvoiceNsrsbh());
             ddpcxxBO.setFPLXDM(CommonUtils.transSnFplxdm(req.getZFPLX()));
             ddpcxxBO.setKPFS(ConfigureConstant.STRING_1);
             //订单头信息
             ddtxxBO.setDDQQLSH(isinput.getSAPKEY());
             ddtxxBO.setKPLX(req.getZSFHZ());
-            ddtxxBO.setXHFSBH(deptEntity.getTaxpayerCode());
-            ddtxxBO.setXHFMC(deptEntity.getName());
+            ddtxxBO.setXHFSBH(deptEntity.getInvoiceNsrsbh());
+            ddtxxBO.setXHFMC(deptEntity.getInvoiceName());
             ddtxxBO.setXHFDZ(deptEntity.getTaxpayerAddress());
             ddtxxBO.setXHFDH(deptEntity.getTaxpayerPhone());
             ddtxxBO.setXHFYH(deptEntity.getTaxpayerBank());
@@ -3484,6 +3484,15 @@ public class BeanTransitionUtils {
             ddtxxBO.setHJJE(req.getZBHSJE());
             ddtxxBO.setHJSE(req.getZZSE());
             ddtxxBO.setDDH(req.getZJSDH());
+            ddtxxBO.setBZDH(req.getZBZDH());
+            ddtxxBO.setXTLY(req.getZSJLY());
+            ddtxxBO.setGSDM(req.getBUKRS());
+            ddtxxBO.setBHZT(ConfigureConstant.STRING_0);
+            ddtxxBO.setYGXM(req.getPENAM());
+            ddtxxBO.setKPPZH(req.getZKPPZH());
+            ddtxxBO.setPZGZRQ(req.getZGZRQ());
+            ddtxxBO.setYZFP(ConfigureConstant.STRING_0);
+            ddtxxBO.setORIGINDDH(req.getZJSDH());
             //TODO lfl 清单标志怎么处理？
             ddtxxBO.setQDBZ("0");
             //明细信息
@@ -3511,6 +3520,8 @@ public class BeanTransitionUtils {
                 ddmxxxBO.setJE(detail.getZHSJE());
                 ddmxxxBO.setHSBZ(ConfigureConstant.STRING_1);
                 ddmxxxBO.setSE(detail.getZZSE());
+                ddmxxxBO.setPH(detail.getCHARG());
+                ddmxxxBO.setKB(detail.getKTYPE());
                 //TODO lfl 优惠政策标识 取税编对应的优惠政策标识!
                 ddmxxxBO.setYHZCBS("0");
                 ddmxList.add(ddmxxxBO);