Merge remote-tracking branch 'origin/master'

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/appaybill/ApPayBill.java

@@ -3,9 +3,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
-import java.text.SimpleDateFormat;
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.List;
 
 /**
@@ -117,6 +115,10 @@ public class ApPayBill {
         @NotBlank(message = "FPAYTOTALAMOUNTFOR不能为空")
         //表体-应付金额:FPAYTOTALAMOUNTFOR
         public double FPAYTOTALAMOUNTFOR;
+
+         @JsonProperty("FREALPAYAMOUNTFOR_D")//表体-实付金额:FREALPAYAMOUNTFOR_D
+         public double FREALPAYAMOUNTFOR_D;
+
          @JsonProperty("FACCOUNTID")
          @NotBlank(message = "FACCOUNTID不能为空")
          //我方银行账号:FACCOUNTID 第1行分录，银行业务的结算方式，我方银行相关信息必录

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java

@@ -688,11 +688,15 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord
                 && finPaymentrecord.getCost().compareTo(BigDecimal.ZERO) > 0) {
             ApPayBill.FPAYBILLENTRY fpaybillentry = new ApPayBill.FPAYBILLENTRY();
             //手续费
+            BigDecimal FHANDLINGCHARGEFOR = BigDecimal.ZERO;
             if (null != finPaymentrecord.getPaymentCharges()) {
                 fpaybillentry.setFHANDLINGCHARGEFOR(finPaymentrecord.getPaymentCharges().doubleValue());
+                FHANDLINGCHARGEFOR = finPaymentrecord.getPaymentCharges();
             }
             //应付金额
             fpaybillentry.setFPAYTOTALAMOUNTFOR(finPaymentrecord.getCost().doubleValue());
+            //实付金额
+            fpaybillentry.setFREALPAYAMOUNTFOR_D(FHANDLINGCHARGEFOR.add(finPaymentrecord.getCost()).doubleValue());
             //登账日期
             fpaybillentry.setFPOSTDATE(DateUtil.formatDate(finPaymentrecord.getPayDate()));
             //我方银行账号

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/appaybill/data_FPAYBILLENTRY.json

@@ -9,7 +9,7 @@
   "FPAYTOTALAMOUNTFOR": @KD_FPAYTOTALAMOUNTFOR,
   "FPAYAMOUNTFOR_E": @KD_FPAYTOTALAMOUNTFOR,
   "FSETTLEPAYAMOUNTFOR": @KD_FPAYTOTALAMOUNTFOR,
-  "FREALPAYAMOUNTFOR_D": @KD_FPAYTOTALAMOUNTFOR,
+  "FREALPAYAMOUNTFOR_D": @KD_FREALPAYAMOUNTFOR_D,
   "FPAYAMOUNT_E": @KD_FPAYTOTALAMOUNTFOR,
   "FACCOUNTID": {"FNumber":"@KD_FACCOUNTID"},
   "FPOSTDATE": "@KD_FPOSTDATE",