新增保证金扣减业务

zhangmeiyang
1 parent 51fdd8e1
Showing 3 changed files with 39 additions and 39 deletions
etrade-thirdparty/src/main/java/com/diligrp/etrade/thirdparty/demarcate/AbstractBillHandler.java
etrade-thirdparty/src/main/java/com/diligrp/etrade/thirdparty/domain/model/FEntityDetail.java
etrade-thirdparty/src/main/java/com/diligrp/etrade/thirdparty/handler/business/bill/SettleBillHandler.java
@@ -161,20 +161,22 @@ public abstract class AbstractBillHandler&lt;T extends BaseBillCo&gt; extends Abstract
      * @param systemCode 系统代码
      */
     protected void transferDataListWithFeeItem(List<T> ts, Long marketId, String systemCode) {
-        ts.forEach(e -> {
-            DynamicType dynamicType = DynamicType.fromCode(e.getSystemDynamicCode());
-            billTrans.transBillCo(e, marketId, systemCode);
-            transferPayMethod(e.getFEntityDetail(), marketId, systemCode);
-            billTrans.transFeeItem(e.getFEntityDetail());
-            getFilteredDynamicDataSingle(dynamicType, marketId, systemCode)
-                    .forEach((k, v) ->
-                            TRANSFER_FUNCTION_SINGLE_MAP.get(k).transferDynamic(e, v)
-                    );
-            getFilteredDynamicDataMulti(dynamicType, marketId, systemCode)
-                    .forEach((k, v) ->
-                            TRANSFER_FUNCTION_MULTI_MAP.get(k).transferDynamic(e, v)
-                    );
-        });
+        ts.forEach(e -> transferDataListWithFeeItemSingle(marketId, systemCode, e));
+    }
+
+    protected void transferDataListWithFeeItemSingle(Long marketId, String systemCode, T e) {
+        DynamicType dynamicType = DynamicType.fromCode(e.getSystemDynamicCode());
+        billTrans.transBillCo(e, marketId, systemCode);
+        transferPayMethod(e.getFEntityDetail(), marketId, systemCode);
+        billTrans.transFeeItem(e.getFEntityDetail());
+        getFilteredDynamicDataSingle(dynamicType, marketId, systemCode)
+                .forEach((k, v) ->
+                        TRANSFER_FUNCTION_SINGLE_MAP.get(k).transferDynamic(e, v)
+                );
+        getFilteredDynamicDataMulti(dynamicType, marketId, systemCode)
+                .forEach((k, v) ->
+                        TRANSFER_FUNCTION_MULTI_MAP.get(k).transferDynamic(e, v)
+                );
     }
     /**
@@ -185,19 +187,21 @@ public abstract class AbstractBillHandler&lt;T extends BaseBillCo&gt; extends Abstract
      * @param systemCode 系统代码
      */
     protected void transferDataListWithOutFeeItem(List<T> ts, Long marketId, String systemCode) {
-        ts.forEach(e -> {
-            DynamicType dynamicType = DynamicType.fromCode(e.getSystemDynamicCode());
-            billTrans.transBillCo(e, marketId, systemCode);
-            transferPayMethod(e.getFEntityDetail(), marketId, systemCode);
-            getFilteredDynamicDataSingle(dynamicType, marketId, systemCode)
-                    .forEach((k, v) ->
-                            TRANSFER_FUNCTION_SINGLE_MAP.get(k).transferDynamic(e, v)
-                    );
-            getFilteredDynamicDataMulti(dynamicType, marketId, systemCode)
-                    .forEach((k, v) ->
-                            TRANSFER_FUNCTION_MULTI_MAP.get(k).transferDynamic(e, v)
-                    );
-        });
+        ts.forEach(e -> transferDataListWithOutFeeItemSingle(marketId, systemCode, e));
+    }
+
+    protected void transferDataListWithOutFeeItemSingle(Long marketId, String systemCode, T e) {
+        DynamicType dynamicType = DynamicType.fromCode(e.getSystemDynamicCode());
+        billTrans.transBillCo(e, marketId, systemCode);
+        transferPayMethod(e.getFEntityDetail(), marketId, systemCode);
+        getFilteredDynamicDataSingle(dynamicType, marketId, systemCode)
+                .forEach((k, v) ->
+                        TRANSFER_FUNCTION_SINGLE_MAP.get(k).transferDynamic(e, v)
+                );
+        getFilteredDynamicDataMulti(dynamicType, marketId, systemCode)
+                .forEach((k, v) ->
+                        TRANSFER_FUNCTION_MULTI_MAP.get(k).transferDynamic(e, v)
+                );
     }
     protected void transferPayMethod(List<FEntityDetail> fEntityDetail,Long marketId, String systemCode){
@@ -18,7 +18,6 @@ public class FEntityDetail {
     private BigDecimal FNoTaxAmountFor_D;
     private FSettleTypeID FSettleTypeID;
     private FCOSTDEPARTMENTID FCOSTDEPARTMENTID;
-    private String systemBackUp;
     @JsonProperty("FCOSTID")
     public FCOSTID getFCOSTID() {
@@ -91,13 +90,4 @@ public class FEntityDetail {
     public void setFCOSTDEPARTMENTID(FCOSTDEPARTMENTID FCOSTDEPARTMENTID) {
         this.FCOSTDEPARTMENTID = FCOSTDEPARTMENTID;
     }
-
-    @JsonProperty("systemBackUp")
-    public String getSystemBackUp() {
-        return systemBackUp;
-    }
-
-    public void setSystemBackUp(String systemBackUp) {
-        this.systemBackUp = systemBackUp;
-    }
 }
@@ -4,10 +4,12 @@ import com.diligrp.etrade.core.util.JsonUtils;
 import com.diligrp.etrade.thirdparty.demarcate.AbstractBillHandler;
 import com.diligrp.etrade.thirdparty.domain.co.business.bill.SettleBillCo;
 import com.diligrp.etrade.thirdparty.type.BusinessEnum;
+import com.diligrp.etrade.thirdparty.type.DynamicType;
 import com.fasterxml.jackson.core.type.TypeReference;
 import org.springframework.stereotype.Component;
 import java.util.List;
+import java.util.Optional;
 /**
  * @Author: zhangmeiyang
@@ -20,8 +22,12 @@ public class SettleBillHandler extends AbstractBillHandler&lt;SettleBillCo&gt; {
     @Override
     public void handle(String json, Long marketId, String systemCode) throws Exception {
         List<SettleBillCo> settleBillCos = JsonUtils.fromJsonString(json, new TypeReference<>() {});
-        transferDataListWithFeeItem(settleBillCos, marketId, systemCode);
-        sendPurchaseOrder(settleBillCos,marketId, systemCode);
+        settleBillCos.forEach(e ->
+                Optional.of(e).filter(x -> DynamicType.BAIL.code.equals(x.getSystemDynamicCode()))
+                .ifPresentOrElse(
+                        x -> transferDataListWithOutFeeItemSingle(marketId, systemCode, x),
+                        () -> transferDataListWithFeeItemSingle(marketId, systemCode, e)));
+        sendPurchaseOrder(settleBillCos, marketId, systemCode);
     }
     @Override