1

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

@@ -67,9 +67,14 @@ public class InvoiceRestSDEnregy {
         List<GmfxxtbReqBO> gmfxxtbReqList = new ArrayList<>();
         for (MdmGmfxxtbReqBO tempMdmGmfxxtbReqBO : mdmGmfxxtbReqBOS) {
             GmfxxtbReqBO gmfxxtbReqBO = new GmfxxtbReqBO();
+            // 处理客户信息
             gmfxxtbReqBO.setGMFBM(tempMdmGmfxxtbReqBO.getCODE()); // 取code
-            gmfxxtbReqBO.setXHFSBH(tempMdmGmfxxtbReqBO.getDESC14());
+            gmfxxtbReqBO.setGMFMC(tempMdmGmfxxtbReqBO.getDESC1());
-            gmfxxtbReqBO.setXHFMC(tempMdmGmfxxtbReqBO.getDESC1());
+            gmfxxtbReqBO.setGMFSBH(tempMdmGmfxxtbReqBO.getDESC14());
+            gmfxxtbReqBO.setGMFDH(tempMdmGmfxxtbReqBO.getDESC26());
+
+            // gmfxxtbReqBO.setXHFSBH(tempMdmGmfxxtbReqBO.getDESC14());
+            // gmfxxtbReqBO.setXHFMC(tempMdmGmfxxtbReqBO.getDESC1());
 
             // 判断下DESC14是否为身份证，如果为身份证，则填写03，否则填写01，其余情况置空
             // 身份证正则表达式
@@ -86,9 +91,10 @@ public class InvoiceRestSDEnregy {
                 }
             }
 
-            gmfxxtbReqBO.setGMFMC(tempMdmGmfxxtbReqBO.getDESC48());
+            String invoiceName = StringUtils.isNotEmpty(tempMdmGmfxxtbReqBO.getDESC48()) ? tempMdmGmfxxtbReqBO.getDESC48() : tempMdmGmfxxtbReqBO.getDESC1();
-            gmfxxtbReqBO.setGMFSBH(tempMdmGmfxxtbReqBO.getDESC49());
+            gmfxxtbReqBO.setINVOICE_NAME(invoiceName);
-            gmfxxtbReqBO.setGMFDH(tempMdmGmfxxtbReqBO.getDESC26()); // ?
+            String invoiceTaxno = StringUtils.isNotEmpty(tempMdmGmfxxtbReqBO.getDESC49()) ? tempMdmGmfxxtbReqBO.getDESC49() : tempMdmGmfxxtbReqBO.getDESC14();
+            gmfxxtbReqBO.setINVOICE_TAXNO(invoiceTaxno);
             // 根据要求，取VALUELIST中的第一组数据作为银行数据
             if (tempMdmGmfxxtbReqBO.getMULTICODE() != null && !CollectionUtils.isEmpty(tempMdmGmfxxtbReqBO.getMULTICODE().getVALUELIST())) {
                 // 处理开户行银行