feature 1.对接电商

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

@@ -29,6 +29,7 @@ public class ConfigureConstant {
     public static final String STRING_1_ = "-1";
 
     public static final String STRING_0 = "0";
+    public static final String STRING_X = "X";
 
     public static final String STRING_000 = "0.00";
 

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

@@ -403,6 +403,7 @@ public enum OrderInfoEnum {
      * 系统来源(SAP:SAP)
      */
     SYS_SOURCE_SAP("SAP","SAP"),
+    SYS_SOURCE_DSXT("DSXT","DSXT"),
 
     /**
      * 订单类型（0:原始订单,1:拆分后订单,2:合并后订单,3:系统冲红订单,4:自动开票订单,5:作废重开订单;6:历史数据订单;7:发票修复数据）

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

@@ -1344,6 +1344,8 @@ public class PushInvoiceServiceImpl implements PushInvoiceService {
                 fpkjtsReqSap.setZGSDM(orderProcessInfo.getGsdm());
                 fpkjtsReqSap.setZYWDJ(orderProcessInfo.getBzdh());
                 fpkjtsReqSap.setIMGID(orderInvoiceInfo.getDocuId());
+                fpkjtsReqSap.setPDFZJL(ddfpxx.getPDFZJL());
+                fpkjtsReqSap.setZJLLX(ddfpxx.getZJLLX());
                 //明细信息
                 ddmxxx.stream().forEach(f -> {
                     FpkjtsMxSap detail = new FpkjtsMxSap();

order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/protocol/po/generateinvoice/sap/FpkjReqSap.java

@@ -1,6 +1,5 @@
 package com.dxhy.order.consumer.openapi.protocol.po.generateinvoice.sap;
 
-import com.dxhy.order.consumer.openapi.protocol.po.PoCommonRequestParam;
 import lombok.Data;
 
 import java.util.List;
@@ -88,6 +87,20 @@ public class FpkjReqSap {
      * 行项目结构
      */
     private List<FpkjMxSap> ITITEM;
-
-
+    //是否为电商系统数据
+    private String ZDSXT;
+    //是否独立开票抬头
+    private String ZDLKPTT;
+    //金税开票抬头名称
+    private String ZKPTTMC;
+    //金税开票纳税人识别号
+    private String ZKPSBH;
+    //金税开票地址
+    private String ZKPDZ;
+    //金税开票电话
+    private String ZKPDH;
+    //金税开票开户行
+    private String ZKPKHH;
+    //金税开票银行账号
+    private String ZKPZH;
 }

order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/protocol/po/generateinvoicepush/sap/FpkjtsReqSap.java

@@ -1,7 +1,6 @@
 package com.dxhy.order.consumer.openapi.protocol.po.generateinvoicepush.sap;
 
 import com.alibaba.fastjson.annotation.JSONField;
-import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
 
 import java.util.List;
@@ -273,4 +272,14 @@ public class FpkjtsReqSap {
      */
     @JSONField(name = "IT_ITEM")
     private List<FpkjtsMxSap> ITITEM;
+
+    /**
+     * pdf流
+     */
+    private String PDFZJL;
+
+    /**
+     * 字节流类型针对pdfzjl进行处理,OFD和PDF
+     */
+    private String ZJLLX;
 }

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

@@ -51,12 +51,14 @@ import com.dxhy.order.model.sk.hp.*;
 import com.dxhy.order.model.sk.kp.*;
 import com.dxhy.order.model.sk.query.ResponseCommonInvoice;
 import com.dxhy.order.model.sk.sld.SearchSld;
-import com.dxhy.order.utils.*;
+import com.dxhy.order.utils.CommonUtils;
+import com.dxhy.order.utils.DecimalCalculateUtil;
+import com.dxhy.order.utils.JsonUtils;
+import com.dxhy.order.utils.StringUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 
-import java.io.IOException;
 import java.math.BigDecimal;
 import java.text.DecimalFormat;
 import java.util.*;
@@ -3504,6 +3506,20 @@ public class BeanTransitionUtils {
             ddtxxBO.setDDH(req.getZJSDH());
             ddtxxBO.setBZDH(req.getZBZDH());
             ddtxxBO.setXTLY(isinput.getSYSID());
+            //如果为X,表示数据来自电商系统，开票完成后需要推送给电商系统开票数据及板式文件。
+//            if(StringUtils.isNotBlank(req.getZDSXT()) && ConfigureConstant.STRING_X.equals(req.getZDSXT())){
+//                ddtxxBO.setXTLY(OrderInfoEnum.SYS_SOURCE_DSXT.getKey());
+//            }
+            //如果此字段为X，表示开票抬头数据不取购方ZGFBH关联的信息，而是取21-26列数据。
+            if(StringUtils.isNotBlank(req.getZDLKPTT()) && ConfigureConstant.STRING_X.equals(req.getZDLKPTT())){
+                ddtxxBO.setGMFMC(req.getZKPTTMC());
+                ddtxxBO.setGMFSBH(req.getZKPSBH());
+                ddtxxBO.setGMFDH(req.getZKPDH());
+                ddtxxBO.setGMFDZ(req.getZKPDZ());
+                ddtxxBO.setGMFYH(req.getZKPKHH());
+                ddtxxBO.setGMFZH(req.getZKPZH());
+                ddtxxBO.setGMFBM("");
+            }
             ddtxxBO.setGSDM(req.getBUKRS());
             ddtxxBO.setENTID(deptEntity.getDeptId());
             ddtxxBO.setBHZT(ConfigureConstant.STRING_0);