金蝶对接pt5

zhangmeiyang
1 parent 68a05c10
Showing 2 changed files with 23 additions and 4 deletions
etrade-thirdparty/src/main/java/com/diligrp/etrade/thirdparty/demarcate/AbstractBillHandler.java
etrade-thirdparty/src/main/java/com/diligrp/etrade/thirdparty/type/DynamicType.java
@@ -178,7 +178,9 @@ public abstract class AbstractBillHandler&lt;T extends BaseBillCo&gt; implements TypeM
         };
         var dynamicParam = transMapper.getFixedWithQueryArrays(systemCode, dynamicType.code, marketId, SelectType.FIXED.getCode(), queryArrays);
         Map<String, BusinessDetailDto> map = new HashMap<>();
-        dynamicParam.forEach(e -> map.computeIfAbsent(e.getCode(), k -> e));
+        if (!ObjectUtils.isEmpty(dynamicParam)){
+            dynamicParam.forEach(e -> map.computeIfAbsent(e.getCode(), k -> e));
+        }
         return map;
     }
@@ -194,7 +196,9 @@ public abstract class AbstractBillHandler&lt;T extends BaseBillCo&gt; implements TypeM
         var queryArrays = new String[]{BasicEnum.CHARGE_ITEM_TO_LOWER.code};
         var dynamicParam = transMapper.getFixedWithQueryArrays(systemCode, dynamicType.code, marketId, SelectType.FIXED.getCode(), queryArrays);
         Map<String, List<BusinessDetailDto>> map = new HashMap<>();
-        dynamicParam.forEach(e -> map.computeIfAbsent(e.getCode(), k -> new ArrayList<>()).add(e));
+        if (!ObjectUtils.isEmpty(dynamicParam)){
+            dynamicParam.forEach(e -> map.computeIfAbsent(e.getCode(), k -> new ArrayList<>()).add(e));
+        }
         return map;
     }
@@ -216,6 +220,7 @@ public abstract class AbstractBillHandler&lt;T extends BaseBillCo&gt; implements TypeM
         identifyInfo.setdCID(clientParam.getDataCentreId());
         var util = new PurchaseOrderApiUtils(identifyInfo);
         for (T e : ts) {
+            var billId = e.getFBillTypeID().getFNUMBER();
             e.getFBillTypeID().setFNUMBER("YSD01_SYS");//TODO TEST
             util.createOnePurchaseOrder(JsonUtils.toJsonString(e), "AR_receivable");
         }
@@ -13,11 +13,25 @@ public enum DynamicType {
     COLD("506"),
     CARD("CARD"),
     ENTIRE_TENANCY("1"),
+    EARNEST("2"),
+    BAIL("3"),
     SUBLET("4"),
     ACCOMMODATION("5"),
-    BAIL("3"),
-    EARNEST("2"),
+    BOUTIQUE_ENTRANCE("6"),
+    PASSPORT("7"),
+    STOCKIN("8"),
+    STOCKOUT("9"),
     OTHER_CHARGES("10"),
+    LABOR_VEST("11"),
+    MESSAGEFEE("14"),
+    WATER("15"),
+    ELECTRICITY("16"),
+    UTILITY_BILLS_PRE_STORAGE("17"),
+    SCALES("18"),
+    ENTRANCE_CARD("301"),
+    ENQUIRY_FEE_ORDER("513"),
+    TRADING_AREA("523"),
+    CARD_METER("525"),
     TRADE("5502"),
     REFUND("5503");
     public final String code;