Browse Source

出纳代付款办理时增加手续费

master
fanzongzhe 11 months ago
parent
commit
28d166b4b2
  1. 2
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecord.java
  2. 3
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordUpdateDto.java
  3. 2
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/appaybill/ApPayBill.java
  4. 6
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java
  5. 1
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/appaybill/ApPayBillService.java
  6. 3
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/appaybill/data_FPAYBILLENTRY.json

2
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecord.java

@ -115,4 +115,6 @@ public class FinPaymentrecord extends BaseEntity {
private String purchaseSystemName; // 采购系统名称 private String purchaseSystemName; // 采购系统名称
@ApiModelProperty("付款时备注内容") @ApiModelProperty("付款时备注内容")
private String busRemarks; private String busRemarks;
@ApiModelProperty(value = "付款手续费")
private BigDecimal paymentCharges;
} }

3
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordUpdateDto.java

@ -52,4 +52,7 @@ public class FinPaymentrecordUpdateDto implements Dto {
private String cost; private String cost;
@ApiModelProperty(value = "应收金额") @ApiModelProperty(value = "应收金额")
private String accountsReceive; private String accountsReceive;
@ApiModelProperty(value = "付款手续费")
private String paymentCharges;
} }

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

@ -86,6 +86,8 @@ public class ApPayBill {
/** /**
* 结算方式:FSETTLETYPEIDKey (必填项) * 结算方式:FSETTLETYPEIDKey (必填项)
*/ */
@JsonProperty("FHANDLINGCHARGEFOR")
public double FHANDLINGCHARGEFOR; //手续费
@JsonProperty("FSETTLETYPEIDKey") @JsonProperty("FSETTLETYPEIDKey")
@NotBlank(message = "FSETTLETYPEIDKey不能为空") @NotBlank(message = "FSETTLETYPEIDKey不能为空")
public String FSETTLETYPEIDKey; public String FSETTLETYPEIDKey;

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

@ -592,6 +592,10 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord
if (finPaymentrecord.getCost() != null if (finPaymentrecord.getCost() != null
&& finPaymentrecord.getCost().compareTo(BigDecimal.ZERO) > 0) { && finPaymentrecord.getCost().compareTo(BigDecimal.ZERO) > 0) {
ApPayBill.FPAYBILLENTRY fpaybillentry = new ApPayBill.FPAYBILLENTRY(); ApPayBill.FPAYBILLENTRY fpaybillentry = new ApPayBill.FPAYBILLENTRY();
//手续费
if (null != finPaymentrecord.getPaymentCharges()) {
fpaybillentry.setFHANDLINGCHARGEFOR(finPaymentrecord.getPaymentCharges().doubleValue());
}
//应付金额 //应付金额
fpaybillentry.setFPAYTOTALAMOUNTFOR(finPaymentrecord.getCost().doubleValue()); fpaybillentry.setFPAYTOTALAMOUNTFOR(finPaymentrecord.getCost().doubleValue());
//登账日期 //登账日期
@ -1098,4 +1102,4 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord
} }
} }

1
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/appaybill/ApPayBillService.java

@ -12,6 +12,7 @@ import com.yxt.anrui.portal.api.sysmapping.SysMappingInfoQuery;
import com.yxt.anrui.portal.api.sysmapping.SysMappingInfoQueryBatch; import com.yxt.anrui.portal.api.sysmapping.SysMappingInfoQueryBatch;
import com.yxt.anrui.portal.api.sysmapping.SysMappingInfoVo; import com.yxt.anrui.portal.api.sysmapping.SysMappingInfoVo;
import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.result.ResultBean;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.ArrayList; import java.util.ArrayList;

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

@ -5,6 +5,7 @@
"FPURPOSEID": { "FPURPOSEID": {
"FNumber": "@KD_FPURPOSEID" "FNumber": "@KD_FPURPOSEID"
}, },
"FHANDLINGCHARGEFOR": @KD_FHANDLINGCHARGEFOR,
"FPAYTOTALAMOUNTFOR": @KD_FPAYTOTALAMOUNTFOR, "FPAYTOTALAMOUNTFOR": @KD_FPAYTOTALAMOUNTFOR,
"FPAYAMOUNTFOR_E": @KD_FPAYTOTALAMOUNTFOR, "FPAYAMOUNTFOR_E": @KD_FPAYTOTALAMOUNTFOR,
"FSETTLEPAYAMOUNTFOR": @KD_FPAYTOTALAMOUNTFOR, "FSETTLEPAYAMOUNTFOR": @KD_FPAYTOTALAMOUNTFOR,
@ -14,4 +15,4 @@
"FPOSTDATE": "@KD_FPOSTDATE", "FPOSTDATE": "@KD_FPOSTDATE",
"FRuZhangType": "1", "FRuZhangType": "1",
"FPayType": "A" "FPayType": "A"
} }

Loading…
Cancel
Save