增加结算收款单

zhangmeiyang
1 parent e4d974f6
Showing 17 changed files with 186 additions and 52 deletions
etrade-thirdparty/src/main/java/com/diligrp/etrade/thirdparty/demarcate/AbstractBillHandler.java
etrade-thirdparty/src/main/java/com/diligrp/etrade/thirdparty/demarcate/AbstractRecHandler.java
etrade-thirdparty/src/main/java/com/diligrp/etrade/thirdparty/demarcate/AbstractRefundHandler.java
etrade-thirdparty/src/main/java/com/diligrp/etrade/thirdparty/domain/co/business/rec/DepositRecCo.java
etrade-thirdparty/src/main/java/com/diligrp/etrade/thirdparty/domain/co/business/rec/RefrigeratorRecCo.java
etrade-thirdparty/src/main/java/com/diligrp/etrade/thirdparty/domain/co/business/rec/SettleRecCo.java
etrade-thirdparty/src/main/java/com/diligrp/etrade/thirdparty/handler/business/rec/CardRecHandler.java
etrade-thirdparty/src/main/java/com/diligrp/etrade/thirdparty/handler/business/rec/DepositRecHandler.java
etrade-thirdparty/src/main/java/com/diligrp/etrade/thirdparty/handler/business/rec/RefrigeratorRecHandler.java
etrade-thirdparty/src/main/java/com/diligrp/etrade/thirdparty/handler/business/rec/SettleRecHandler.java
etrade-thirdparty/src/main/java/com/diligrp/etrade/thirdparty/mapper/TransMapper.java
etrade-thirdparty/src/main/java/com/diligrp/etrade/thirdparty/type/BillType.java
etrade-thirdparty/src/main/java/com/diligrp/etrade/thirdparty/type/BusinessEnum.java
@@ -4,10 +4,7 @@ import com.diligrp.etrade.thirdparty.domain.dto.BusinessDetailDto;
 import com.diligrp.etrade.thirdparty.domain.dto.BusinessDto;
 import com.diligrp.etrade.thirdparty.domain.dto.ClientDto;
 import com.diligrp.etrade.thirdparty.mapper.TransMapper;
-import com.diligrp.etrade.thirdparty.type.BasicEnum;
-import com.diligrp.etrade.thirdparty.type.DynamicType;
-import com.diligrp.etrade.thirdparty.type.SelectType;
-import com.diligrp.etrade.thirdparty.type.SyncType;
+import com.diligrp.etrade.thirdparty.type.*;
 import com.kingdee.bos.webapi.entity.IdentifyInfo;
 import jakarta.annotation.Resource;
 import org.springframework.util.ObjectUtils;
@@ -22,11 +19,14 @@ import java.util.Map;
  * @CreateTime: 2024-11-28 09:18
  * @Version: todo
  */
-public abstract class AbstractBaseBillHandler {
+public abstract class AbstractBaseHandler {
     @Resource
     protected TransMapper transMapper;
+
+    protected abstract BillType getDocumentType();
+
     /**
      * 获取动态数据
      *
@@ -42,7 +42,7 @@ public abstract class AbstractBaseBillHandler {
                 BasicEnum.FINANCIAL_CHANNEL_TYPE_TO_LOWER.code,
                 BasicEnum.FINANCIAL_BUSINESS_TYPE_TO_LOWER.code
         };
-        var dynamicParam = transMapper.getFixedWithQueryArrays(systemCode, dynamicType.code, marketId, SelectType.FIXED.getCode(), queryArrays);
+        var dynamicParam = transMapper.getFixedWithQueryArrays(getDocumentType().sign,systemCode, dynamicType.code, marketId, SelectType.FIXED.getCode(), queryArrays);
         Map<String, BusinessDetailDto> map = new HashMap<>();
         if (!ObjectUtils.isEmpty(dynamicParam)) {
             dynamicParam.forEach(e -> map.computeIfAbsent(e.getCode(), k -> e));
@@ -61,7 +61,7 @@ public abstract class AbstractBaseBillHandler {
      */
     protected Map<String, List<BusinessDetailDto>> getFilteredDynamicDataMulti(DynamicType dynamicType, Long marketId, String systemCode) {
         var queryArrays = new String[]{BasicEnum.CHARGE_ITEM_TO_LOWER.code};
-        var dynamicParam = transMapper.getFixedWithQueryArrays(systemCode, dynamicType.code, marketId, SelectType.FIXED.getCode(), queryArrays);
+        var dynamicParam = transMapper.getFixedWithQueryArrays(getDocumentType().sign,systemCode, dynamicType.code, marketId, SelectType.FIXED.getCode(), queryArrays);
         Map<String, List<BusinessDetailDto>> map = new HashMap<>();
         if (!ObjectUtils.isEmpty(dynamicParam)) {
             dynamicParam.forEach(e -> map.computeIfAbsent(e.getCode(), k -> new ArrayList<>()).add(e));
@@ -86,19 +86,6 @@ public abstract class AbstractBaseBillHandler {
     }
     /**
-     * 获取文档类型
-     *
-     * @param marketId   市场 ID
-     * @param systemCode 系统代码
-     * @param billTypeId 账单类型 ID
-     * @return {@link String}
-     */
-    protected String getDocumentType(Long marketId, String systemCode, String billTypeId) {
-        var res = transMapper.getMappingDict(BasicEnum.FINANCIAL_BUSINESS_TYPE_TO_LOWER.code, systemCode, marketId, billTypeId);
-        return ObjectUtils.isEmpty(res) ? null : res.getMapType();
-    }
-
-    /**
      * 获取身份信息
      *
      * @param marketId   市场 ID
@@ -24,10 +24,7 @@ import java.util.stream.Collectors;
  * @author zhangmeiyang
  * @date 2024/09/26
  */
-public abstract class AbstractBillHandler<T extends BaseBillCo> extends AbstractBaseBillHandler implements Handler {
-
-    @Resource
-    protected BillTrans billTrans;
+public abstract class AbstractBillHandler<T extends BaseBillCo> extends AbstractBaseHandler implements Handler {
     protected static final Map<String, TransferFunctionSingle<BaseBillCo>> TRANSFER_FUNCTION_SINGLE_MAP = new HashMap<>();
     protected static final Map<String, TransferFunctionMulti<BaseBillCo>> TRANSFER_FUNCTION_MULTI_MAP = new HashMap<>();
@@ -45,6 +42,14 @@ public abstract class AbstractBillHandler&lt;T extends BaseBillCo&gt; extends Abstract
         TRANSFER_FUNCTION_MULTI_MAP.put(BasicEnum.CHARGE_ITEM_TO_LOWER.code, CHARGE_ITEM);
     }
+    @Resource
+    protected BillTrans billTrans;
+
+    @Override
+    protected BillType getDocumentType() {
+        return BillType.RECEIVABLES;
+    }
+
     /**
      * 转移动态结算类型
      *
@@ -21,7 +21,7 @@ import java.util.stream.Collectors;
  * @CreateTime: 2024-11-25 12:53
  * @Version: todo
  */
-public abstract class AbstractRecHandler<T extends BaseRecCo> extends AbstractBaseBillHandler implements Handler {
+public abstract class AbstractRecHandler<T extends BaseRecCo> extends AbstractBaseHandler implements Handler {
     protected static final Map<String, TransferFunctionSingle<BaseRecCo>> TRANSFER_FUNCTION_SINGLE_MAP = new HashMap<>();
     protected static final Map<String, TransferFunctionMulti<BaseRecCo>> TRANSFER_FUNCTION_MULTI_MAP = new HashMap<>();
@@ -43,6 +43,11 @@ public abstract class AbstractRecHandler&lt;T extends BaseRecCo&gt; extends AbstractBa
     protected RecTrans recTrans;
+    @Override
+    protected BillType getDocumentType() {
+        return BillType.RECEIPTS;
+    }
+
     /**
      * 转换动态配置部门
      *
@@ -21,7 +21,7 @@ import java.util.stream.Collectors;
  * @CreateTime: 2024-11-28 09:30
  * @Version: todo
  */
-public abstract class AbstractRefundHandler<T extends BaseRefundCo> extends AbstractBaseBillHandler implements Handler {
+public abstract class AbstractRefundHandler<T extends BaseRefundCo> extends AbstractBaseHandler implements Handler {
     protected static final Map<String, TransferFunctionSingle<BaseRefundCo>> TRANSFER_FUNCTION_SINGLE_MAP = new HashMap<>();
     protected static final Map<String, TransferFunctionMulti<BaseRefundCo>> TRANSFER_FUNCTION_MULTI_MAP = new HashMap<>();
@@ -42,6 +42,11 @@ public abstract class AbstractRefundHandler&lt;T extends BaseRefundCo&gt; extends Abst
     @Resource
     protected RefundTrans refundTrans;
+    @Override
+    protected BillType getDocumentType() {
+        return BillType.RECEIPT_AND_REFUND_FORM;
+    }
+
     /**
      * 转换动态配置部门
      *
@@ -5,6 +5,6 @@ package com.diligrp.etrade.thirdparty.domain.co.business.rec;
  * @CreateTime: 2024-11-25 09:35
  * @Version: todo
  */
-public class DepositBillCo extends BaseRecCo {
+public class CardRecCo extends BaseRecCo {
 }
+package com.diligrp.etrade.thirdparty.domain.co.business.rec;
+
+/**
+ * @Author: zhangmeiyang
+ * @CreateTime: 2024-11-29 16:25
+ * @Version: todo
+ */
+public class DepositRecCo extends BaseRecCo{
+}
+package com.diligrp.etrade.thirdparty.domain.co.business.rec;
+
+/**
+ * @Author: zhangmeiyang
+ * @CreateTime: 2024-11-29 16:18
+ * @Version: todo
+ */
+public class RefrigeratorRecCo extends BaseRecCo{
+}
+package com.diligrp.etrade.thirdparty.domain.co.business.rec;
+
+/**
+ * @Author: zhangmeiyang
+ * @CreateTime: 2024-11-29 16:17
+ * @Version: todo
+ */
+public class SettleRecCo extends BaseRecCo{
+}
@@ -5,5 +5,5 @@ package com.diligrp.etrade.thirdparty.domain.co.business.refund;
  * @CreateTime: 2024-11-28 09:13
  * @Version: todo
  */
-public class RefundBillCo extends BaseRefundCo{
+public class CardRefundCo extends BaseRefundCo{
 }
+package com.diligrp.etrade.thirdparty.handler.business.rec;
+
+import com.diligrp.etrade.core.util.JsonUtils;
+import com.diligrp.etrade.thirdparty.demarcate.AbstractRecHandler;
+import com.diligrp.etrade.thirdparty.domain.co.business.rec.CardRecCo;
+import com.diligrp.etrade.thirdparty.type.BusinessEnum;
+import com.fasterxml.jackson.core.type.TypeReference;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * @Author: zhangmeiyang
+ * @CreateTime: 2024-11-25 09:34
+ * @Version: todo
+ */
+@Component
+public class CardRecHandler extends AbstractRecHandler<CardRecCo> {
+
+    @Override
+    public void handle(String json, Long marketId, String systemCode) throws Exception {
+        List<CardRecCo> cardRecCos = JsonUtils.fromJsonString(json, new TypeReference<>() {});
+        transferDataListWithOutFeeItem(cardRecCos, marketId, systemCode);
+        sendPurchaseOrder(cardRecCos, marketId, systemCode);
+    }
+
+    @Override
+    public BusinessEnum getType() {
+        return BusinessEnum.REC_CARD;
+    }
+}
@@ -2,7 +2,7 @@ package com.diligrp.etrade.thirdparty.handler.business.rec;
 import com.diligrp.etrade.core.util.JsonUtils;
 import com.diligrp.etrade.thirdparty.demarcate.AbstractRecHandler;
-import com.diligrp.etrade.thirdparty.domain.co.business.rec.DepositBillCo;
+import com.diligrp.etrade.thirdparty.domain.co.business.rec.DepositRecCo;
 import com.diligrp.etrade.thirdparty.type.BusinessEnum;
 import com.fasterxml.jackson.core.type.TypeReference;
 import org.springframework.stereotype.Component;
@@ -11,21 +11,20 @@ import java.util.List;
 /**
  * @Author: zhangmeiyang
- * @CreateTime: 2024-11-25 09:34
+ * @CreateTime: 2024-11-29 16:30
  * @Version: todo
  */
 @Component
-public class DepositRecHandler extends AbstractRecHandler<DepositBillCo> {
-
+public class DepositRecHandler extends AbstractRecHandler<DepositRecCo> {
     @Override
     public void handle(String json, Long marketId, String systemCode) throws Exception {
-        List<DepositBillCo> depositBillCos = JsonUtils.fromJsonString(json, new TypeReference<>() {});
-        transferDataListWithOutFeeItem(depositBillCos, marketId, systemCode);
-        sendPurchaseOrder(depositBillCos, marketId, systemCode);
+        List<DepositRecCo> depositRecCos = JsonUtils.fromJsonString(json, new TypeReference<>() {});
+        transferDataListWithOutFeeItem(depositRecCos, marketId, systemCode);
+        sendPurchaseOrder(depositRecCos, marketId, systemCode);
     }
     @Override
     public BusinessEnum getType() {
-        return BusinessEnum.REC_DEPOSIT_AND_WITHDRAW;
+        return BusinessEnum.REC_DEPOSIT;
     }
 }
+package com.diligrp.etrade.thirdparty.handler.business.rec;
+
+import com.diligrp.etrade.core.util.JsonUtils;
+import com.diligrp.etrade.thirdparty.demarcate.AbstractRecHandler;
+import com.diligrp.etrade.thirdparty.domain.co.business.rec.RefrigeratorRecCo;
+import com.diligrp.etrade.thirdparty.type.BusinessEnum;
+import com.fasterxml.jackson.core.type.TypeReference;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * @Author: zhangmeiyang
+ * @CreateTime: 2024-11-29 16:30
+ * @Version: todo
+ */
+@Component
+public class RefrigeratorRecHandler extends AbstractRecHandler<RefrigeratorRecCo> {
+    @Override
+    public void handle(String json, Long marketId, String systemCode) throws Exception {
+        List<RefrigeratorRecCo> refrigeratorRecCos = JsonUtils.fromJsonString(json, new TypeReference<>() {});
+        transferDataListWithFeeItem(refrigeratorRecCos, marketId, systemCode);
+        sendPurchaseOrder(refrigeratorRecCos, marketId, systemCode);
+    }
+
+    @Override
+    public BusinessEnum getType() {
+        return BusinessEnum.REC_REFRIGERATOR;
+    }
+}
+package com.diligrp.etrade.thirdparty.handler.business.rec;
+
+import com.diligrp.etrade.core.util.JsonUtils;
+import com.diligrp.etrade.thirdparty.demarcate.AbstractRecHandler;
+import com.diligrp.etrade.thirdparty.domain.co.business.rec.SettleRecCo;
+import com.diligrp.etrade.thirdparty.type.BusinessEnum;
+import com.fasterxml.jackson.core.type.TypeReference;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * @Author: zhangmeiyang
+ * @CreateTime: 2024-11-29 16:30
+ * @Version: todo
+ */
+@Component
+public class SettleRecHandler extends AbstractRecHandler<SettleRecCo> {
+    @Override
+    public void handle(String json, Long marketId, String systemCode) throws Exception {
+        List<SettleRecCo> settleRecCos = JsonUtils.fromJsonString(json, new TypeReference<>() {});
+        transferDataListWithFeeItem(settleRecCos, marketId, systemCode);
+        sendPurchaseOrder(settleRecCos, marketId, systemCode);
+    }
+
+    @Override
+    public BusinessEnum getType() {
+        return BusinessEnum.REC_SETTLE;
+    }
+}
@@ -2,7 +2,7 @@ package com.diligrp.etrade.thirdparty.handler.business.refund;
 import com.diligrp.etrade.core.util.JsonUtils;
 import com.diligrp.etrade.thirdparty.demarcate.AbstractRefundHandler;
-import com.diligrp.etrade.thirdparty.domain.co.business.refund.RefundBillCo;
+import com.diligrp.etrade.thirdparty.domain.co.business.refund.CardRefundCo;
 import com.diligrp.etrade.thirdparty.type.BusinessEnum;
 import com.fasterxml.jackson.core.type.TypeReference;
 import org.springframework.stereotype.Component;
@@ -15,18 +15,18 @@ import java.util.List;
  * @Version: todo
  */
 @Component
-public class PayoutsRefundHandler extends AbstractRefundHandler<RefundBillCo> {
+public class CardRefundHandler extends AbstractRefundHandler<CardRefundCo> {
     private static final String DEFAULT_REASON = "卡务退款";
     @Override
     public void handle(String json, Long marketId, String systemCode) throws Exception {
-        List<RefundBillCo> refundBillCos = JsonUtils.fromJsonString(json, new TypeReference<>() {});
-        refundBillCos.forEach(e->e.getFREFUNDBILLENTRY().forEach(f->f.setFNOTE(DEFAULT_REASON)));
-        transferDataListWithOutFeeItem(refundBillCos, marketId, systemCode);
-        sendPurchaseOrder(refundBillCos, marketId, systemCode);
+        List<CardRefundCo> cardRefundCos = JsonUtils.fromJsonString(json, new TypeReference<>() {});
+        cardRefundCos.forEach(e->e.getFREFUNDBILLENTRY().forEach(f->f.setFNOTE(DEFAULT_REASON)));
+        transferDataListWithOutFeeItem(cardRefundCos, marketId, systemCode);
+        sendPurchaseOrder(cardRefundCos, marketId, systemCode);
     }
     @Override
     public BusinessEnum getType() {
-        return BusinessEnum.REF_PAYOUTS;
+        return BusinessEnum.REF_CARD;
     }
 }
@@ -36,7 +36,7 @@ public interface TransMapper extends MybatisMapperSupport {
      * @return {@link BusinessDetailDto}
      */
     @DataSource(DataSourceConstants.DS_KEY_SLAVE)
-    List<BusinessDetailDto> getFixedWithQueryArrays(@Param("systemCode")String systemCode, @Param("code") String code, @Param("marketId")Long marketId,@Param("selectType") Integer selectType,@Param("basicCodes")String[] basicCodes);
+    List<BusinessDetailDto> getFixedWithQueryArrays(@Param("documentType") String documentType,@Param("systemCode")String systemCode, @Param("code") String code, @Param("marketId")Long marketId,@Param("selectType") Integer selectType,@Param("basicCodes")String[] basicCodes);
     /**
@@ -4,15 +4,17 @@ import com.diligrp.etrade.thirdparty.error.ThirdPartyException;
 public enum BillType {
-    RECEIVABLES("AR_receivable"),
-    RECEIPTS("AR_RECEIVEBILL"),
-    RECEIPT_AND_REFUND_FORM("AR_REFUNDBILL"),
+    RECEIVABLES("AR_receivable","bill"),
+    RECEIPTS("AR_RECEIVEBILL","rec"),
+    RECEIPT_AND_REFUND_FORM("AR_REFUNDBILL","ref"),
     ;
     public final String value;
+    public final String sign;
-    BillType(String value) {
+    BillType(String value,String sign) {
         this.value = value;
+        this.sign = sign;
     }
     public static BillType getBillType(String value) {
@@ -15,9 +15,22 @@ public enum BusinessEnum {
     BILL_BILL("BILL"),
     BILL_DEPOSIT("DEPOSIT"),
     //----------------------------------------------------------------------------------------
-    REC_DEPOSIT_AND_WITHDRAW("DEPOSIT_AND_WITHDRAW"),
+    REC_SETTLE("REC_SETTLE"),
+    REC_ENTRANCE_FEE("REC_ENTRANCE_FEE"),
+    REC_REFRIGERATOR("REC_REFRIGERATOR"),
+    REC_CARD("REC_CARD"),
+    REC_WEIGHING("REC_WEIGHING"),
+    REC_BILL("REC_BILL"),
+    REC_DEPOSIT("REC_DEPOSIT"),
     //----------------------------------------------------------------------------------------
-    REF_PAYOUTS("PAYOUTS");
+    REF_SETTLE("REF_SETTLE"),
+    REF_ENTRANCE_FEE("REF_ENTRANCE_FEE"),
+    REF_REFRIGERATOR("REF_REFRIGERATOR"),
+    REF_CARD("REF_CARD"),
+    REF_WEIGHING("REF_WEIGHING"),
+    REF_BILL("REF_BILL"),
+    REF_DEPOSIT("REF_DEPOSIT"),
+    ;
     public final String code;
     BusinessEnum(String code) {
@@ -25,8 +38,8 @@ public enum BusinessEnum {
     }
     public static BusinessEnum fromCode(String code) {
-        for (BusinessEnum e : values()){
-            if (e.code.equals(code)){
+        for (BusinessEnum e : values()) {
+            if (e.code.equals(code)) {
                 return e;
             }
         }