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

@@ -235,21 +235,42 @@ public class ReceiptLedgerInfoServiceImpl extends BaseMpServiceImpl<ReceiptLedge
         if (receiptLedgerInfo == null) {
         if (receiptLedgerInfo == null) {
             throw new DefaultClientException("应收款台账明细不存在！");
             throw new DefaultClientException("应收款台账明细不存在！");
         }
         }
-        // 判断拆分后总数量是否变化
-        List<BigDecimal> splitQuantityList = vo.getSplitQuantityList();
-        boolean match = CommonUtil.isQuantityMatchWithScale(splitQuantityList, receiptLedgerInfo.getStartAccountReceivable(), 4);
-        if (!match) {
-            throw new DefaultClientException("拆分金额总和必须等于原先期初应收账款金额！");
-        }
-        // 封装数据
-        List<ReceiptLedgerInfo> detailList = new ArrayList<>();
-        for (BigDecimal quantity : splitQuantityList) {
-            ReceiptLedgerInfo data = getReceiptLedgerInfo(quantity, receiptLedgerInfo);
-            detailList.add(data);
-        }
-        getBaseMapper().batchAdd(detailList);
-        //删除应收款台账明细（逻辑删除）
-        logicalDelete(id);
+        if ("DEBT".equals(vo.getType())) {
+            // 判断拆分后总数量是否变化
+            List<BigDecimal> splitQuantityList = vo.getSplitQuantityList();
+            boolean match = CommonUtil.isQuantityMatchWithScale(splitQuantityList, receiptLedgerInfo.getStartAccountReceivable(), 4);
+            if (!match) {
+                throw new DefaultClientException("拆分金额总和必须等于原先期初应收账款金额！");
+            }
+            // 封装数据
+            List<ReceiptLedgerInfo> detailList = new ArrayList<>();
+            for (BigDecimal quantity : splitQuantityList) {
+                ReceiptLedgerInfo data = getReceiptLedgerInfo(quantity, receiptLedgerInfo, vo.getType());
+                detailList.add(data);
+            }
+            getBaseMapper().batchAdd(detailList);
+            //删除应收款台账明细（逻辑删除）
+            logicalDelete(id);
+        } else if ("DEPOSIT".equals(vo.getType())) {
+            // 判断拆分后总数量是否变化
+            List<BigDecimal> returnedAmountList = vo.getReturnedAmountList();
+            boolean match = CommonUtil.isQuantityMatchWithScale(returnedAmountList, receiptLedgerInfo.getReturnedAmount(), 4);
+            if (!match) {
+                throw new DefaultClientException("拆分金额总和必须等于原先回笼资金！");
+            }
+            // 封装数据
+            List<ReceiptLedgerInfo> detailList = new ArrayList<>();
+            for (BigDecimal quantity : returnedAmountList) {
+                ReceiptLedgerInfo data = getReceiptLedgerInfo(quantity, receiptLedgerInfo, vo.getType());
+                detailList.add(data);
+            }
+            getBaseMapper().batchAdd(detailList);
+            //删除应收款台账明细（逻辑删除）
+            logicalDelete(id);
+        } else {
+            throw new DefaultClientException("拆分类型有误！");
+        }
+
     }
     }
 
 
 
 
@@ -258,9 +279,10 @@ public class ReceiptLedgerInfoServiceImpl extends BaseMpServiceImpl<ReceiptLedge
      *
      *
      * @param quantity 数量
      * @param quantity 数量
      * @param vo       原数据
      * @param vo       原数据
+     * @param type     拆分类型：存款：DEPOSIT  欠款：DEBT
      * @return ReceiptLedgerInfo
      * @return ReceiptLedgerInfo
      */
      */
-    private static ReceiptLedgerInfo getReceiptLedgerInfo(BigDecimal quantity, ReceiptLedgerInfo vo) {
+    private static ReceiptLedgerInfo getReceiptLedgerInfo(BigDecimal quantity, ReceiptLedgerInfo vo, String type) {
         String userId = SecurityUtil.getCurrentUser().getId();
         String userId = SecurityUtil.getCurrentUser().getId();
         ReceiptLedgerInfo data = new ReceiptLedgerInfo();
         ReceiptLedgerInfo data = new ReceiptLedgerInfo();
         data.setId(IdUtil.getId());
         data.setId(IdUtil.getId());
@@ -275,13 +297,26 @@ public class ReceiptLedgerInfoServiceImpl extends BaseMpServiceImpl<ReceiptLedge
         data.setCustomerId(vo.getCustomerId());
         data.setCustomerId(vo.getCustomerId());
         data.setFactoryType(vo.getFactoryType());
         data.setFactoryType(vo.getFactoryType());
         data.setShipmentDate(vo.getShipmentDate());
         data.setShipmentDate(vo.getShipmentDate());
-        data.setStartAccountReceivable(quantity);
+        if ("DEBT".equals(type)) {
+            data.setStartAccountReceivable(quantity);
+        } else {
+            data.setStartAccountReceivable(vo.getStartAccountReceivable());
+        }
         data.setArrivalDate(vo.getArrivalDate());
         data.setArrivalDate(vo.getArrivalDate());
         data.setProcessedDate(vo.getProcessedDate());
         data.setProcessedDate(vo.getProcessedDate());
         data.setActualReturnedDate(vo.getActualReturnedDate());
         data.setActualReturnedDate(vo.getActualReturnedDate());
-        data.setReturnedAmount(vo.getReturnedAmount());
-        //拆分的时候期末应收账款=期初-回笼资金（这时候为0）
-        data.setEndAccountReceivable(quantity);
+        if ("DEPOSIT".equals(type)) {
+            data.setReturnedAmount(quantity);
+        } else {
+            data.setReturnedAmount(vo.getReturnedAmount());
+        }
+        if ("DEBT".equals(type)) {
+            //欠款拆分的时候期末应收账款=期初-回笼资金（这时候为0）
+            data.setEndAccountReceivable(quantity);
+        } else {
+            //存款拆分的时候期末应收账款=回笼资金取负数
+            data.setEndAccountReceivable(quantity.negate());
+        }
         data.setApplyStatus(vo.getApplyStatus());
         data.setApplyStatus(vo.getApplyStatus());
         data.setCoordinateDate(vo.getCoordinateDate());
         data.setCoordinateDate(vo.getCoordinateDate());
         data.setRemark(vo.getRemark());
         data.setRemark(vo.getRemark());

@@ -28,7 +28,20 @@ public class ReceiptLedgerInfoSplitVo extends PageVo implements BaseVo, Serializ
      * 拆分金额集合
      * 拆分金额集合
      */
      */
     @ApiModelProperty("拆分金额集合")
     @ApiModelProperty("拆分金额集合")
-    @NotEmpty(message = "拆分金额不能为空")
     @TypeMismatch(message = "拆分金额格式有误！")
     @TypeMismatch(message = "拆分金额格式有误！")
     private List<BigDecimal> splitQuantityList;
     private List<BigDecimal> splitQuantityList;
+
+    /**
+     * 拆分金额集合
+     */
+    @ApiModelProperty("拆分回笼资金集合")
+    @TypeMismatch(message = "拆分回笼资金格式有误！")
+    private List<BigDecimal> returnedAmountList;
+
+    /**
+     * 拆分类型：存款：DEPOSIT  欠款：DEBT
+     */
+    @ApiModelProperty("拆分类型")
+    @NotBlank(message = "拆分类型不能为空！")
+    private String type;
 }
 }