朱园亮 / xingyun-erp · Commits

Commit 5875f3345eaa9e4859382b010d791298095d88f6

Authored by 房远帅
1 parent c23db05a

账期：台账明细-存款拆分

Inline Side-by-side
Showing 2 changed files with 2 additions and 8 deletions
@@ -253,7 +253,7 @@ public class ReceiptLedgerInfoServiceImpl extends BaseMpServiceImpl<ReceiptLedge @@ -253,7 +253,7 @@ public class ReceiptLedgerInfoServiceImpl extends BaseMpServiceImpl<ReceiptLedge
253 logicalDelete(id); 253 logicalDelete(id);
254 } else if ("DEPOSIT".equals(vo.getType())) { 254 } else if ("DEPOSIT".equals(vo.getType())) {
255 // 判断拆分后总数量是否变化 255 // 判断拆分后总数量是否变化
256 - List<BigDecimal> returnedAmountList = vo.getReturnedAmountList(); 256 + List<BigDecimal> returnedAmountList = vo.getSplitQuantityList();
257 boolean match = CommonUtil.isQuantityMatchWithScale(returnedAmountList, receiptLedgerInfo.getReturnedAmount(), 4); 257 boolean match = CommonUtil.isQuantityMatchWithScale(returnedAmountList, receiptLedgerInfo.getReturnedAmount(), 4);
258 if (!match) { 258 if (!match) {
259 throw new DefaultClientException("拆分金额总和必须等于原先回笼资金！"); 259 throw new DefaultClientException("拆分金额总和必须等于原先回笼资金！");
@@ -28,17 +28,11 @@ public class ReceiptLedgerInfoSplitVo extends PageVo implements BaseVo, Serializ @@ -28,17 +28,11 @@ public class ReceiptLedgerInfoSplitVo extends PageVo implements BaseVo, Serializ
28 * 拆分金额集合 28 * 拆分金额集合
29 */ 29 */
30 @ApiModelProperty("拆分金额集合") 30 @ApiModelProperty("拆分金额集合")
  31 + @NotEmpty(message = "拆分金额不能为空")
31 @TypeMismatch(message = "拆分金额格式有误！") 32 @TypeMismatch(message = "拆分金额格式有误！")
32 private List<BigDecimal> splitQuantityList; 33 private List<BigDecimal> splitQuantityList;
33 34
34 /** 35 /**
35 - * 拆分金额集合  
36 - */  
37 - @ApiModelProperty("拆分回笼资金集合")  
38 - @TypeMismatch(message = "拆分回笼资金格式有误！")  
39 - private List<BigDecimal> returnedAmountList;  
40 -  
41 - /**  
42 * 拆分类型：存款：DEPOSIT 欠款：DEBT 36 * 拆分类型：存款：DEPOSIT 欠款：DEBT
43 */ 37 */
44 @ApiModelProperty("拆分类型") 38 @ApiModelProperty("拆分类型")