金蝶对接pt3

zhangmeiyang
1 parent fb12eddc
Showing 21 changed files with 332 additions and 103 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/co/business/BaseBillCo.java
etrade-thirdparty/src/main/java/com/diligrp/etrade/thirdparty/domain/co/business/CardBillCo.java
etrade-thirdparty/src/main/java/com/diligrp/etrade/thirdparty/domain/co/business/SettleBillCo.java
etrade-thirdparty/src/main/java/com/diligrp/etrade/thirdparty/domain/co/business/WeighingBillCo.java
etrade-thirdparty/src/main/java/com/diligrp/etrade/thirdparty/domain/model/FT_BD_CUSTLOCATION.java
etrade-thirdparty/src/main/java/com/diligrp/etrade/thirdparty/exec/basic/BasicReceiver.java
etrade-thirdparty/src/main/java/com/diligrp/etrade/thirdparty/exec/business/BusinessReceiver.java
etrade-thirdparty/src/main/java/com/diligrp/etrade/thirdparty/handler/basic/CustomerBasicHandler.java
etrade-thirdparty/src/main/java/com/diligrp/etrade/thirdparty/message/GeneralMessage.java
etrade-thirdparty/src/main/java/com/diligrp/etrade/thirdparty/message/GeneralSendMessage.java
etrade-thirdparty/src/main/java/com/diligrp/etrade/thirdparty/type/OperateType.java
etrade-thirdparty/src/main/java/com/diligrp/etrade/thirdparty/utils/BillTypeApiUtils.java
etrade-thirdparty/src/main/java/com/diligrp/etrade/thirdparty/utils/ContactApiUtils.java
etrade-thirdparty/src/main/java/com/diligrp/etrade/thirdparty/utils/CustomerApiUtils.java
etrade-thirdparty/src/main/java/com/diligrp/etrade/thirdparty/utils/DepartmentApiUtils.java
etrade-thirdparty/src/main/java/com/diligrp/etrade/thirdparty/utils/FeeApiUtils.java
etrade-thirdparty/src/main/java/com/diligrp/etrade/thirdparty/utils/FeeGroupApiUtils.java
etrade-thirdparty/src/main/java/com/diligrp/etrade/thirdparty/utils/PurchaseOrderApiUtils.java
@@ -6,12 +6,14 @@ import com.diligrp.etrade.thirdparty.domain.co.basic.BaseSourceCo;
 import com.diligrp.etrade.thirdparty.domain.co.business.BaseBillCo;
 import com.diligrp.etrade.thirdparty.domain.model.*;
 import com.diligrp.etrade.thirdparty.mapper.TransMapper;
+import com.diligrp.etrade.thirdparty.type.OperateType;
 import jakarta.annotation.Resource;
 import org.springframework.stereotype.Component;
 import org.springframework.util.ObjectUtils;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
+import java.util.Objects;
 /**
  * Transfer Component （传输组件）
@@ -36,22 +38,23 @@ 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.setFDATE(LocalDateTime.now().format(DateTimeFormatter.ofPattern(Constants.DATE_TIME_FORMAT)));
         co.setFCURRENCYID(new FCURRENCYID());
         co.setFMAINBOOKSTDCURRID(new FMAINBOOKSTDCURRID());
         co.setFPAYORGID(new FPAYORGID());
         co.setFSALEORGID(new FSALEORGID());
         co.setFSETTLEORGID(new FSETTLEORGID());
-        if (!ObjectUtils.isEmpty(co.getFORDERID())){
+        if (!ObjectUtils.isEmpty(co.getFORDERID())) {
             this.transOrderId(co.getFORDERID());
         }
-        if (!ObjectUtils.isEmpty(co.getFCUSTOMERID())){
+        if (!ObjectUtils.isEmpty(co.getFCUSTOMERID())) {
             this.transCustomer(co.getFCUSTOMERID());
         }
-        if (!ObjectUtils.isEmpty(co.getFSALEDEPTID())){
+        if (!ObjectUtils.isEmpty(co.getFSALEDEPTID())) {
             this.transDepId(co.getFSALEDEPTID());
         }
-        if (!ObjectUtils.isEmpty(co.getFTRANSFERID())){
+        if (!ObjectUtils.isEmpty(co.getFTRANSFERID())) {
             this.transTransferId(co.getFTRANSFERID());
         }
         this.transPayOrgId(co.getFPAYORGID(), marketId, systemCode);
@@ -61,7 +64,7 @@ public class TransferComponent {
         this.transMainBookCurrency(co.getFMAINBOOKSTDCURRID(), marketId, systemCode);
     }
-    public void transBasicCo(BaseSourceCo co, Long marketId, String systemCode){
+    public void transBasicCo(BaseSourceCo co, Long marketId, String systemCode) {
         co.setFUseOrgId(new FUseOrgId());
         co.setFCreateOrgId(new FCreateOrgId());
         this.transFUseOrgId(co.getFUseOrgId(), marketId, systemCode);
@@ -75,7 +78,7 @@ public class TransferComponent {
      * @param marketId    市场 ID
      * @param systemCode  系统代码
      */
-    public void transCurrency(FCURRENCYID fcurrencyid, Long marketId, String systemCode){
+    public void transCurrency(FCURRENCYID fcurrencyid, Long marketId, String systemCode) {
         fcurrencyid.setFNumber(transMapper.getBaseConfig(systemCode, marketId).getCurrency());
     }
@@ -86,7 +89,7 @@ public class TransferComponent {
      * @param marketId           市场 ID
      * @param systemCode         系统代码
      */
-    public void transMainBookCurrency(FMAINBOOKSTDCURRID fmainbookstdcurrid, Long marketId, String systemCode){
+    public void transMainBookCurrency(FMAINBOOKSTDCURRID fmainbookstdcurrid, Long marketId, String systemCode) {
         fmainbookstdcurrid.setFNumber(transMapper.getBaseConfig(systemCode, marketId).getCurrency());
     }
@@ -95,8 +98,8 @@ public class TransferComponent {
      *
      * @param fcustomerid fcustomerid
      */
-    public void transCustomer(FCUSTOMERID fcustomerid){
-        if (ObjectUtils.isEmpty(fcustomerid.getFNumber())){
+    public void transCustomer(FCUSTOMERID fcustomerid) {
+        if (ObjectUtils.isEmpty(fcustomerid.getFNumber())) {
             return;
         }
         fcustomerid.setFNumber(transMapper.getCustomer(Long.valueOf(fcustomerid.getFNumber())).getCode());
@@ -107,8 +110,8 @@ public class TransferComponent {
      *
      * @param forderid forderid
      */
-    public void transOrderId(FORDERID forderid){
-        if (ObjectUtils.isEmpty(forderid.getFNumber())){
+    public void transOrderId(FORDERID forderid) {
+        if (ObjectUtils.isEmpty(forderid.getFNumber())) {
             return;
         }
         forderid.setFNumber(transMapper.getCustomer(Long.valueOf(forderid.getFNumber())).getCode());
@@ -119,8 +122,8 @@ public class TransferComponent {
      *
      * @param ftransferid ftransferid
      */
-    public void transTransferId(FTRANSFERID ftransferid){
-        if (ObjectUtils.isEmpty(ftransferid.getFNumber())){
+    public void transTransferId(FTRANSFERID ftransferid) {
+        if (ObjectUtils.isEmpty(ftransferid.getFNumber())) {
             return;
         }
         ftransferid.setFNumber(transMapper.getCustomer(Long.valueOf(ftransferid.getFNumber())).getCode());
@@ -133,8 +136,8 @@ public class TransferComponent {
      * @param systemCode 系统代码
      * @param fUseOrgId  f 使用组织 ID
      */
-    public void transFUseOrgId(FUseOrgId fUseOrgId, Long marketId, String systemCode){
-        fUseOrgId.setFNumber(transMapper.getClientParam(systemCode,marketId).getOrganization());
+    public void transFUseOrgId(FUseOrgId fUseOrgId, Long marketId, String systemCode) {
+        fUseOrgId.setFNumber(transMapper.getClientParam(systemCode, marketId).getOrganization());
     }
     /**
@@ -144,8 +147,8 @@ public class TransferComponent {
      * @param systemCode   系统代码
      * @param fCreateOrgId f 创建组织 ID
      */
-    public void transFCreateOrgId(FCreateOrgId fCreateOrgId, Long marketId, String systemCode){
-        fCreateOrgId.setFNumber(transMapper.getClientParam(systemCode,marketId).getOrganization());
+    public void transFCreateOrgId(FCreateOrgId fCreateOrgId, Long marketId, String systemCode) {
+        fCreateOrgId.setFNumber(transMapper.getClientParam(systemCode, marketId).getOrganization());
     }
     /**
@@ -155,8 +158,8 @@ public class TransferComponent {
      * @param marketId   市场 ID
      * @param systemCode 系统代码
      */
-    public void transPayOrgId(FPAYORGID fpayorgid, Long marketId, String systemCode){
-        fpayorgid.setFNumber(transMapper.getClientParam(systemCode,marketId).getOrganization());
+    public void transPayOrgId(FPAYORGID fpayorgid, Long marketId, String systemCode) {
+        fpayorgid.setFNumber(transMapper.getClientParam(systemCode, marketId).getOrganization());
     }
     /**
@@ -166,8 +169,8 @@ public class TransferComponent {
      * @param marketId   市场 ID
      * @param systemCode 系统代码
      */
-    public void transSaleOrgId(FSALEORGID fsaleorgid, Long marketId, String systemCode){
-        fsaleorgid.setFNumber(transMapper.getClientParam(systemCode,marketId).getOrganization());
+    public void transSaleOrgId(FSALEORGID fsaleorgid, Long marketId, String systemCode) {
+        fsaleorgid.setFNumber(transMapper.getClientParam(systemCode, marketId).getOrganization());
     }
     /**
@@ -177,8 +180,8 @@ public class TransferComponent {
      * @param marketId     市场 ID
      * @param systemCode   系统代码
      */
-    public void transSettleOrgId(FSETTLEORGID fsettleorgid, Long marketId, String systemCode){
-        fsettleorgid.setFNumber(transMapper.getClientParam(systemCode,marketId).getOrganization());
+    public void transSettleOrgId(FSETTLEORGID fsettleorgid, Long marketId, String systemCode) {
+        fsettleorgid.setFNumber(transMapper.getClientParam(systemCode, marketId).getOrganization());
     }
     /**
@@ -186,8 +189,8 @@ public class TransferComponent {
      *
      * @param fsaledeptid fsaledeptid
      */
-    public void transDepId(FSALEDEPTID fsaledeptid){
-        if (ObjectUtils.isEmpty(fsaledeptid.getFNumber())){
+    public void transDepId(FSALEDEPTID fsaledeptid) {
+        if (ObjectUtils.isEmpty(fsaledeptid.getFNumber())) {
             return;
         }
         fsaledeptid.setFNumber(transMapper.getDepartment(Long.valueOf(fsaledeptid.getFNumber())).getDepartmentCode());
@@ -135,9 +135,10 @@ public abstract class AbstractBillHandler&lt;T extends BaseBillCo&gt; implements TypeM
     protected void transferDataList(List<T> ts, Long marketId, String systemCode){
         ts.forEach(e -> {
+            DynamicType dynamicType = DynamicType.fromCode(e.getSystemDynamicCode());
             transfer(e, marketId, systemCode);
-            getFilteredDynamicDataSingle(DynamicType.fromCode(e.getF_PZCW_Text()), marketId, systemCode).forEach((k, v) -> TRANSFER_FUNCTION_SINGLE_MAP.get(k).transferDynamic(e, v));
-            getFilteredDynamicDataMulti(DynamicType.fromCode(e.getF_PZCW_Text()), marketId, systemCode).forEach((k, v) -> TRANSFER_FUNCTION_MULTI_MAP.get(k).transferDynamic(e, v));
+            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));
         });
     }
@@ -187,8 +188,8 @@ 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 {
-        ClientDto clientParam = transMapper.getClientParam(systemCode, marketId);
         var identifyInfo = new IdentifyInfo();
+        ClientDto clientParam = transMapper.getClientParam(systemCode, marketId);
         identifyInfo.setAppId(clientParam.getApplyId());
         identifyInfo.setUserName(clientParam.getUsername());
         identifyInfo.setServerUrl(clientParam.getServiceAddress());
@@ -196,7 +197,8 @@ public abstract class AbstractBillHandler&lt;T extends BaseBillCo&gt; implements TypeM
         identifyInfo.setdCID(clientParam.getDataCentreId());
         var util = new PurchaseOrderApiUtils(identifyInfo);
         for (T e : ts) {
-            util.createOnePurchaseOrder(JsonUtils.toJsonString(e), getDocumentType(marketId, systemCode, e.getFBillTypeID().getFNUMBER()));
+            e.getFBillTypeID().setFNUMBER("YSD01_SYS");//TODO TEST
+            util.createOnePurchaseOrder(JsonUtils.toJsonString(e), "AR_receivable");
         }
     }
@@ -12,6 +12,7 @@ import java.util.List;
  * @Version: todo
  */
 public class BaseBillCo implements Serializable {
+    private String systemDynamicCode;
     private String FAR_Remark;
     private String F_PZCW_Text;
     private String FDATE;
@@ -28,6 +29,25 @@ public class BaseBillCo implements Serializable {
     private FChargeId FChargeId;
     private FSettleTypeID FSettleTypeID;
     private List<FEntityDetail> FEntityDetail;
+    private String F_ZDB_Text;
+
+    @JsonProperty("systemDynamicCode")
+    public String getSystemDynamicCode() {
+        return systemDynamicCode;
+    }
+
+    public void setSystemDynamicCode(String systemDynamicCode) {
+        this.systemDynamicCode = systemDynamicCode;
+    }
+
+    @JsonProperty("F_ZDB_Text")
+    public String getF_ZDB_Text() {
+        return F_ZDB_Text;
+    }
+
+    public void setF_ZDB_Text(String f_ZDB_Text) {
+        F_ZDB_Text = f_ZDB_Text;
+    }
     @JsonProperty("FAR_Remark")
     public String getFAR_Remark() {
 package com.diligrp.etrade.thirdparty.domain.co.business;
-import com.fasterxml.jackson.annotation.JsonProperty;
-
 /**
  * @Author: zhangmeiyang
  * @CreateTime: 2024-10-10 14:23
  * @Version: todo
  */
 public class CardBillCo extends BaseBillCo {
-    private String F_ZDB_Text;
-
-    @JsonProperty("F_ZDB_Text")
-    public String getF_ZDB_Text() {
-        return F_ZDB_Text;
-    }
-    public void setF_ZDB_Text(String f_ZDB_Text) {
-        F_ZDB_Text = f_ZDB_Text;
-    }
 }
 package com.diligrp.etrade.thirdparty.domain.co.business;
-import com.fasterxml.jackson.annotation.JsonProperty;
-
 /**
  * @Author: zhangmeiyang
  * @CreateTime: 2024-10-10 14:23
  * @Version: todo
  */
 public class SettleBillCo extends BaseBillCo {
-    private String F_ZDB_Text;
-
-    @JsonProperty("F_ZDB_Text")
-    public String getF_ZDB_Text() {
-        return F_ZDB_Text;
-    }
-
-    public void setF_ZDB_Text(String f_ZDB_Text) {
-        F_ZDB_Text = f_ZDB_Text;
-    }
 }
@@ -7,5 +7,4 @@ package com.diligrp.etrade.thirdparty.domain.co.business;
  */
 public class WeighingBillCo extends BaseBillCo {
-
 }
@@ -10,10 +10,10 @@ import com.fasterxml.jackson.annotation.JsonProperty;
  */
 public class FT_BD_CUSTLOCATION {
     private FContactId FContactId;
-    private String FNumber;
     private String FName;
-    private String FMobile;
+    private String FMOBILEPHONE;
     private String FBizAddress;
+    private String FCompanyType;
     @JsonProperty("FContactId")
     public FContactId getFContactId() {
@@ -24,15 +24,6 @@ public class FT_BD_CUSTLOCATION {
         this.FContactId = FContactId;
     }
-    @JsonProperty("FNumber")
-    public String getFNumber() {
-        return FNumber;
-    }
-
-    public void setFNumber(String FNumber) {
-        this.FNumber = FNumber;
-    }
-
     @JsonProperty("FName")
     public String getFName() {
         return FName;
@@ -42,13 +33,13 @@ public class FT_BD_CUSTLOCATION {
         this.FName = FName;
     }
-    @JsonProperty("FMobile")
-    public String getFMobile() {
-        return FMobile;
+    @JsonProperty("FMOBILEPHONE")
+    public String getFMOBILEPHONE() {
+        return FMOBILEPHONE;
     }
-    public void setFMobile(String FMobile) {
-        this.FMobile = FMobile;
+    public void setFMOBILEPHONE(String FMOBILEPHONE) {
+        this.FMOBILEPHONE = FMOBILEPHONE;
     }
     @JsonProperty("FBizAddress")
@@ -59,4 +50,13 @@ public class FT_BD_CUSTLOCATION {
     public void setFBizAddress(String FBizAddress) {
         this.FBizAddress = FBizAddress;
     }
+
+    @JsonProperty("FCompanyType")
+    public String getFCompanyType() {
+        return FCompanyType;
+    }
+
+    public void setFCompanyType(String FCompanyType) {
+        this.FCompanyType = FCompanyType;
+    }
 }
@@ -40,34 +40,34 @@ public class BasicReceiver extends AbstractReceiver {
     @RabbitListener(bindings = @QueueBinding(value = @Queue(value = ZR_BASIC_NORMAL_QUEUE, autoDelete = "false"), exchange = @Exchange(value = ZR_BASIC_NORMAL_EXCHANGE), key = ZR_BASIC_NORMAL_ROUTING), ackMode = "MANUAL")
     public void receiveMessage(Channel channel, Message message) throws IOException {
         var content = new String(message.getBody(), StandardCharsets.UTF_8);
-        LOG.info("business receive message:{}", content);
+        LOG.info("基础数据队列收到消息:{}", content);
         GeneralMessage msg = JsonUtils.fromJsonString(content, GeneralMessage.class);
         try {
             Holder.BASIC_CONTEXT.get(msg.getBasic()).handle(msg.getData(), msg.getMarketId(), msg.getSystemCode());
             channel.basicAck(message.getMessageProperties().getDeliveryTag(), false);
-            LOG.info("business handle success:{}", content);
+            LOG.info("基础数据队列消息处理成功:{}", content);
         } catch (Exception e) {
             channel.basicAck(message.getMessageProperties().getDeliveryTag(), false);
             msg.setRetryCount(msg.getRetryCount() + 1);
             sendDelayMsg(DELAY, JsonUtils.toJsonString(msg));
-            LOG.error("business exception:", e);
+            LOG.error("基础数据队列消息处理失败:", e);
         }
     }
     @RabbitListener(queues = ZR_BASIC_DEAD_QUEUE, ackMode = "MANUAL")
     public void handleCustomDelayMsg(Channel channel, Message message) throws IOException {
         var content = new String(message.getBody(), StandardCharsets.UTF_8);
-        LOG.info("business receive retry message:{}", content);
+        LOG.info("基础数据重试队列收到消息:{}", content);
         GeneralMessage msg = JsonUtils.fromJsonString(content, GeneralMessage.class);
         try {
             Holder.BASIC_CONTEXT.get(msg.getBasic()).handle(msg.getData(), msg.getMarketId(), msg.getSystemCode());
             channel.basicAck(message.getMessageProperties().getDeliveryTag(), false);
-            LOG.info("business retry message success:{}", content);
+            LOG.info("基础数据重试队列消息处理成功:{}", content);
         } catch (Exception e) {
             channel.basicAck(message.getMessageProperties().getDeliveryTag(), false);
             if (msg.getRetryCount() > 3) {
                 super.handleError(e.fillInStackTrace().getMessage(), msg.getData(), msg.getBasic().code, msg.getSystemCode(), msg.getMarketId());
-                LOG.error("retry business exception:", e);
+                LOG.error("基础数据重试队列消息处理失败:", e);
             } else {
                 msg.setRetryCount(msg.getRetryCount() + 1);
                 sendDelayMsg(DELAY, JsonUtils.toJsonString(msg));
@@ -38,34 +38,34 @@ public class BusinessReceiver extends AbstractReceiver {
     @RabbitListener(bindings = @QueueBinding(value = @Queue(value = ZR_BUSINESS_NORMAL_QUEUE, autoDelete = "false"), exchange = @Exchange(value = ZR_BUSINESS_NORMAL_EXCHANGE), key = ZR_BUSINESS_NORMAL_ROUTING), ackMode = "MANUAL")
     public void receiveMessage(Channel channel, Message message) throws IOException {
         var content = new String(message.getBody(), StandardCharsets.UTF_8);
-        LOG.info("basic receive message:{}",content);
+        LOG.info("业务队列收到消息:{}",content);
         GeneralMessage msg = JsonUtils.fromJsonString(content, GeneralMessage.class);
         try {
             Holder.BUSINESS_CONTEXT.get(msg.getBusiness()).handle(msg.getData(), msg.getMarketId(), msg.getSystemCode());
             channel.basicAck(message.getMessageProperties().getDeliveryTag(), false);
-            LOG.info("basic handle success:{}",content);
+            LOG.info("业务队列消息处理成功:{}",content);
         } catch (Exception e) {
             channel.basicAck(message.getMessageProperties().getDeliveryTag(), false);
             msg.setRetryCount(msg.getRetryCount()+1);
             sendDelayMsg(DELAY, JsonUtils.toJsonString(msg));
-            LOG.error("basic exception:",e);
+            LOG.error("业务队列消息处理失败:",e);
         }
     }
     @RabbitListener(queues = ZR_BUSINESS_DEAD_QUEUE, ackMode = "MANUAL")
     public void handleCustomDelayMsg(Channel channel, Message message) throws IOException {
         var content = new String(message.getBody(), StandardCharsets.UTF_8);
-        LOG.info("basic receive retry message:{}",content);
+        LOG.info("业务重试队列收到消息:{}",content);
         GeneralMessage msg = JsonUtils.fromJsonString(content, GeneralMessage.class);
         try {
             Holder.BUSINESS_CONTEXT.get(msg.getBusiness()).handle(msg.getData(), msg.getMarketId(), msg.getSystemCode());
             channel.basicAck(message.getMessageProperties().getDeliveryTag(), false);
-            LOG.info("basic retry message success:{}",content);
+            LOG.info("业务重试队列消息处理成功:{}",content);
         } catch (Exception e) {
             channel.basicAck(message.getMessageProperties().getDeliveryTag(), false);
             if (msg.getRetryCount() > 3) {
                 super.handleError(e.fillInStackTrace().getMessage(), msg.getData(), msg.getBusiness().code, msg.getSystemCode(),msg.getMarketId());
-                LOG.error("retry basic exception:",e);
+                LOG.error("业务重试队列消息处理失败:",e);
             }else{
                 msg.setRetryCount(msg.getRetryCount() + 1);
                 sendDelayMsg(DELAY, JsonUtils.toJsonString(msg));
@@ -13,6 +13,7 @@ import com.fasterxml.jackson.core.type.TypeReference;
 import org.springframework.stereotype.Component;
 import org.springframework.util.ObjectUtils;
+import java.util.ArrayList;
 import java.util.List;
 /**
@@ -22,6 +23,7 @@ import java.util.List;
  */
 @Component
 public class CustomerBasicHandler extends AbstractBasicHandler<CustomerCo> {
+    private static final String F_COMPANY_TYPE = "BD_Customer";
     @Override
     public void handleInside(String json, Long marketId, String systemCode) throws Exception {
@@ -32,14 +34,19 @@ public class CustomerBasicHandler extends AbstractBasicHandler&lt;CustomerCo&gt; {
             super.transfer(e, marketId, systemCode);
             MappingDto mappingData = super.getMappingData(marketId, systemCode, e.getSystemDataId());
             List<FT_BD_CUSTLOCATION> ftBdCustlocation = e.getFT_BD_CUSTLOCATION();
+            var list = new ArrayList<FT_BD_CUSTLOCATION>();
             if (!ObjectUtils.isEmpty(ftBdCustlocation)){
                 for (FT_BD_CUSTLOCATION ftBdCustLocation : ftBdCustlocation) {
+                    ftBdCustLocation.setFCompanyType(F_COMPANY_TYPE);
                     String contact = contactUtils.createContact(JsonUtils.toJsonString(ftBdCustLocation));
                     FContactId fContactId = new FContactId();
                     fContactId.setFNUMBER(contact);
-                    ftBdCustLocation.setFContactId(fContactId);
+                    var item = new FT_BD_CUSTLOCATION();
+                    item.setFContactId(fContactId);
+                    list.add(item);
                 }
             }
+            e.setFT_BD_CUSTLOCATION(list);
             e.setFCUSTID(ObjectUtils.isEmpty(mappingData) ? null : mappingData.getThirdPartyDataId());
             if (!ObjectUtils.isEmpty(mappingData)){
                 customerUtils.updateCustomer(String.valueOf(mappingData.getThirdPartyDataId()),JsonUtils.toJsonString(e));
@@ -9,6 +9,7 @@ import com.diligrp.etrade.thirdparty.type.BusinessEnum;
  * @Version: todo
  */
 public class GeneralMessage {
+    private static final String SYSTEM_CODE = "kingdee";
     private BusinessEnum business;
     private BasicEnum basic;
     private String data;
@@ -18,8 +19,9 @@ public class GeneralMessage {
     public GeneralMessage() {
         this.retryCount = 0;
-        this.systemCode = "kingdee";
+        this.systemCode = SYSTEM_CODE;
     }
+
     public BasicEnum getBasic() {
         return basic;
     }
 package com.diligrp.etrade.thirdparty.message;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
 import java.util.Map;
 /**
@@ -11,6 +13,7 @@ public class GeneralSendMessage {
     private Map<String,Object> Model;
     private Boolean IsAutoSubmitAndAudit;
+    @JsonProperty("Model")
     public Map<String, Object> getModel() {
         return Model;
     }
@@ -19,6 +22,7 @@ public class GeneralSendMessage {
         Model = model;
     }
+    @JsonProperty("IsAutoSubmitAndAudit")
     public Boolean getAutoSubmitAndAudit() {
         return IsAutoSubmitAndAudit;
     }
+package com.diligrp.etrade.thirdparty.type;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * @description：
+ *          柜台操作记录类型
+ * @author ：WangBo
+ * @time ：2020年6月17日下午5:15:19
+ */
+public enum OperateType {
+    ACCOUNT_TRANSACT("办卡", 1010),
+    ACCOUNT_CHARGE("存款", 1011),
+    ACCOUNT_WITHDRAW("取款", 1012),
+    BANK_ACCOUNT_CHARGE("银行存款", 2011),
+    CHANGE("换卡", 1013),
+    LOSS_CARD("挂失", 1014),
+    LOSS_REMOVE("解挂", 1015),
+    PWD_CHANGE("修改密码", 1016),
+    RESET_PWD("重置密码", 1017),
+    REFUND_CARD("退卡", 1018),
+    LIFT_LOCKED("卡片解锁", 1019),
+    FLAT_COST("缴费", 1020),
+    BANKCARD_BIND("银行卡绑定", 1021),
+    BANKCARD_REMOVE("银行卡解绑", 1022),
+    BANK_TRANSFER("转账", 1023),
+    PERMISSION_SET("权限设置", 1024),
+    BANK_ACCOUNT_WITHDRAW("银行取款", 2012),
+    PAYEE("领款", 1025),
+    PAYER("交款", 1026),
+    FROZEN_FUND("冻结资金", 1027),
+    UNFROZEN_FUND("解冻资金", 1028),
+    FROZEN_ACCOUNT("冻结账户", 1029),
+    UNFROZEN_ACCOUNT("解冻账户", 1030),
+    FUND_REVERSE("冲正", 1031),
+    FIRM_WITHDRAW("市场圈提", 1032),
+    ETC_BIND("ETC绑定", 1033),
+    ETC_PAY("ETC缴费", 1034),
+    SCAN_ACCOUNT_CHARGE("扫码存款", 1035),
+    //    CYCLE_SURPLUS("账期调账",1035),
+//    CYCLE_LOSS("账期罚款",1036),
+    DAILY_SETTLE("日扎处理", 1036),
+    TRANSFER_OUT("柜员转出", 1037),
+    TRANSFER_IN("柜员转入", 1038),
+    PERMISSION_SET_BUSINESS("卡账户权限设置", 24),//业务日志的业务类型
+
+    CAIWU_PAYEE("从财务领款", 2025),
+
+    CAIWU_PAYER("向财务交款", 2026),
+
+    BOOTH_LEASE("摊位租赁", 1),
+    EARNEST("定金", 2),
+    DEPOSIT_ORDER("保证金", 3),
+    LOCATION_LEASE("冷库租赁", 4),
+    LODGING_LEASE("公寓租赁", 5),
+    BOUTIQUE_ENTRANCE("精品停车费", 6),
+    PASSPORT("通行证", 7),
+    STOCKIN("冷库入库", 8),
+    STOCKOUT("冷库出库", 9),
+    OTHER_FEE("其它收费", 10),
+    LABOR_VEST("劳务马甲", 11),
+    MESSAGEFEE("信息费", 14),
+    WATER("水费", 15),
+    ELECTRICITY("电费", 16),
+    UTILITY_BILLS_PRE_STORAGE("水电预存", 17),
+    ENTRANCE_CARD("车辆进门办卡", 301),
+    SCALES("磅秤租赁", 18),
+    LINGKUAN("领款", 67),
+    SETTLE_PAY("结算缴费", 510),
+    SETTLE_REFUND("结算退款", 511),
+    SETTLE_PAY_CANCEL("结算缴费撤销", 512),
+    APPROACH("报备进场", 501),
+    TRADE("交易", 502),
+    ETRADE_TRADE("交易", 5502),
+    ETRADE_RETURN("赊销回款", 5503),
+    DETECT("检测", 503),
+    PUT("上下架", 504),
+    TRANSFER("转离场", 505),
+    Cold_IN_ORDER("冷库入库", 506),
+    LOAN("客户借款", 507),
+    RENT("磅秤租赁", 508),
+    SETTLE("批号结算", 509),
+    CASH_LOAN("现金借款", 519),
+    CASH_BACK("现金还款", 514),
+    CARD_LOAN("园区卡借款", 516),
+    CARD_BACK("园区卡还款", 515),
+    QT_LOAN("其他借款", 518),
+    QT_BACK("其他还款", 517),
+    STOP_CAR_TRADE_AERE("停车交易区", 523),
+    CARD_METER("卡表收费", 525),
+    QUERY_FEE("查询费", 513),
+    RUZHU("入住", 601),
+    BUJIAO("补缴", 602),
+    TUIFANG("退房", 603),
+    HONGCHONG("红冲", 604),
+    /** 本地配送费 */
+    LOCAL_DELIVERY_FEE("本地配送费",8816),
+    /** 车辆进场费 */
+    CAR_ENTRANCE_FEE("车辆进场费",8817),
+    /** 车辆出场费 */
+    CAR_OUT_FEE("车辆出场费",8818),
+    /** 称重服务费 */
+    WEIGH_SERVICE_FEE("称重服务费",8819),
+    /** 车辆转场费 */
+    TRANSFER_FEE("车辆转场费",8820),
+    /** 车辆离场费 */
+    LEAVE_FEE("车辆离场费",8821),
+
+    /** 通行证管理费 */
+    PASSPORT_MANAGE_FEE("通行证管理费",8824),
+
+    /** 进门冻结 */
+    ENTRANCE_FREEZE_FEE("进门冻结",8831),
+    ENTRANCE_UNFREEZE_FEE("进门解冻",8832),
+    ENTRANCE_HANDLING_FEE("装卸费",8833),
+    ENTRANCE_CAR_CARD_FEE("办卡费",8834),
+    ENTRANCE_FEEDBACK_FEE("返点",8835),
+    ENTRANCE_LAND_FEE("占地费",8836),
+    /** 称重服务费 没有用了*/
+    SELF_WEIGH_SERVICE_FEE("自助称重费",88101),
+    /** 称重服务费 */
+    SELF_WEIGH_SERVICE_FEE_1("自助称重费",8901),
+    /**资金复核*/
+    FUND_REVIEW("资金复核",10001),
+    ACCOUNT_TRANSFER_IN("转账-入", 3011),
+    ACCOUNT_TRANSFER_OUT("转账-出", 3012),
+    ;
+
+    private String name;
+    private int code;
+
+    OperateType(String name, int code) {
+        this.name = name;
+        this.code = code;
+    }
+
+    /**
+     * 是否是可以冲正的业务(只有充值和提款)
+     * @author miaoguoxin
+     * @date 2020/11/25
+     */
+    public static boolean canReverseType(Integer code) {
+        if (code == null) {
+            return false;
+        }
+        return OperateType.ACCOUNT_CHARGE.getCode() == code || OperateType.ACCOUNT_WITHDRAW.getCode() == code;
+    }
+
+    public static OperateType getOperateType(int code) {
+        for (OperateType type : OperateType.values()) {
+            if (type.getCode() == code) {
+                return type;
+            }
+        }
+        return null;
+    }
+
+    public static String getName(int code) {
+        for (OperateType type : OperateType.values()) {
+            if (type.getCode() == code) {
+                return type.name;
+            }
+        }
+        return null;
+    }
+
+    /**
+     * 获取用于当前账期补打操作列表
+     * @return
+     */
+    public static List<Integer> createReprintList() {
+        List<Integer> typeList = new ArrayList<>();
+        typeList.add(ACCOUNT_TRANSACT.getCode());
+        typeList.add(ACCOUNT_CHARGE.getCode());
+        typeList.add(ACCOUNT_WITHDRAW.getCode());
+        typeList.add(CHANGE.getCode());
+        typeList.add(REFUND_CARD.getCode());
+        typeList.add(RESET_PWD.getCode());
+        typeList.add(PWD_CHANGE.getCode());
+        typeList.add(LOSS_CARD.getCode());
+        typeList.add(LOSS_REMOVE.getCode());
+        typeList.add(LIFT_LOCKED.getCode());
+        typeList.add(PERMISSION_SET.getCode());
+        return typeList;
+    }
+
+    public static List<OperateType> getAll() {
+        return new ArrayList<>(Arrays.asList(OperateType.values()));
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public int getCode() {
+        return code;
+    }
+
+    public void setCode(int code) {
+        this.code = code;
+    }
+}
@@ -5,6 +5,7 @@ import com.diligrp.etrade.thirdparty.error.ThirdPartyException;
 import com.diligrp.etrade.thirdparty.message.GeneralSendMessage;
 import com.diligrp.etrade.thirdparty.type.ThirdPartyErrorCodeEnum;
 import com.fasterxml.jackson.core.type.TypeReference;
+import com.google.gson.Gson;
 import com.kingdee.bos.webapi.entity.IdentifyInfo;
 import com.kingdee.bos.webapi.entity.OperateParam;
 import com.kingdee.bos.webapi.entity.OperatorResult;
@@ -52,8 +53,8 @@ public class BillTypeApiUtils extends BaseApiUtils {
     private String save(String json) throws Exception {
         String res = api.save("BOS_BillType", json);
-        RepoRet repoRet = JsonUtils.fromJsonString(res, new TypeReference<>() {
-        });
+        Gson gson = new Gson();
+        RepoRet<?> repoRet = gson.fromJson(res, RepoRet.class);
         if (!repoRet.getResult().getResponseStatus().isIsSuccess()) {
             ThirdPartyErrorCodeEnum errorCodeEnum = ThirdPartyErrorCodeEnum.getByCode(repoRet.getResult().getResponseStatus().getErrorCode());
             throw new ThirdPartyException(errorCodeEnum.desc);
@@ -5,6 +5,7 @@ import com.diligrp.etrade.thirdparty.error.ThirdPartyException;
 import com.diligrp.etrade.thirdparty.message.GeneralSendMessage;
 import com.diligrp.etrade.thirdparty.type.ThirdPartyErrorCodeEnum;
 import com.fasterxml.jackson.core.type.TypeReference;
+import com.google.gson.Gson;
 import com.kingdee.bos.webapi.entity.IdentifyInfo;
 import com.kingdee.bos.webapi.entity.OperateParam;
 import com.kingdee.bos.webapi.entity.OperatorResult;
@@ -35,7 +36,6 @@ public class ContactApiUtils extends BaseApiUtils {
         Map<String, Object> map = JsonUtils.fromJsonString(json, new TypeReference<>() {});
         var message = new GeneralSendMessage();
         message.setModel(map);
-        message.setAutoSubmitAndAudit(true);
         return save(JsonUtils.toJsonString(message));
     }
@@ -45,20 +45,19 @@ public class ContactApiUtils extends BaseApiUtils {
         });
         var message = new GeneralSendMessage();
         message.setModel(map);
-        message.setAutoSubmitAndAudit(true);
         save(JsonUtils.toJsonString(message));
     }
     private String save(String json) throws Exception {
         String res = api.save("BD_CommonContact", json);
-        RepoRet repoRet = JsonUtils.fromJsonString(res, new TypeReference<>() {
-        });
+        Gson gson = new Gson();
+        RepoRet<?> repoRet = gson.fromJson(res, RepoRet.class);
         if (!repoRet.getResult().getResponseStatus().isIsSuccess()) {
             ThirdPartyErrorCodeEnum errorCodeEnum = ThirdPartyErrorCodeEnum.getByCode(repoRet.getResult().getResponseStatus().getErrorCode());
             throw new ThirdPartyException(errorCodeEnum.desc);
         }
         log.info("联系人保存接口已完成,{}", res);
-        return repoRet.getResult().getResponseStatus().getSuccessEntitys().get(0).getId();
+        return repoRet.getResult().getResponseStatus().getSuccessEntitys().get(0).getNumber();
     }
     private void unAudit(String FNumber) throws Exception {
@@ -5,6 +5,7 @@ import com.diligrp.etrade.thirdparty.error.ThirdPartyException;
 import com.diligrp.etrade.thirdparty.message.GeneralSendMessage;
 import com.diligrp.etrade.thirdparty.type.ThirdPartyErrorCodeEnum;
 import com.fasterxml.jackson.core.type.TypeReference;
+import com.google.gson.Gson;
 import com.kingdee.bos.webapi.entity.IdentifyInfo;
 import com.kingdee.bos.webapi.entity.OperateParam;
 import com.kingdee.bos.webapi.entity.OperatorResult;
@@ -51,8 +52,8 @@ public class CustomerApiUtils extends BaseApiUtils {
     private String save(String json) throws Exception {
         String res = api.save("BD_Customer", json);
-        RepoRet repoRet = JsonUtils.fromJsonString(res, new TypeReference<>() {
-        });
+        Gson gson = new Gson();
+        RepoRet<?> repoRet = gson.fromJson(res, RepoRet.class);
         if (!repoRet.getResult().getResponseStatus().isIsSuccess()) {
             ThirdPartyErrorCodeEnum errorCodeEnum = ThirdPartyErrorCodeEnum.getByCode(repoRet.getResult().getResponseStatus().getErrorCode());
             throw new ThirdPartyException(errorCodeEnum.desc);
@@ -5,6 +5,7 @@ import com.diligrp.etrade.thirdparty.error.ThirdPartyException;
 import com.diligrp.etrade.thirdparty.message.GeneralSendMessage;
 import com.diligrp.etrade.thirdparty.type.ThirdPartyErrorCodeEnum;
 import com.fasterxml.jackson.core.type.TypeReference;
+import com.google.gson.Gson;
 import com.kingdee.bos.webapi.entity.IdentifyInfo;
 import com.kingdee.bos.webapi.entity.OperateParam;
 import com.kingdee.bos.webapi.entity.OperatorResult;
@@ -52,7 +53,8 @@ public class DepartmentApiUtils extends BaseApiUtils {
     private String save(String json) throws Exception {
         String res = api.save("BD_Department", json);
-        RepoRet repoRet = JsonUtils.fromJsonString(res, new TypeReference<>() {});
+        Gson gson = new Gson();
+        RepoRet<?> repoRet = gson.fromJson(res, RepoRet.class);
         if (!repoRet.getResult().getResponseStatus().isIsSuccess()) {
             ThirdPartyErrorCodeEnum errorCodeEnum = ThirdPartyErrorCodeEnum.getByCode(repoRet.getResult().getResponseStatus().getErrorCode());
             throw new ThirdPartyException(errorCodeEnum.desc);
@@ -5,6 +5,7 @@ import com.diligrp.etrade.thirdparty.error.ThirdPartyException;
 import com.diligrp.etrade.thirdparty.message.GeneralSendMessage;
 import com.diligrp.etrade.thirdparty.type.ThirdPartyErrorCodeEnum;
 import com.fasterxml.jackson.core.type.TypeReference;
+import com.google.gson.Gson;
 import com.kingdee.bos.webapi.entity.IdentifyInfo;
 import com.kingdee.bos.webapi.entity.OperateParam;
 import com.kingdee.bos.webapi.entity.OperatorResult;
@@ -53,8 +54,8 @@ public class FeeApiUtils extends BaseApiUtils {
     private String save(String json) throws Exception {
         String res = api.save("BD_Expense", json);
-        RepoRet repoRet = JsonUtils.fromJsonString(res, new TypeReference<>() {
-        });
+        Gson gson = new Gson();
+        RepoRet<?> repoRet = gson.fromJson(res, RepoRet.class);
         if (!repoRet.getResult().getResponseStatus().isIsSuccess()) {
             ThirdPartyErrorCodeEnum errorCodeEnum = ThirdPartyErrorCodeEnum.getByCode(repoRet.getResult().getResponseStatus().getErrorCode());
             throw new ThirdPartyException(errorCodeEnum.desc);
@@ -5,6 +5,7 @@ import com.diligrp.etrade.thirdparty.error.ThirdPartyException;
 import com.diligrp.etrade.thirdparty.message.GeneralSendMessage;
 import com.diligrp.etrade.thirdparty.type.ThirdPartyErrorCodeEnum;
 import com.fasterxml.jackson.core.type.TypeReference;
+import com.google.gson.Gson;
 import com.kingdee.bos.webapi.entity.IdentifyInfo;
 import com.kingdee.bos.webapi.entity.RepoRet;
 import org.slf4j.Logger;
@@ -47,8 +48,8 @@ public class FeeGroupApiUtils extends BaseApiUtils {
     private String save(String json) throws Exception {
         String res = api.groupSave("BD_Expense", json);
-        RepoRet repoRet = JsonUtils.fromJsonString(res, new TypeReference<>() {
-        });
+        Gson gson = new Gson();
+        RepoRet<?> repoRet = gson.fromJson(res, RepoRet.class);
         if (!repoRet.getResult().getResponseStatus().isIsSuccess()) {
             ThirdPartyErrorCodeEnum errorCodeEnum = ThirdPartyErrorCodeEnum.getByCode(repoRet.getResult().getResponseStatus().getErrorCode());
             throw new ThirdPartyException(errorCodeEnum.desc);
@@ -5,6 +5,7 @@ import com.diligrp.etrade.thirdparty.error.ThirdPartyException;
 import com.diligrp.etrade.thirdparty.message.GeneralSendMessage;
 import com.diligrp.etrade.thirdparty.type.ThirdPartyErrorCodeEnum;
 import com.fasterxml.jackson.core.type.TypeReference;
+import com.google.gson.Gson;
 import com.kingdee.bos.webapi.entity.IdentifyInfo;
 import com.kingdee.bos.webapi.entity.RepoRet;
 import org.slf4j.Logger;
@@ -30,18 +31,18 @@ public class PurchaseOrderApiUtils extends BaseApiUtils {
     public void createOnePurchaseOrder(String json,String formId) throws Exception {
-        Map<String, Object> map = JsonUtils.fromJsonString(json, new TypeReference<>() {
-        });
+        Map<String, Object> map = JsonUtils.fromJsonString(json, new TypeReference<>() {});
         var message = new GeneralSendMessage();
         message.setModel(map);
         message.setAutoSubmitAndAudit(true);
-//        save(JsonUtils.toJsonString(message));
+        save(JsonUtils.toJsonString(message),formId);
         System.out.println(JsonUtils.toJsonString(message));
     }
     private void save(String json,String formId) throws Exception {
         String res = api.save(formId, json);
-        RepoRet repoRet = JsonUtils.fromJsonString(res, new TypeReference<>() {});
+        Gson gson = new Gson();
+        RepoRet<?> repoRet = gson.fromJson(res, RepoRet.class);
         if (!repoRet.getResult().getResponseStatus().isIsSuccess()) {
             ThirdPartyErrorCodeEnum errorCodeEnum = ThirdPartyErrorCodeEnum.getByCode(repoRet.getResult().getResponseStatus().getErrorCode());
             throw new ThirdPartyException(errorCodeEnum.desc);
@@ -5,6 +5,7 @@ import com.diligrp.etrade.thirdparty.error.ThirdPartyException;
 import com.diligrp.etrade.thirdparty.message.GeneralSendMessage;
 import com.diligrp.etrade.thirdparty.type.ThirdPartyErrorCodeEnum;
 import com.fasterxml.jackson.core.type.TypeReference;
+import com.google.gson.Gson;
 import com.kingdee.bos.webapi.entity.IdentifyInfo;
 import com.kingdee.bos.webapi.entity.OperateParam;
 import com.kingdee.bos.webapi.entity.OperatorResult;
@@ -52,8 +53,8 @@ public class SettleTypeApiUtils extends BaseApiUtils {
     private String save(String json) throws Exception {
         String res = api.save("BD_SETTLETYPE", json);
-        RepoRet repoRet = JsonUtils.fromJsonString(res, new TypeReference<>() {
-        });
+        Gson gson = new Gson();
+        RepoRet<?> repoRet = gson.fromJson(res, RepoRet.class);
         if (!repoRet.getResult().getResponseStatus().isIsSuccess()) {
             ThirdPartyErrorCodeEnum errorCodeEnum = ThirdPartyErrorCodeEnum.getByCode(repoRet.getResult().getResponseStatus().getErrorCode());
             throw new ThirdPartyException(errorCodeEnum.desc);