金蝶对接pt4

zhangmeiyang
1 parent ade50705
Showing 11 changed files with 166 additions and 41 deletions
etrade-thirdparty/src/main/java/com/diligrp/etrade/thirdparty/component/TransferComponent.java
etrade-thirdparty/src/main/java/com/diligrp/etrade/thirdparty/demarcate/AbstractBillHandler.java
etrade-thirdparty/src/main/java/com/diligrp/etrade/thirdparty/domain/dto/BusinessDto.java
etrade-thirdparty/src/main/java/com/diligrp/etrade/thirdparty/handler/business/EntranceFeeBillHandler.java
etrade-thirdparty/src/main/java/com/diligrp/etrade/thirdparty/handler/business/SettleBillHandler.java
etrade-thirdparty/src/main/java/com/diligrp/etrade/thirdparty/handler/business/WeighingBillHandler.java
etrade-thirdparty/src/main/java/com/diligrp/etrade/thirdparty/mapper/TransMapper.java
etrade-thirdparty/src/main/java/com/diligrp/etrade/thirdparty/type/OperateType.java
etrade-thirdparty/src/main/java/com/diligrp/etrade/thirdparty/type/SyncType.java
etrade-thirdparty/src/main/java/com/diligrp/etrade/thirdparty/utils/BillTypeApiUtils.java
etrade-thirdparty/src/main/resources/com/diligrp/etrade/thirdparty/mapper/TransMapper.xml
@@ -13,7 +13,6 @@ import org.springframework.util.ObjectUtils;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
-import java.util.Objects;
 /**
  * Transfer Component （传输组件）
@@ -38,7 +37,7 @@ public class TransferComponent {
      * @param systemCode 系统代码
      */
     public void transBaseCo(BaseBillCo co, Long marketId, String systemCode) {
-        co.setF_PZCW_Text(Objects.requireNonNull(OperateType.getOperateType(Integer.parseInt(co.getF_PZCW_Text()))).getName());
+        co.setF_PZCW_Text(OperateType.getOperateType(Integer.parseInt(co.getF_PZCW_Text())).getName());
         co.setFDATE(LocalDateTime.now().format(DateTimeFormatter.ofPattern(Constants.DATE_TIME_FORMAT)));
         co.setFCURRENCYID(new FCURRENCYID());
         co.setFMAINBOOKSTDCURRID(new FMAINBOOKSTDCURRID());
@@ -4,13 +4,11 @@ import com.diligrp.etrade.core.util.JsonUtils;
 import com.diligrp.etrade.thirdparty.component.TransferComponent;
 import com.diligrp.etrade.thirdparty.domain.co.business.BaseBillCo;
 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.domain.model.FEntityDetail;
 import com.diligrp.etrade.thirdparty.mapper.TransMapper;
-import com.diligrp.etrade.thirdparty.type.BasicEnum;
-import com.diligrp.etrade.thirdparty.type.BusinessEnum;
-import com.diligrp.etrade.thirdparty.type.DynamicType;
-import com.diligrp.etrade.thirdparty.type.SelectType;
+import com.diligrp.etrade.thirdparty.type.*;
 import com.diligrp.etrade.thirdparty.utils.PurchaseOrderApiUtils;
 import com.kingdee.bos.webapi.entity.IdentifyInfo;
 import jakarta.annotation.Resource;
@@ -20,6 +18,7 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 /**
  * 抽象业务处理程序
@@ -83,6 +82,38 @@ public abstract class AbstractBillHandler&lt;T extends BaseBillCo&gt; implements TypeM
         t.getFSettleTypeID().setFNumber(data.getItemValue());
     }
+    /**
+     * Transfer Dynamic Charge 项目
+     *
+     * @param data   数据
+     * @param entity 实体
+     */
+    protected static <T extends BaseBillCo> void transferDynamicChargeItem(T entity, List<BusinessDetailDto> data) {
+        Map<String, String> relationMap = new HashMap<>();
+        Map<String, String> codeMap = new HashMap<>();
+        for (BusinessDetailDto dto : data) {
+            if (!ObjectUtils.isEmpty(dto.getItemRelationId())) {
+                relationMap.put(String.valueOf(dto.getItemRelationId()), dto.getItemValue());
+            }
+            if (!ObjectUtils.isEmpty(dto.getItemCode())) {
+                codeMap.put(dto.getItemCode(), dto.getItemValue());
+            }
+        }
+        List<FEntityDetail> fEntityDetail = entity.getFEntityDetail().stream().filter(f -> ObjectUtils.isEmpty(f.getFCOSTID())).toList();
+        fEntityDetail.forEach(e -> {
+            var costId = e.getFASSETID().getFNUMBER();
+            if (relationMap.containsKey(costId)) {
+                e.getFCOSTID().setFNUMBER(relationMap.get(costId));
+            } else if (codeMap.containsKey(costId)) {
+                e.getFCOSTID().setFNUMBER(relationMap.get(costId));
+            }
+        });
+    }
+
+    protected <T extends BaseBillCo> List<T> validDataSync(List<T> ts, Long marketId, String systemCode) {
+        return ts.stream().filter(t -> !isSync(marketId, systemCode, DynamicType.fromCode(t.getSystemDynamicCode()))).collect(Collectors.toList());
+    }
+
     /**
      * 固定转换
@@ -106,34 +137,22 @@ public abstract class AbstractBillHandler&lt;T extends BaseBillCo&gt; implements TypeM
     }
     /**
-     * Transfer Dynamic Charge 项目
      *
-     * @param data   数据
-     * @param entity 实体
+     * 是否同步
+     *
+     * @param marketId   市场 ID
+     * @param systemCode 系统代码
+     * @return boolean
      */
-    protected static <T extends BaseBillCo> void transferDynamicChargeItem(T entity, List<BusinessDetailDto> data) {
-        Map<String,String> relationMap = new HashMap<>();
-        Map<String,String> codeMap = new HashMap<>();
-        for (BusinessDetailDto dto : data) {
-            if (!ObjectUtils.isEmpty(dto.getItemRelationId())){
-                relationMap.put(String.valueOf(dto.getItemRelationId()), dto.getItemValue());
-            }
-            if (!ObjectUtils.isEmpty(dto.getItemCode())){
-                codeMap.put(dto.getItemCode(), dto.getItemValue());
-            }
+    protected boolean isSync(Long marketId, String systemCode, DynamicType dynamicType) {
+        BusinessDto businessConfig = transMapper.getBusinessConfig(systemCode, marketId, dynamicType.code);
+        if (ObjectUtils.isEmpty(businessConfig)) {
+            return false;
         }
-        List<FEntityDetail> fEntityDetail = entity.getFEntityDetail().stream().filter(f -> ObjectUtils.isEmpty(f.getFCOSTID())).toList();
-        fEntityDetail.forEach(e->{
-            var costId = e.getFASSETID().getFNUMBER();
-            if (relationMap.containsKey(costId)){
-                e.getFCOSTID().setFNUMBER(relationMap.get(costId));
-            }else if (codeMap.containsKey(costId)){
-                e.getFCOSTID().setFNUMBER(relationMap.get(costId));
-            }
-        });
+        return ObjectUtils.nullSafeEquals(businessConfig.getSyncType(), SyncType.SYNC.code);
     }
-    protected void transferDataList(List<T> ts, Long marketId, String systemCode){
+    protected void transferDataList(List<T> ts, Long marketId, String systemCode) {
         ts.forEach(e -> {
             DynamicType dynamicType = DynamicType.fromCode(e.getSystemDynamicCode());
             transfer(e, marketId, systemCode);
@@ -157,7 +176,7 @@ public abstract class AbstractBillHandler&lt;T extends BaseBillCo&gt; implements TypeM
                 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(systemCode, dynamicType.code, marketId, SelectType.FIXED.getCode(), queryArrays);
         Map<String, BusinessDetailDto> map = new HashMap<>();
         dynamicParam.forEach(e -> map.computeIfAbsent(e.getCode(), k -> e));
         return map;
@@ -173,7 +192,7 @@ public abstract class AbstractBillHandler&lt;T extends BaseBillCo&gt; implements TypeM
      */
     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(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));
         return map;
@@ -187,7 +206,7 @@ public abstract class AbstractBillHandler&lt;T extends BaseBillCo&gt; implements TypeM
      * @param ts         茨
      * @throws Exception 例外
      */
-    protected void sendPurchaseOrder(List<T> ts,Long marketId, String systemCode) throws Exception {
+    protected void sendPurchaseOrder(List<T> ts, Long marketId, String systemCode) throws Exception {
         var identifyInfo = new IdentifyInfo();
         ClientDto clientParam = transMapper.getClientParam(systemCode, marketId);
         identifyInfo.setAppId(clientParam.getApplyId());
+package com.diligrp.etrade.thirdparty.domain.dto;
+
+/**
+ * @Author: zhangmeiyang
+ * @CreateTime: 2024-10-31 10:32
+ * @Version: todo
+ */
+public class BusinessDto {
+    private Long id;
+    private Long marketId;
+    private String systemCode;
+    private String code;
+    private String name;
+    private String syncType;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Long getMarketId() {
+        return marketId;
+    }
+
+    public void setMarketId(Long marketId) {
+        this.marketId = marketId;
+    }
+
+    public String getSystemCode() {
+        return systemCode;
+    }
+
+    public void setSystemCode(String systemCode) {
+        this.systemCode = systemCode;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getSyncType() {
+        return syncType;
+    }
+
+    public void setSyncType(String syncType) {
+        this.syncType = syncType;
+    }
+}
@@ -18,9 +18,10 @@ import java.util.List;
 public class EntranceFeeBillHandler extends AbstractBillHandler<EntranceFeeBillCo> {
     @Override
     public void handle(String json, Long marketId, String systemCode) throws Exception{
-        List<EntranceFeeBillCo> entranceFeeBillCos = JsonUtils.fromJsonString(json, new TypeReference<>() {});
-        transferDataList(entranceFeeBillCos, marketId, systemCode);
-        sendPurchaseOrder(entranceFeeBillCos, marketId, systemCode);
+        List<EntranceFeeBillCo> origin = JsonUtils.fromJsonString(json, new TypeReference<>() {});
+        List<EntranceFeeBillCo> ts = validDataSync(origin, marketId, systemCode);
+        transferDataList(ts, marketId, systemCode);
+        sendPurchaseOrder(ts, marketId, systemCode);
     }
     @Override
@@ -21,7 +21,7 @@ public class SettleBillHandler extends AbstractBillHandler&lt;SettleBillCo&gt; {
     public void handle(String json, Long marketId, String systemCode) throws Exception {
         List<SettleBillCo> settleBillCos = JsonUtils.fromJsonString(json, new TypeReference<>() {});
         transferDataList(settleBillCos, marketId, systemCode);
-        super.sendPurchaseOrder(settleBillCos,marketId, systemCode);
+        sendPurchaseOrder(settleBillCos,marketId, systemCode);
     }
     @Override
@@ -18,9 +18,10 @@ import java.util.List;
 public class WeighingBillHandler extends AbstractBillHandler<WeighingBillCo> {
     @Override
     public void handle(String json, Long marketId, String systemCode) throws Exception {
-        List<WeighingBillCo> weighingBillCos = JsonUtils.fromJsonString(json, new TypeReference<>() {});
-        transferDataList(weighingBillCos, marketId, systemCode);
-        sendPurchaseOrder(weighingBillCos, marketId, systemCode);
+        List<WeighingBillCo> origin = JsonUtils.fromJsonString(json, new TypeReference<>() {});
+        List<WeighingBillCo> ts = validDataSync(origin, marketId, systemCode);
+        transferDataList(ts, marketId, systemCode);
+        sendPurchaseOrder(ts, marketId, systemCode);
     }
     @Override
@@ -58,6 +58,16 @@ public interface TransMapper extends MybatisMapperSupport {
     @DataSource(DataSourceConstants.DS_KEY_SLAVE)
     BaseConfigDto getBaseConfig(@Param("systemCode") String systemCode, @Param("marketId") Long marketId);
+    /**
+     * 获取基本配置
+     *
+     * @param systemCode 系统代码
+     * @param marketId   市场 ID
+     * @return {@link BaseConfigDto}
+     */
+    @DataSource(DataSourceConstants.DS_KEY_SLAVE)
+    BusinessDto getBusinessConfig(@Param("systemCode") String systemCode, @Param("marketId") Long marketId,@Param("dynamicType")String dynamicType);
+
     /**
      * 获取客户
 package com.diligrp.etrade.thirdparty.type;
+import com.diligrp.etrade.thirdparty.error.ThirdPartyException;
+
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -154,7 +156,7 @@ public enum OperateType {
                 return type;
             }
         }
-        return null;
+        throw new ThirdPartyException("错误的操作类型");
     }
     public static String getName(int code) {
+package com.diligrp.etrade.thirdparty.type;
+
+public enum SyncType  {
+    SYNC("1","打开同步"),
+    CLOSE("0","关闭");
+
+    public final String code;
+    public final String name;
+
+    SyncType(String code, String name) {
+        this.code = code;
+        this.name = name;
+    }
+}
@@ -37,7 +37,7 @@ public class BillTypeApiUtils extends BaseApiUtils {
         });
         var message = new GeneralSendMessage();
         message.setModel(map);
-        message.setAutoSubmitAndAudit(true);
+//        message.setAutoSubmitAndAudit(true);
         return save(JsonUtils.toJsonString(message));
     }
@@ -115,4 +115,20 @@
           AND system_code = #{systemCode}
           AND dict_code = #{billTypeId}
     </select>
+    <select id="getBusinessConfig" resultType="com.diligrp.etrade.thirdparty.domain.dto.BusinessDto">
+        SELECT
+            id          AS id
+          , market_id   AS marketId
+          , `code`      AS code
+          , system_code AS systemCode
+          , `name`      AS name
+          , sync_type   AS syncType
+        FROM
+            `dili-basic-data`.financial_business
+        WHERE
+              1 = 1
+          AND market_id = #{marketId}
+          AND system_code = #{systemCode}
+          AND `code` = #{dynamicType}
+    </select>
 </mapper>