God 6 months ago
parent
commit
741b189ac8
  1. 1
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java
  2. 3
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebate/ScmCollectionRebateVo.java

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

@ -395,7 +395,6 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord
scmCollectionRebateDto.setBrandName(finPaymentapply.getCarBrandName());
scmCollectionRebateDto.setCollectionTypeKey(finPaymentrecord.getPayWayKey());
scmCollectionRebateDto.setCollectionTypeValue(finPaymentrecord.getPayWayValue());
scmCollectionRebateDto.setUploadDate("");
scmCollectionRebateDto.setManufaSaleChannel("");
scmCollectionRebateDto.setManufaSaleChannelValue(finPaymentapplyDetails.getActualPay());
scmCollectionRebateDto.setCollectionMoney(finPaymentrecord.getCost());

3
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebate/ScmCollectionRebateVo.java

@ -107,8 +107,7 @@ public class ScmCollectionRebateVo implements Vo {
@ApiModelProperty("预提日期")
private String withholdingDate; // 预提日期
@ApiModelProperty("上传日期")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date uploadDate; // 上传日期
private String uploadDate; // 上传日期
@ApiModelProperty("上传金额")
private BigDecimal uploadMoney; // 上传金额
@ApiModelProperty("调整金额")

Loading…
Cancel
Save