etrade / zr-report · Commits

Commit 2bf4773d61a5a37e7112e9577db3588632cf4313

Authored by zhangmeiyang
1 parent 851453ed
build: skipped

金蝶对接pt7

Inline Side-by-side
Showing 5 changed files with 28 additions and 7 deletions
etrade-thirdparty/src/main/java/com/diligrp/etrade/thirdparty/component/TransferComponent.java
  View file @2bf4773
... ... @@ -37,7 +37,9 @@ public class TransferComponent {
37 37 * @param systemCode 系统代码
38 38 */
39 39 public void transBaseCo(BaseBillCo co, Long marketId, String systemCode) {
40   - co.setF_PZCW_Text(OperateType.getOperateType(Integer.parseInt(co.getF_PZCW_Text())).getName());
  40 + var code = Integer.parseInt(co.getF_PZCW_Text());
  41 + co.setF_PZCW_Text1(OperateType.getOperateType(code).getName());
  42 + co.setF_PZCW_Text(null);
41 43 co.setFDATE(LocalDateTime.now().format(DateTimeFormatter.ofPattern(Constants.DATE_TIME_FORMAT)));
42 44 co.setFCURRENCYID(new FCURRENCYID());
43 45 co.setFMAINBOOKSTDCURRID(new FMAINBOOKSTDCURRID());
... ...
etrade-thirdparty/src/main/java/com/diligrp/etrade/thirdparty/demarcate/AbstractBillHandler.java
  View file @2bf4773
... ... @@ -68,9 +68,15 @@ public abstract class AbstractBillHandler<T extends BaseBillCo> implements TypeM
68 68 * @param data 数据
69 69 */
70 70 protected static <T extends BaseBillCo> void transferDynamicCustomer(T t, BusinessDetailDto data) {
71   - t.getFTRANSFERID().setFNumber(data.getItemValue());
72   - t.getFORDERID().setFNumber(data.getItemValue());
73   - t.getFCUSTOMERID().setFNumber(data.getItemValue());
  71 + if (!ObjectUtils.isEmpty(t.getFORDERID())){
  72 + t.getFORDERID().setFNumber(data.getItemValue());
  73 + }
  74 + if (!ObjectUtils.isEmpty(t.getFTRANSFERID())){
  75 + t.getFTRANSFERID().setFNumber(data.getItemValue());
  76 + }
  77 + if (!ObjectUtils.isEmpty(t.getFCUSTOMERID())){
  78 + t.getFCUSTOMERID().setFNumber(data.getItemValue());
  79 + }
74 80 }
75 81  
76 82 /**
... ... @@ -240,7 +246,8 @@ public abstract class AbstractBillHandler&lt;T extends BaseBillCo&gt; implements TypeM
240 246 * @return {@link String}
241 247 */
242 248 protected String getDocumentType(Long marketId, String systemCode, String billTypeId) {
243   - return transMapper.getMappingDict(BasicEnum.FINANCIAL_BUSINESS_TYPE_TO_LOWER.code,systemCode, marketId, billTypeId).getMapType();
  249 + var res = transMapper.getMappingDict(BasicEnum.FINANCIAL_BUSINESS_TYPE_TO_LOWER.code,systemCode, marketId, billTypeId);
  250 + return ObjectUtils.isEmpty(res)?null:res.getMapType();
244 251 }
245 252  
246 253  
... ...
etrade-thirdparty/src/main/java/com/diligrp/etrade/thirdparty/domain/co/business/BaseBillCo.java
  View file @2bf4773
... ... @@ -15,6 +15,7 @@ public class BaseBillCo implements Serializable {
15 15 private String systemDynamicCode;
16 16 private String FAR_Remark;
17 17 private String F_PZCW_Text;
  18 + private String F_PZCW_Text1;
18 19 private String FDATE;
19 20 private FBillTypeID FBillTypeID;
20 21 private FSETTLEORGID FSETTLEORGID;
... ... @@ -67,6 +68,15 @@ public class BaseBillCo implements Serializable {
67 68 F_PZCW_Text = f_PZCW_Text;
68 69 }
69 70  
  71 + @JsonProperty("F_PZCW_Text1")
  72 + public String getF_PZCW_Text1() {
  73 + return F_PZCW_Text1;
  74 + }
  75 +
  76 + public void setF_PZCW_Text1(String f_PZCW_Text1) {
  77 + F_PZCW_Text1 = f_PZCW_Text1;
  78 + }
  79 +
70 80 @JsonProperty("FDATE")
71 81 public String getFDATE() {
72 82 return FDATE;
... ...
etrade-thirdparty/src/main/java/com/diligrp/etrade/thirdparty/type/OperateType.java
  View file @2bf4773
... ... @@ -126,8 +126,9 @@ public enum OperateType {
126 126 SELF_WEIGH_SERVICE_FEE_1("自助称重费",8901),
127 127 /**资金复核*/
128 128 FUND_REVIEW("资金复核",10001),
129   - ACCOUNT_TRANSFER_IN("转账-入", 3011),
130   - ACCOUNT_TRANSFER_OUT("转账-出", 3012),
  129 + ACCOUNT_TRANSFER_IN("转账(入)", 3011),
  130 + ACCOUNT_TRANSFER_OUT("转账(出)", 3012),
  131 + BIND_CARD("绑卡", 1039),
131 132 ;
132 133  
133 134 private String name;
... ...
etrade-thirdparty/src/main/java/com/diligrp/etrade/thirdparty/utils/PurchaseOrderApiUtils.java
  View file @2bf4773
... ... @@ -26,6 +26,7 @@ public class PurchaseOrderApiUtils extends BaseApiUtils {
26 26 }
27 27  
28 28 private void save(String json,String formId) throws Exception {
  29 + log.info("采购订单接口json数据：{}", json);
29 30 String res = api.save(formId, json);
30 31 var repoRet = getRepoRet(res);
31 32 log.info("采购订单接口已完成,{}", repoRet);
... ...