金蝶对接pt7

zhangmeiyang
1 parent 851453ed
Showing 5 changed files with 28 additions and 7 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/type/OperateType.java
etrade-thirdparty/src/main/java/com/diligrp/etrade/thirdparty/utils/PurchaseOrderApiUtils.java
@@ -37,7 +37,9 @@ public class TransferComponent {
      * @param systemCode 系统代码
      */
     public void transBaseCo(BaseBillCo co, Long marketId, String systemCode) {
-        co.setF_PZCW_Text(OperateType.getOperateType(Integer.parseInt(co.getF_PZCW_Text())).getName());
+        var code = Integer.parseInt(co.getF_PZCW_Text());
+        co.setF_PZCW_Text1(OperateType.getOperateType(code).getName());
+        co.setF_PZCW_Text(null);
         co.setFDATE(LocalDateTime.now().format(DateTimeFormatter.ofPattern(Constants.DATE_TIME_FORMAT)));
         co.setFCURRENCYID(new FCURRENCYID());
         co.setFMAINBOOKSTDCURRID(new FMAINBOOKSTDCURRID());
@@ -68,9 +68,15 @@ public abstract class AbstractBillHandler&lt;T extends BaseBillCo&gt; implements TypeM
      * @param data 数据
      */
     protected static <T extends BaseBillCo> void transferDynamicCustomer(T t, BusinessDetailDto data) {
-        t.getFTRANSFERID().setFNumber(data.getItemValue());
-        t.getFORDERID().setFNumber(data.getItemValue());
-        t.getFCUSTOMERID().setFNumber(data.getItemValue());
+        if (!ObjectUtils.isEmpty(t.getFORDERID())){
+            t.getFORDERID().setFNumber(data.getItemValue());
+        }
+        if (!ObjectUtils.isEmpty(t.getFTRANSFERID())){
+            t.getFTRANSFERID().setFNumber(data.getItemValue());
+        }
+        if (!ObjectUtils.isEmpty(t.getFCUSTOMERID())){
+            t.getFCUSTOMERID().setFNumber(data.getItemValue());
+        }
     }
     /**
@@ -240,7 +246,8 @@ public abstract class AbstractBillHandler&lt;T extends BaseBillCo&gt; implements TypeM
      * @return {@link String}
      */
     protected String getDocumentType(Long marketId, String systemCode, String billTypeId) {
-        return transMapper.getMappingDict(BasicEnum.FINANCIAL_BUSINESS_TYPE_TO_LOWER.code,systemCode, marketId, billTypeId).getMapType();
+        var res = transMapper.getMappingDict(BasicEnum.FINANCIAL_BUSINESS_TYPE_TO_LOWER.code,systemCode, marketId, billTypeId);
+        return ObjectUtils.isEmpty(res)?null:res.getMapType();
     }
@@ -15,6 +15,7 @@ public class BaseBillCo implements Serializable {
     private String systemDynamicCode;
     private String FAR_Remark;
     private String F_PZCW_Text;
+    private String F_PZCW_Text1;
     private String FDATE;
     private FBillTypeID FBillTypeID;
     private FSETTLEORGID FSETTLEORGID;
@@ -67,6 +68,15 @@ public class BaseBillCo implements Serializable {
         F_PZCW_Text = f_PZCW_Text;
     }
+    @JsonProperty("F_PZCW_Text1")
+    public String getF_PZCW_Text1() {
+        return F_PZCW_Text1;
+    }
+
+    public void setF_PZCW_Text1(String f_PZCW_Text1) {
+        F_PZCW_Text1 = f_PZCW_Text1;
+    }
+
     @JsonProperty("FDATE")
     public String getFDATE() {
         return FDATE;
@@ -126,8 +126,9 @@ public enum OperateType {
     SELF_WEIGH_SERVICE_FEE_1("自助称重费",8901),
     /**资金复核*/
     FUND_REVIEW("资金复核",10001),
-    ACCOUNT_TRANSFER_IN("转账-入", 3011),
-    ACCOUNT_TRANSFER_OUT("转账-出", 3012),
+    ACCOUNT_TRANSFER_IN("转账(入)", 3011),
+    ACCOUNT_TRANSFER_OUT("转账(出)", 3012),
+    BIND_CARD("绑卡", 1039),
     ;
     private String name;
@@ -26,6 +26,7 @@ public class PurchaseOrderApiUtils extends BaseApiUtils {
     }
     private void save(String json,String formId) throws Exception {
+        log.info("采购订单接口json数据：{}", json);
         String res = api.save(formId, json);
         var repoRet = getRepoRet(res);
         log.info("采购订单接口已完成,{}", repoRet);