账期：台账明细-存款平账

@@ -10,7 +10,6 @@ import com.lframework.xingyun.sc.vo.ledger.receipt.*;
 import com.lframework.xingyun.sc.service.ledger.ReceiptLedgerInfoService;
 import com.lframework.xingyun.sc.entity.ReceiptLedgerInfo;
 import com.lframework.starter.web.core.utils.PageResultUtil;
-
 import javax.annotation.Resource;
 import javax.validation.constraints.NotBlank;
 import com.lframework.starter.common.exceptions.impl.DefaultClientException;
@@ -28,8 +27,13 @@ import com.lframework.starter.web.core.controller.DefaultBaseController;
 import com.lframework.starter.web.core.annotations.security.HasPermission;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
-
 import javax.validation.Valid;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.time.format.DateTimeFormatter;
+import java.time.temporal.TemporalAdjusters;
+import java.util.Comparator;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -182,4 +186,76 @@ public class ReceiptLedgerInfoController extends DefaultBaseController {
         receiptLedgerInfoService.againGenerate();
         return InvokeResultBuilder.success();
     }
+
+    /**
+     * 存款平账
+     */
+    @ApiOperation("存款平账")
+    @HasPermission({"account-manage:ledger-detail:reconciliation"})
+    @PostMapping("/depositReconciliation")
+    public InvokeResult<Void> reconciliation(@NotBlank(message = "id不能为空！") String id) {
+        ReceiptLedgerInfo data = receiptLedgerInfoService.findById(id);
+        if (data == null) {
+            throw new DefaultClientException("应收款台账明细不存在！");
+        }
+        //订货单位、厂别、办事处、贸易类型匹配台账数据
+        QueryReceiptLedgerInfoVo vo1 = new QueryReceiptLedgerInfoVo();
+        vo1.setCustomerId(data.getCustomerId());
+        vo1.setFactoryType(data.getFactoryType());
+        vo1.setDeptId(data.getDeptId());
+        vo1.setType(data.getType());
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+        // 获取当前日期时间（不带时区）
+        LocalDateTime now = LocalDateTime.now();
+        // 当前月的第一天 00:00:00
+        LocalDateTime firstDay = now.with(TemporalAdjusters.firstDayOfMonth())
+                .with(LocalTime.MIN); // 等价于 .withHour(0).withMinute(0).withSecond(0)
+        // 当前月的最后一天 23:59:59
+        LocalDateTime lastDay = now.with(TemporalAdjusters.lastDayOfMonth())
+                .withHour(23)
+                .withMinute(59)
+                .withSecond(59)
+                .withNano(0);
+        // 格式化为字符串
+        String startStr = firstDay.format(formatter);
+        String endStr = lastDay.format(formatter);
+        vo1.setCreateTimeStart(startStr);
+        vo1.setCreateTimeEnd(endStr);
+        //存款
+        vo1.setDebtStatus("DEPOSIT");
+        List<ReceiptLedgerInfo> query = receiptLedgerInfoService.query(vo1);
+        if (CollectionUtil.isNotEmpty(query)) {
+            //不为空代表有存款-可以平账
+            //回笼资金=期初应收款  有多条占用天数多的先平账
+            List<ReceiptLedgerInfo> result = query.stream()
+                    // 1. 过滤：startAccountReceivable 等于 returnedAmount
+                    .filter(item -> {
+                        BigDecimal start = item.getReturnedAmount();
+                        return start != null
+                                && data.getStartAccountReceivable() != null
+                                && start.compareTo(data.getStartAccountReceivable()) == 0;
+                    })
+                    // 2. 排序：按 actualReturnedDate 升序（早的在前）
+                    .sorted(Comparator.comparing(ReceiptLedgerInfo::getActualReturnedDate))
+                    .collect(Collectors.toList());
+            if (CollectionUtil.isNotEmpty(result)) {
+                //欠款平账
+                UpdateReceiptLedgerInfoVo updateVo = new UpdateReceiptLedgerInfoVo();
+                updateVo.setReturnedAmount(result.get(0).getReturnedAmount());
+                updateVo.setActualReturnedDate(result.get(0).getActualReturnedDate());
+                updateVo.setEndAccountReceivable(BigDecimal.ZERO);
+                updateVo.setId(id);
+                receiptLedgerInfoService.reconciliation(updateVo);
+                //存款平账
+                UpdateReceiptLedgerInfoVo updateVo1 = new UpdateReceiptLedgerInfoVo();
+                updateVo1.setId(result.get(0).getId());
+                receiptLedgerInfoService.depositReconciliation(updateVo);
+            } else {
+                throw new DefaultClientException("没有匹配的存款台账明细数据！");
+            }
+        } else {
+            throw new DefaultClientException("没有匹配的存款台账明细数据！");
+        }
+        return InvokeResultBuilder.success();
+    }
 }

@@ -37,6 +37,10 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.time.format.DateTimeFormatter;
+import java.time.temporal.TemporalAdjusters;
 import java.util.Comparator;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -95,6 +99,23 @@ public class RecapitalizeServiceImpl extends BaseMpServiceImpl<RecapitalizeMappe
         vo1.setFactoryType(vo.getFactoryType());
         vo1.setDeptId(vo.getDeptId());
         vo1.setType(vo.getType());
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+        // 获取当前日期时间（不带时区）
+        LocalDateTime now = LocalDateTime.now();
+        // 当前月的第一天 00:00:00
+        LocalDateTime firstDay = now.with(TemporalAdjusters.firstDayOfMonth())
+                .with(LocalTime.MIN); // 等价于 .withHour(0).withMinute(0).withSecond(0)
+        // 当前月的最后一天 23:59:59
+        LocalDateTime lastDay = now.with(TemporalAdjusters.lastDayOfMonth())
+                .withHour(23)
+                .withMinute(59)
+                .withSecond(59)
+                .withNano(0);
+        // 格式化为字符串
+        String startStr = firstDay.format(formatter);
+        String endStr = lastDay.format(formatter);
+        vo1.setCreateTimeStart(startStr);
+        vo1.setCreateTimeEnd(endStr);
         List<ReceiptLedgerInfo> query = receiptLedgerInfoService.query(vo1);
         if (CollectionUtil.isNotEmpty(query)) {
             //不为空代表有欠款-需要平账

@@ -788,4 +788,22 @@ public class ReceiptLedgerInfoServiceImpl extends BaseMpServiceImpl<ReceiptLedge
         }
         return result;
     }
+
+    @OpLog(type = OtherOpLogType.class, name = "存款平账，ID：{}", params = {"#id"})
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public void depositReconciliation(UpdateReceiptLedgerInfoVo vo) {
+        ReceiptLedgerInfo data = getBaseMapper().selectById(vo.getId());
+        if (ObjectUtil.isNull(data)) {
+            throw new DefaultClientException("应收款台账明细不存在！");
+        }
+        LambdaUpdateWrapper<ReceiptLedgerInfo> updateWrapper = Wrappers.lambdaUpdate(ReceiptLedgerInfo.class)
+                .set(ReceiptLedgerInfo::getEndAccountReceivable, BigDecimal.ZERO)
+                .set(ReceiptLedgerInfo::getDebtStatus, "CLEARED")
+                .eq(ReceiptLedgerInfo::getId, vo.getId());
+
+        getBaseMapper().update(updateWrapper);
+        OpLogUtil.setVariable("id", data.getId());
+        OpLogUtil.setExtra(vo);
+    }
 }

@@ -107,7 +107,7 @@ public interface ReceiptLedgerInfoService extends BaseMpService<ReceiptLedgerInf
     void updateCoordinateDate(String id, LocalDate coordinateDate, String debtStatus);
 
     /**
-     * 平账
+     * 欠款平账
      *
      * @param vo 数据
      */
@@ -123,4 +123,11 @@ public interface ReceiptLedgerInfoService extends BaseMpService<ReceiptLedgerInf
      * 重新生成新的台账数据
      */
     void againGenerate();
+
+    /**
+     * 存款平账
+     *
+     * @param vo
+     */
+    void depositReconciliation(UpdateReceiptLedgerInfoVo vo);
 }

@@ -87,4 +87,7 @@ public class QueryReceiptLedgerInfoVo extends PageVo implements BaseVo, Serializ
     @ApiModelProperty("厂别")
     private String factoryType;
 
+    @ApiModelProperty("欠款状态")
+    private String debtStatus;
+
 }

@@ -128,6 +128,9 @@
             <if test="vo.deptName != null and vo.deptName != ''">
                 AND d.name LIKE CONCAT('%', #{vo.deptName}, '%')
             </if>
+            <if test="vo.debtStatus != null and vo.debtStatus != ''">
+                AND tb.debt_status = #{vo.debtStatus}
+            </if>
         </where>
     </select>