Commit 851453edd471768424a9bf5db0eeb12faf90a609

Authored by zhangmeiyang
1 parent 4da27b0e

金蝶对接pt6

etrade-thirdparty/src/main/java/com/diligrp/etrade/thirdparty/demarcate/AbstractBillHandler.java
... ... @@ -240,7 +240,7 @@ public abstract class AbstractBillHandler<T extends BaseBillCo> implements TypeM
240 240 * @return {@link String}
241 241 */
242 242 protected String getDocumentType(Long marketId, String systemCode, String billTypeId) {
243   - return transMapper.getMappingDict(BasicEnum.FINANCIAL_BUSINESS_TYPE_TO_LOWER.code,systemCode, marketId, billTypeId).getMapCategory();
  243 + return transMapper.getMappingDict(BasicEnum.FINANCIAL_BUSINESS_TYPE_TO_LOWER.code,systemCode, marketId, billTypeId).getMapType();
244 244 }
245 245  
246 246  
... ...
etrade-thirdparty/src/main/java/com/diligrp/etrade/thirdparty/handler/basic/BusinessTypeBasicHandler.java
... ... @@ -29,7 +29,7 @@ public class BusinessTypeBasicHandler extends AbstractBasicHandler<BusinessTypeC
29 29 MappingDto mappingData = super.getMappingData(marketId, systemCode, e.getSystemDataId());
30 30 e.setFBILLTYPEID(ObjectUtils.isEmpty(mappingData) ? null : mappingData.getThirdPartyDataId());
31 31 if (!ObjectUtils.isEmpty(mappingData)){
32   - utils.updateBillType(e.getFNumber(),JsonUtils.toJsonString(e));
  32 + utils.updateBillType(mappingData.getThirdPartyDataId(),JsonUtils.toJsonString(e));
33 33 }else {
34 34 String billType = utils.createBillType(JsonUtils.toJsonString(e));
35 35 super.recordMapping(marketId, systemCode, e.getSystemDataId(), billType);
... ...
etrade-thirdparty/src/main/resources/com/diligrp/etrade/thirdparty/mapper/TransMapper.xml
... ... @@ -111,7 +111,7 @@
111 111 `dili-basic-data`.`financial_dict_mapping`
112 112 WHERE
113 113 1 = 1
114   - AND dict_code = #{dictCode}
  114 + AND dict_dd_code = #{dictCode}
115 115 AND market_id = #{marketId}
116 116 AND system_code = #{systemCode}
117 117 AND dict_code = #{billTypeId}
... ...