金蝶问题修复

zhangmeiyang
1 parent 3c96df78
Showing 7 changed files with 107 additions and 13 deletions
etrade-thirdparty/src/main/java/com/diligrp/etrade/thirdparty/component/TransferComponent.java
etrade-thirdparty/src/main/java/com/diligrp/etrade/thirdparty/demarcate/AbstractBasicHandler.java
etrade-thirdparty/src/main/java/com/diligrp/etrade/thirdparty/demarcate/AbstractBillHandler.java
etrade-thirdparty/src/main/java/com/diligrp/etrade/thirdparty/domain/co/business/BaseBillCo.java
etrade-thirdparty/src/main/java/com/diligrp/etrade/thirdparty/domain/dto/BaseConfigDto.java
etrade-thirdparty/src/main/java/com/diligrp/etrade/thirdparty/domain/model/FCOSTDEPARTMENTID.java
etrade-thirdparty/src/main/java/com/diligrp/etrade/thirdparty/handler/basic/CustomerBasicHandler.java
@@ -55,12 +55,17 @@ public class TransferComponent {
         if (!ObjectUtils.isEmpty(co.getFCUSTOMERID())) {
             this.transCustomer(co.getFCUSTOMERID());
         }
-        if (!ObjectUtils.isEmpty(co.getFSALEDEPTID())) {
-            this.transDepId(co.getFSALEDEPTID());
-        }
         if (!ObjectUtils.isEmpty(co.getFTRANSFERID())) {
             this.transTransferId(co.getFTRANSFERID());
         }
+        if (!ObjectUtils.isEmpty(co.getFSALEDEPTID())) {
+            var fNumber = this.transDepId(co.getFSALEDEPTID());
+            if (!ObjectUtils.isEmpty(fNumber)){
+                FCOSTDEPARTMENTID fCOSTDEPARTMENTID = new FCOSTDEPARTMENTID();
+                fCOSTDEPARTMENTID.setFNUMBER(fNumber);
+                co.setFCOSTDEPARTMENTID(fCOSTDEPARTMENTID);
+            }
+        }
         this.transPayOrgId(co.getFPAYORGID(), marketId, systemCode);
         this.transSaleOrgId(co.getFSALEORGID(), marketId, systemCode);
         this.transSettleOrgId(co.getFSETTLEORGID(), marketId, systemCode);
@@ -101,6 +106,17 @@ public class TransferComponent {
     }
  
     /**
+     * 交易货币
+     *
+     * @param marketId   市场 ID
+     * @param systemCode 系统代码
+     * @param fGroup     F 组
+     */
+    public void transCustomerGroup(FGroup fGroup, Long marketId, String systemCode) {
+        fGroup.setFNumber(transMapper.getBaseConfig(systemCode, marketId).getCustomerGroup());
+    }
+
+    /**
      * Trans Main Book 货币
      *
      * @param fmainbookstdcurrid fmainbookstdcurrid
@@ -207,11 +223,12 @@ public class TransferComponent {
      *
      * @param fsaledeptid fsaledeptid
      */
-    public void transDepId(FSALEDEPTID fsaledeptid) {
+    public String transDepId(FSALEDEPTID fsaledeptid) {
         if (ObjectUtils.isEmpty(fsaledeptid.getFNumber())) {
-            return;
+            return null;
         }
         fsaledeptid.setFNumber(transMapper.getDepartment(Long.valueOf(fsaledeptid.getFNumber())).getDepartmentCode());
+        return fsaledeptid.getFNumber();
     }
  
 }
@@ -5,6 +5,7 @@ import com.diligrp.etrade.thirdparty.domain.co.basic.BaseSourceCo;
 import com.diligrp.etrade.thirdparty.domain.dto.BaseConfigDto;
 import com.diligrp.etrade.thirdparty.domain.dto.ClientDto;
 import com.diligrp.etrade.thirdparty.domain.dto.MappingDto;
+import com.diligrp.etrade.thirdparty.domain.model.FGroup;
 import com.diligrp.etrade.thirdparty.mapper.RecordMapper;
 import com.diligrp.etrade.thirdparty.mapper.TransMapper;
 import com.diligrp.etrade.thirdparty.type.BasicEnum;
@@ -115,6 +116,17 @@ public abstract class AbstractBasicHandler&lt;T extends BaseSourceCo&gt; implements Ty
     }
  
     /**
+     * 固定转换
+     *
+     * @param marketId   市场 ID
+     * @param systemCode 系统代码
+     * @param fGroup     F 组
+     */
+    protected void transferCustomerGroup(FGroup fGroup, Long marketId, String systemCode) {
+        transferComponent.transCustomerGroup(fGroup, marketId, systemCode);
+    }
+
+    /**
      * 处理
      *
      * @param json       JSON 格式
@@ -159,7 +159,7 @@ public abstract class AbstractBillHandler&lt;T extends BaseBillCo&gt; implements TypeM
      * @param data 数据
      */
     protected static <T extends BaseBillCo> void transferDynamicBusinessType(T t, BusinessDetailDto data) {
-        t.setF_PZCW_Text(data.getItemValue());
+        t.setFixedBusinessType(data.getItemValue());
     }
  
     /**
@@ -261,17 +261,17 @@ public abstract class AbstractBillHandler&lt;T extends BaseBillCo&gt; implements TypeM
      * @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());
-        identifyInfo.setUserName(clientParam.getUsername());
-        identifyInfo.setServerUrl(clientParam.getServiceAddress());
-        identifyInfo.setAppSecret(clientParam.getSecurityKey());
-        identifyInfo.setdCID(clientParam.getDataCentreId());
+        var identifyInfo = getIdentifyInfo(marketId, systemCode);
         var util = new PurchaseOrderApiUtils(identifyInfo);
         for (T e : ts) {
             var billId = e.getFBillTypeID().getFNUMBER();
+            //获取单据类型
             String documentType = getDocumentType(marketId, systemCode, billId);
+            var fixedBusinessType = e.getFixedBusinessType();
+            //业务类型固定的情况下
+            if (!ObjectUtils.isEmpty(fixedBusinessType)){
+                e.getFBillTypeID().setFNUMBER(fixedBusinessType);
+            }
             if (ObjectUtils.isEmpty(documentType)) {
                 throw new ThirdPartyException("未配置业务映射");
             }
@@ -281,6 +281,17 @@ public abstract class AbstractBillHandler&lt;T extends BaseBillCo&gt; implements TypeM
         }
     }
  
+    private IdentifyInfo getIdentifyInfo(Long marketId, String systemCode) {
+        var identifyInfo = new IdentifyInfo();
+        ClientDto clientParam = transMapper.getClientParam(systemCode, marketId);
+        identifyInfo.setAppId(clientParam.getApplyId());
+        identifyInfo.setUserName(clientParam.getUsername());
+        identifyInfo.setServerUrl(clientParam.getServiceAddress());
+        identifyInfo.setAppSecret(clientParam.getSecurityKey());
+        identifyInfo.setdCID(clientParam.getDataCentreId());
+        return identifyInfo;
+    }
+
     /**
      * 获取 所有金额
      *
@@ -13,6 +13,7 @@ import java.util.List;
  */
 public class BaseBillCo implements Serializable {
     private String systemDynamicCode;
+    private String fixedBusinessType;
     private String FAR_Remark;
     private String F_PZCW_Text;
     private String F_PZCW_Text1;
@@ -23,6 +24,7 @@ public class BaseBillCo implements Serializable {
     private FCUSTOMERID FCUSTOMERID;
     private FSALEORGID FSALEORGID;
     private FSALEDEPTID FSALEDEPTID;
+    private FCOSTDEPARTMENTID FCOSTDEPARTMENTID;
     private FPAYORGID FPAYORGID;
     private FTRANSFERID FTRANSFERID;
     private FORDERID FORDERID;
@@ -43,6 +45,15 @@ public class BaseBillCo implements Serializable {
         this.systemDynamicCode = systemDynamicCode;
     }
  
+    @JsonProperty("fixedBusinessType")
+    public String getFixedBusinessType() {
+        return fixedBusinessType;
+    }
+
+    public void setFixedBusinessType(String fixedBusinessType) {
+        this.fixedBusinessType = fixedBusinessType;
+    }
+
     @JsonProperty("F_ZDB_Text")
     public String getF_ZDB_Text() {
         return F_ZDB_Text;
@@ -151,6 +162,15 @@ public class BaseBillCo implements Serializable {
         this.FSALEDEPTID = FSALEDEPTID;
     }
  
+    @JsonProperty("FCOSTDEPARTMENTID")
+    public FCOSTDEPARTMENTID getFCOSTDEPARTMENTID() {
+        return FCOSTDEPARTMENTID;
+    }
+
+    public void setFCOSTDEPARTMENTID(FCOSTDEPARTMENTID FCOSTDEPARTMENTID) {
+        this.FCOSTDEPARTMENTID = FCOSTDEPARTMENTID;
+    }
+
     @JsonProperty("FPAYORGID")
     public FPAYORGID getFPAYORGID() {
         return FPAYORGID;
@@ -8,6 +8,7 @@ package com.diligrp.etrade.thirdparty.domain.dto;
 public class BaseConfigDto {
     private String currency;
     private String syncItem;
+    private String customerGroup;
  
     public String getCurrency() {
         return currency;
@@ -24,4 +25,12 @@ public class BaseConfigDto {
     public void setSyncItem(String syncItem) {
         this.syncItem = syncItem;
     }
+
+    public String getCustomerGroup() {
+        return customerGroup;
+    }
+
+    public void setCustomerGroup(String customerGroup) {
+        this.customerGroup = customerGroup;
+    }
 }
+package com.diligrp.etrade.thirdparty.domain.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * @Author: zhangmeiyang
+ * @CreateTime: 2024-10-10 10:04
+ * @Version: todo
+ */
+public class FCOSTDEPARTMENTID {
+    private String FNUMBER;
+
+    @JsonProperty("FNUMBER")
+    public String getFNUMBER() {
+        return FNUMBER;
+    }
+
+    public void setFNUMBER(String FNUMBER) {
+        this.FNUMBER = FNUMBER;
+    }
+}
@@ -5,6 +5,7 @@ import com.diligrp.etrade.thirdparty.demarcate.AbstractBasicHandler;
 import com.diligrp.etrade.thirdparty.domain.co.basic.CustomerCo;
 import com.diligrp.etrade.thirdparty.domain.dto.MappingDto;
 import com.diligrp.etrade.thirdparty.domain.model.FContactId;
+import com.diligrp.etrade.thirdparty.domain.model.FGroup;
 import com.diligrp.etrade.thirdparty.domain.model.FT_BD_CUSTLOCATION;
 import com.diligrp.etrade.thirdparty.type.BasicEnum;
 import com.diligrp.etrade.thirdparty.utils.ContactApiUtils;
@@ -30,8 +31,11 @@ public class CustomerBasicHandler extends AbstractBasicHandler&lt;CustomerCo&gt; {
         List<CustomerCo> customerCos = JsonUtils.fromJsonString(json, new TypeReference<>() {});
         var customerUtils = new CustomerApiUtils(getIdentifyInfo(marketId, systemCode));
         var contactUtils = new ContactApiUtils(getIdentifyInfo(marketId, systemCode));
+        FGroup fGroup = new FGroup();
+        transferCustomerGroup(fGroup, marketId, systemCode);
         for (CustomerCo e : customerCos) {
             super.transfer(e, marketId, systemCode);
+            e.setFGroup(fGroup);
             MappingDto mappingData = super.getMappingData(marketId, systemCode, e.getSystemDataId());
             List<FT_BD_CUSTLOCATION> ftBdCustlocation = e.getFT_BD_CUSTLOCATION();
             var list = new ArrayList<FT_BD_CUSTLOCATION>();