调整mt2mx pacs008的71域的逻辑顺序

swiftCore/src/main/java/com/brilliance/swift/mt2mx/pacs008001/impl/Pacs00801Parse71Field.java

@@ -45,16 +45,6 @@ public class Pacs00801Parse71Field extends AbstractMt2MxPacs008001ParseField {
                 cdtTrfTxInfMaps.put("chrgBr", chargeForEnum.value());
             }
         }
-        if (field71G != null) {
-            String ccy = field71G.getCurrency();
-            BigDecimal amt = field71G.amount();
-            Map<String, Object> chrgsInfMaps = new HashMap<String, Object>();
-            MapUtil.adds(cdtTrfTxInfMaps, "chrgsInf", chrgsInfMaps);
-            MapUtil.puts(chrgsInfMaps, "amt/value", amt);
-            MapUtil.puts(chrgsInfMaps, "amt/ccy", ccy);
-            String receiverBic = (String) context.get(Mt2MxContextIdentifier.MT_RECEIVE_BIC, true);
-            MapUtil.puts(chrgsInfMaps, "agt/finInstnId/bicfi", receiverBic);
-        }
         Tag[] tags = abstractMT.getSwiftMessage().getBlock4().getTagsByName(NAME_F);
         if (tags != null && tags.length > 0) {
             JSONArray jsonArray = new JSONArray();
@@ -71,5 +61,15 @@ public class Pacs00801Parse71Field extends AbstractMt2MxPacs008001ParseField {
                 MapUtil.adds(chrgsInfMaps, "agt/finInstnId/pstlAdr/adrLine", Mx2MtConstants.MX_TO_MT_DEFAULT_VALUE);
             }
         }
+        if (field71G != null) {
+            String ccy = field71G.getCurrency();
+            BigDecimal amt = field71G.amount();
+            Map<String, Object> chrgsInfMaps = new HashMap<String, Object>();
+            MapUtil.adds(cdtTrfTxInfMaps, "chrgsInf", chrgsInfMaps);
+            MapUtil.puts(chrgsInfMaps, "amt/value", amt);
+            MapUtil.puts(chrgsInfMaps, "amt/ccy", ccy);
+            String receiverBic = (String) context.get(Mt2MxContextIdentifier.MT_RECEIVE_BIC, true);
+            MapUtil.puts(chrgsInfMaps, "agt/finInstnId/bicfi", receiverBic);
+        }
     }
 }