Commit bf6ee4b0 authored by zhangfeng's avatar zhangfeng

feat(wealth): 创建收款单-应收明细

parent 9e33546a
......@@ -153,6 +153,11 @@ public class ReceivableDO extends BaseDO {
*/
private BigDecimal taxAmount;
/**
* 基准金额
*/
private BigDecimal baseAmount;
/**
* 备注
*/
......
......@@ -135,10 +135,10 @@ public interface ReceivableService extends IService<ReceivableDO> {
List<WealthMoneyAmountVO> receivablePageAmount(@Valid ReceivableQueryVO query);
/**
* 获得应收款分页
* 根据订单id获得应收款
*
* @param orderId 订单ID
* @return 应收款分页
* @return 应收款列表
*/
List<ReceivableBackVO> getReceivableByOrderId(Long orderId);
......
......@@ -254,7 +254,15 @@ public class ReceivableServiceImpl extends AbstractService<ReceivableMapper, Rec
@Override
public List<ReceivableBackVO> getReceivableByOrderId(Long orderId) {
return receivableMapper.getReceivableByOrderId(orderId);
List<ReceivableBackVO> receivableBackVOList = receivableMapper.getReceivableByOrderId(orderId);
receivableBackVOList.forEach(receivableBackVO -> {
if (receivableBackVO.getDiscountTotal() == null) {
receivableBackVO.setDiscountTotal(BigDecimal.ZERO);
}
receivableBackVO.setNotIncludedTaxAmount(receivableBackVO.getTotalAmount());
receivableBackVO.setActualAmount(receivableBackVO.getTaxAmount().subtract(receivableBackVO.getDiscountTotal()));
});
return receivableBackVOList;
}
......
......@@ -213,10 +213,16 @@ public class ReceivableBackVO {
@ApiModelProperty(value = "含税金额")
private BigDecimal taxAmount;
@ApiModelProperty(value = "不含税金额")
private BigDecimal notIncludedTaxAmount;
@ApiModelProperty(value = "核销比例")
private BigDecimal writeOffProportion;
//@ApiModelProperty(value = "基准币种汇率")
//private String exchangeRate;
@ApiModelProperty(value = "基准金额")
private BigDecimal baseAmount;
@ApiModelProperty(value = "实际金额")
private BigDecimal actualAmount;
}
......@@ -102,6 +102,9 @@ public class ReceivableBaseVO {
@ApiModelProperty(value = "含税金额")
private BigDecimal taxAmount;
@ApiModelProperty(value = "基准金额")
private BigDecimal baseAmount;
@ApiModelProperty(value = "备注")
private String remark;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment