回笼资金：区分内外贸；新增、导入对台账明细进行平账或存款

@@ -971,6 +971,7 @@ CREATE TABLE `tbl_recapitalize` (
     `returned_amount` decimal(15,4) DEFAULT NULL COMMENT '回笼金额',
     `returned_amount` decimal(15,4) DEFAULT NULL COMMENT '回笼金额',
     `dept_id` varchar(32) DEFAULT NULL COMMENT '办事处ID',
     `dept_id` varchar(32) DEFAULT NULL COMMENT '办事处ID',
     `factory_type` varchar(50) DEFAULT NULL COMMENT '厂别',
     `factory_type` varchar(50) DEFAULT NULL COMMENT '厂别',
+    `type` varchar(50) DEFAULT NULL COMMENT '贸易类型：外贸: OUTSIDE  内贸：INSIDE',
     `create_by_id` varchar(32) NOT NULL COMMENT '创建人ID',
     `create_by_id` varchar(32) NOT NULL COMMENT '创建人ID',
     `create_by` varchar(20) NOT NULL COMMENT '创建人',
     `create_by` varchar(20) NOT NULL COMMENT '创建人',
     `update_by_id` varchar(32) NOT NULL COMMENT '更新人ID',
     `update_by_id` varchar(32) NOT NULL COMMENT '更新人ID',

@@ -74,6 +74,12 @@ public class GetRecapitalizeBo extends BaseBo<Recapitalize> {
     @ApiModelProperty("厂别名称")
     @ApiModelProperty("厂别名称")
     private String factoryTypeName;
     private String factoryTypeName;
 
 
+    /**
+     * 贸易类型：外贸: OUTSIDE  内贸：INSIDE
+     */
+    @ApiModelProperty("贸易类型")
+    private String type;
+
     public GetRecapitalizeBo() {
     public GetRecapitalizeBo() {
 
 
     }
     }

@@ -74,6 +74,12 @@ public class QueryRecapitalizeBo extends BaseBo<Recapitalize> {
     @ApiModelProperty("厂别名称")
     @ApiModelProperty("厂别名称")
     private String factoryTypeName;
     private String factoryTypeName;
 
 
+    /**
+     * 贸易类型：外贸: OUTSIDE  内贸：INSIDE
+     */
+    @ApiModelProperty("贸易类型")
+    private String type;
+
     public QueryRecapitalizeBo() {
     public QueryRecapitalizeBo() {
 
 
     }
     }

@@ -138,10 +138,12 @@ public class RecapitalizeController extends DefaultBaseController {
     @HasPermission({"account-manage:recoup-funds:import"})
     @HasPermission({"account-manage:recoup-funds:import"})
     @PostMapping("/import")
     @PostMapping("/import")
     public InvokeResult<Void> importExcel(@NotBlank(message = "ID不能为空") String id,
     public InvokeResult<Void> importExcel(@NotBlank(message = "ID不能为空") String id,
-                                          @NotNull(message = "请上传文件") MultipartFile file) {
+                                          @NotNull(message = "请上传文件") MultipartFile file,
+                                          @NotBlank(message = "贸易类型不能为空") String type) {
 
 
         RecapitalizeImportListener listener = new RecapitalizeImportListener();
         RecapitalizeImportListener listener = new RecapitalizeImportListener();
         listener.setTaskId(id);
         listener.setTaskId(id);
+        listener.setType(type);
         ExcelUtil.read(file, RecapitalizeImportModel.class, listener).sheet().doRead();
         ExcelUtil.read(file, RecapitalizeImportModel.class, listener).sheet().doRead();
 
 
         return InvokeResultBuilder.success();
         return InvokeResultBuilder.success();

@@ -67,6 +67,11 @@ public class Recapitalize extends BaseEntity implements BaseDto {
     private String factoryType;
     private String factoryType;
 
 
     /**
     /**
+     * 贸易类型：外贸: OUTSIDE  内贸：INSIDE
+     */
+    private String type;
+
+    /**
      * 厂别名称
      * 厂别名称
      */
      */
     @TableField(exist = false)
     @TableField(exist = false)

@@ -22,11 +22,18 @@ import java.util.List;
 
 
 @Slf4j
 @Slf4j
 public class RecapitalizeImportListener extends ExcelImportListener<RecapitalizeImportModel> {
 public class RecapitalizeImportListener extends ExcelImportListener<RecapitalizeImportModel> {
+  //用于接收贸易类型
+  private String type;
+
+  public void setType(String type) {
+    this.type = type;
+  }
 
 
   @Override
   @Override
   protected void doInvoke(RecapitalizeImportModel data, AnalysisContext context) {
   protected void doInvoke(RecapitalizeImportModel data, AnalysisContext context) {
     CustomerService customerService = ApplicationUtil.getBean(CustomerService.class);
     CustomerService customerService = ApplicationUtil.getBean(CustomerService.class);
     SysDeptService sysDeptService = ApplicationUtil.getBean(SysDeptService.class);
     SysDeptService sysDeptService = ApplicationUtil.getBean(SysDeptService.class);
+    data.setType(this.type);
     if (StringUtil.isBlank(data.getRecapitalizeDateStr())) {
     if (StringUtil.isBlank(data.getRecapitalizeDateStr())) {
       throw new DefaultClientException(
       throw new DefaultClientException(
               "第" + context.readRowHolder().getRowIndex() + "行“资金回笼日期”不能为空");
               "第" + context.readRowHolder().getRowIndex() + "行“资金回笼日期”不能为空");
@@ -89,7 +96,7 @@ public class RecapitalizeImportListener extends ExcelImportListener<Recapitalize
       } else {
       } else {
         if (deptByName.size() > 1) {
         if (deptByName.size() > 1) {
           throw new DefaultClientException(
           throw new DefaultClientException(
-                  "第" + context.readRowHolder().getRowIndex() + "行“办事处”存在多个同名区域");
+                  "第" + context.readRowHolder().getRowIndex() + "行“办事处”存在多个同名办事处");
         } else {
         } else {
           SysDept sysDept = deptByName.get(0);
           SysDept sysDept = deptByName.get(0);
           data.setDeptId(sysDept.getId());
           data.setDeptId(sysDept.getId());
@@ -125,6 +132,7 @@ public class RecapitalizeImportListener extends ExcelImportListener<Recapitalize
       vo.setReturnedAmount(data.getReturnedAmount());
       vo.setReturnedAmount(data.getReturnedAmount());
       vo.setDeptId(data.getDeptId());
       vo.setDeptId(data.getDeptId());
       vo.setFactoryType(data.getFactoryType());
       vo.setFactoryType(data.getFactoryType());
+      vo.setType(data.getType());
       recapitalizeService.create(vo);
       recapitalizeService.create(vo);
       this.setSuccessProcess(i);
       this.setSuccessProcess(i);
     }
     }

@@ -80,4 +80,10 @@ public class RecapitalizeImportModel implements ExcelModel {
     @ExcelIgnore
     @ExcelIgnore
     private String factoryType;
     private String factoryType;
 
 
+    /**
+     * 贸易类型
+     */
+    @ExcelIgnore
+    private String type;
+
 }
 }

@@ -3,6 +3,8 @@ package com.lframework.xingyun.sc.impl.ledger;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.github.pagehelper.PageInfo;
 import com.github.pagehelper.PageInfo;
+import com.lframework.starter.common.utils.CollectionUtil;
+import com.lframework.starter.common.utils.StringUtil;
 import com.lframework.starter.web.core.impl.BaseMpServiceImpl;
 import com.lframework.starter.web.core.impl.BaseMpServiceImpl;
 import com.lframework.starter.web.core.utils.PageResultUtil;
 import com.lframework.starter.web.core.utils.PageResultUtil;
 import com.lframework.starter.web.core.utils.OpLogUtil;
 import com.lframework.starter.web.core.utils.OpLogUtil;
@@ -15,19 +17,38 @@ import com.lframework.starter.web.inner.components.oplog.OtherOpLogType;
 import com.lframework.starter.web.core.components.resp.PageResult;
 import com.lframework.starter.web.core.components.resp.PageResult;
 import com.lframework.starter.common.utils.ObjectUtil;
 import com.lframework.starter.common.utils.ObjectUtil;
 import com.lframework.starter.common.utils.Assert;
 import com.lframework.starter.common.utils.Assert;
+import com.lframework.xingyun.basedata.entity.CustomerShort;
+import com.lframework.xingyun.basedata.service.customer.CustomerShortService;
+import com.lframework.xingyun.basedata.vo.customer.QueryCustomerShortVo;
+import com.lframework.xingyun.sc.entity.CustomerCredit;
 import com.lframework.xingyun.sc.entity.Recapitalize;
 import com.lframework.xingyun.sc.entity.Recapitalize;
+import com.lframework.xingyun.sc.entity.ReceiptLedgerInfo;
 import com.lframework.xingyun.sc.mappers.RecapitalizeMapper;
 import com.lframework.xingyun.sc.mappers.RecapitalizeMapper;
+import com.lframework.xingyun.sc.service.customer.CustomerCreditService;
 import com.lframework.xingyun.sc.service.ledger.RecapitalizeService;
 import com.lframework.xingyun.sc.service.ledger.RecapitalizeService;
+import com.lframework.xingyun.sc.service.ledger.ReceiptLedgerInfoService;
 import com.lframework.xingyun.sc.vo.ledger.recapitalize.CreateRecapitalizeVo;
 import com.lframework.xingyun.sc.vo.ledger.recapitalize.CreateRecapitalizeVo;
 import com.lframework.xingyun.sc.vo.ledger.recapitalize.QueryRecapitalizeVo;
 import com.lframework.xingyun.sc.vo.ledger.recapitalize.QueryRecapitalizeVo;
 import com.lframework.xingyun.sc.vo.ledger.recapitalize.UpdateRecapitalizeVo;
 import com.lframework.xingyun.sc.vo.ledger.recapitalize.UpdateRecapitalizeVo;
+import com.lframework.xingyun.sc.vo.ledger.receipt.CreateReceiptLedgerInfoVo;
+import com.lframework.xingyun.sc.vo.ledger.receipt.QueryReceiptLedgerInfoVo;
+import com.lframework.xingyun.sc.vo.ledger.receipt.UpdateReceiptLedgerInfoVo;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
-
+import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.util.Comparator;
 import java.util.List;
 import java.util.List;
+import java.util.stream.Collectors;
 
 
 @Service
 @Service
 public class RecapitalizeServiceImpl extends BaseMpServiceImpl<RecapitalizeMapper, Recapitalize> implements RecapitalizeService {
 public class RecapitalizeServiceImpl extends BaseMpServiceImpl<RecapitalizeMapper, Recapitalize> implements RecapitalizeService {
+    @Resource
+    private ReceiptLedgerInfoService receiptLedgerInfoService;
+    @Resource
+    private CustomerShortService customerShortService;
+    @Resource
+    private CustomerCreditService customerCreditService;
 
 
     @Override
     @Override
     public PageResult<Recapitalize> query(Integer pageIndex, Integer pageSize, QueryRecapitalizeVo vo) {
     public PageResult<Recapitalize> query(Integer pageIndex, Integer pageSize, QueryRecapitalizeVo vo) {
@@ -65,9 +86,71 @@ public class RecapitalizeServiceImpl extends BaseMpServiceImpl<RecapitalizeMappe
         data.setReturnedAmount(vo.getReturnedAmount());
         data.setReturnedAmount(vo.getReturnedAmount());
         data.setDeptId(vo.getDeptId());
         data.setDeptId(vo.getDeptId());
         data.setFactoryType(vo.getFactoryType());
         data.setFactoryType(vo.getFactoryType());
+        data.setType(vo.getType());
 
 
         getBaseMapper().insert(data);
         getBaseMapper().insert(data);
-        //todo fys 需要对台账处理
+        //订货单位、厂别、办事处、贸易类型匹配台账数据
+        QueryReceiptLedgerInfoVo vo1 = new QueryReceiptLedgerInfoVo();
+        vo1.setCustomerId(vo.getOrderingUnit());
+        vo1.setFactoryType(vo.getFactoryType());
+        vo1.setDeptId(vo.getDeptId());
+        vo1.setType(vo.getType());
+        List<ReceiptLedgerInfo> query = receiptLedgerInfoService.query(vo1);
+        if (CollectionUtil.isNotEmpty(query)) {
+            //不为空代表有欠款-需要平账
+            //期初应收款=回笼资金  有多条占用天数多的先平账
+            List<ReceiptLedgerInfo> result = query.stream()
+                    // 1. 过滤：startAccountReceivable 等于 returnedAmount
+                    .filter(item -> {
+                        BigDecimal start = item.getStartAccountReceivable();
+                        return start != null
+                                && vo.getReturnedAmount() != null
+                                && start.compareTo(vo.getReturnedAmount()) == 0;
+                    })
+                    // 2. 排序：按 shipmentDate 升序（早的在前）
+                    .sorted(Comparator.comparing(ReceiptLedgerInfo::getShipmentDate))
+                    .collect(Collectors.toList());
+            if (CollectionUtil.isNotEmpty(result)) {
+                //平账
+                UpdateReceiptLedgerInfoVo updateVo = new UpdateReceiptLedgerInfoVo();
+                updateVo.setReturnedAmount(vo.getReturnedAmount());
+                updateVo.setActualReturnedDate(vo.getRecapitalizeDate());
+                updateVo.setEndAccountReceivable(BigDecimal.ZERO);
+                updateVo.setId(result.get(0).getId());
+                receiptLedgerInfoService.reconciliation(updateVo);
+            } else {
+                throw new DefaultClientException("没有匹配的台账明细数据！");
+            }
+        } else {
+            //为空保存为存款
+            CreateReceiptLedgerInfoVo createVo = new CreateReceiptLedgerInfoVo();
+            QueryCustomerShortVo vo2 = new QueryCustomerShortVo();
+            vo2.setCustomerId(vo.getOrderingUnit());
+            List<CustomerShort> customerShortList = customerShortService.query(vo2);
+            if (CollectionUtil.isNotEmpty(customerShortList)) {
+                createVo.setCustomerShortId(customerShortList.get(0).getId());
+            }
+            CustomerCredit customerCredit = customerCreditService.getByCustomerId(vo.getOrderingUnit());
+            if (customerCredit != null) {
+                //额度
+                if (StringUtil.isNotEmpty(customerCredit.getCompanyCreditLimit())) {
+                    createVo.setQuota(new BigDecimal(customerCredit.getCompanyCreditLimit()));
+                }
+                //结算期限
+                if (StringUtil.isNotEmpty(customerCredit.getCompanySettlementPeriod())) {
+                    createVo.setSettleTerm(customerCredit.getCompanySettlementPeriod());
+                }
+            }
+            createVo.setDeptId(vo.getDeptId());
+            createVo.setCustomerId(vo.getOrderingUnit());
+            createVo.setFactoryType(vo.getFactoryType());
+            createVo.setFactoryType(vo.getFactoryType());
+            createVo.setActualReturnedDate(vo.getRecapitalizeDate());
+            createVo.setReturnedAmount(vo.getReturnedAmount());
+            createVo.setEndAccountReceivable(vo.getReturnedAmount().negate());
+            createVo.setDebtStatus("DEPOSIT");
+            receiptLedgerInfoService.create(createVo);
+        }
 
 
         OpLogUtil.setVariable("id", data.getId());
         OpLogUtil.setVariable("id", data.getId());
         OpLogUtil.setExtra(vo);
         OpLogUtil.setExtra(vo);

@@ -151,6 +151,7 @@ public class ReceiptLedgerInfoServiceImpl extends BaseMpServiceImpl<ReceiptLedge
         data.setFourthCoordinateDate(vo.getFourthCoordinateDate());
         data.setFourthCoordinateDate(vo.getFourthCoordinateDate());
         data.setFifthCoordinateDate(vo.getFifthCoordinateDate());
         data.setFifthCoordinateDate(vo.getFifthCoordinateDate());
         data.setDescription(vo.getDescription());
         data.setDescription(vo.getDescription());
+        data.setDebtStatus(vo.getDebtStatus());
         getBaseMapper().insert(data);
         getBaseMapper().insert(data);
 
 
         OpLogUtil.setVariable("id", data.getId());
         OpLogUtil.setVariable("id", data.getId());
@@ -587,4 +588,24 @@ public class ReceiptLedgerInfoServiceImpl extends BaseMpServiceImpl<ReceiptLedge
         OpLogUtil.setVariable("id", data.getId());
         OpLogUtil.setVariable("id", data.getId());
         OpLogUtil.setExtra(data.getId());
         OpLogUtil.setExtra(data.getId());
     }
     }
+
+    @OpLog(type = OtherOpLogType.class, name = "平账，ID：{}", params = {"#id"})
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public void reconciliation(UpdateReceiptLedgerInfoVo vo) {
+        ReceiptLedgerInfo data = getBaseMapper().selectById(vo.getId());
+        if (ObjectUtil.isNull(data)) {
+            throw new DefaultClientException("应收款台账明细不存在！");
+        }
+        LambdaUpdateWrapper<ReceiptLedgerInfo> updateWrapper = Wrappers.lambdaUpdate(ReceiptLedgerInfo.class)
+                .set(ReceiptLedgerInfo::getActualReturnedDate, vo.getActualReturnedDate() == null ? null : vo.getActualReturnedDate())
+                .set(ReceiptLedgerInfo::getReturnedAmount, vo.getReturnedAmount() == null ? null : vo.getReturnedAmount())
+                .set(ReceiptLedgerInfo::getEndAccountReceivable, vo.getEndAccountReceivable() == null ? null : vo.getEndAccountReceivable())
+                .set(ReceiptLedgerInfo::getDebtStatus, "SETTLE_UP")
+                .eq(ReceiptLedgerInfo::getId, vo.getId());
+
+        getBaseMapper().update(updateWrapper);
+        OpLogUtil.setVariable("id", data.getId());
+        OpLogUtil.setExtra(vo);
+    }
 }
 }

@@ -105,4 +105,11 @@ public interface ReceiptLedgerInfoService extends BaseMpService<ReceiptLedgerInf
      * @param debtStatus     清欠状态
      * @param debtStatus     清欠状态
      */
      */
     void updateCoordinateDate(String id, LocalDate coordinateDate, String debtStatus);
     void updateCoordinateDate(String id, LocalDate coordinateDate, String debtStatus);
+
+    /**
+     * 平账
+     *
+     * @param vo 数据
+     */
+    void reconciliation(UpdateReceiptLedgerInfoVo vo);
 }
 }

@@ -59,4 +59,10 @@ public class CreateRecapitalizeVo implements BaseVo, Serializable {
     @Length(message = "厂别最多允许50个字符！")
     @Length(message = "厂别最多允许50个字符！")
     private String factoryType;
     private String factoryType;
 
 
+    /**
+     * 贸易类型：外贸: OUTSIDE  内贸：INSIDE
+     */
+    @ApiModelProperty("贸易类型")
+    private String type;
+
 }
 }

@@ -47,4 +47,10 @@ public class QueryRecapitalizeVo extends PageVo implements BaseVo, Serializable
     @ApiModelProperty("厂别")
     @ApiModelProperty("厂别")
     private String factoryType;
     private String factoryType;
 
 
+    /**
+     * 贸易类型：外贸: OUTSIDE  内贸：INSIDE
+     */
+    @ApiModelProperty("贸易类型")
+    private String type;
+
 }
 }

@@ -215,4 +215,7 @@ public class CreateReceiptLedgerInfoVo implements BaseVo, Serializable {
     @ApiModelProperty("是否拆分")
     @ApiModelProperty("是否拆分")
     private boolean spilt;
     private boolean spilt;
 
 
+    @ApiModelProperty("欠款状态")
+    private String debtStatus;
+
 }
 }

@@ -81,4 +81,10 @@ public class QueryReceiptLedgerInfoVo extends PageVo implements BaseVo, Serializ
     @ApiModelProperty("年份")
     @ApiModelProperty("年份")
     private Integer createYear;
     private Integer createYear;
 
 
+    /**
+     * 厂别
+     */
+    @ApiModelProperty("厂别")
+    private String factoryType;
+
 }
 }

 package com.lframework.xingyun.sc.vo.ledger.receipt;
 package com.lframework.xingyun.sc.vo.ledger.receipt;
 
 
+import com.lframework.starter.web.core.components.validation.IsNumberPrecision;
 import lombok.Data;
 import lombok.Data;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotBlank;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.LocalDate;
 import com.lframework.starter.web.core.vo.BaseVo;
 import com.lframework.starter.web.core.vo.BaseVo;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.NotNull;
@@ -46,4 +48,30 @@ public class UpdateReceiptLedgerInfoVo implements BaseVo, Serializable {
     @Length(message = "说明最多允许200个字符！")
     @Length(message = "说明最多允许200个字符！")
     private String description;
     private String description;
 
 
+    /**
+     * 实际回笼日期
+     */
+    @ApiModelProperty(value = "实际回笼日期", required = true)
+    @NotNull(message = "请输入实际回笼日期！")
+    @TypeMismatch(message = "实际回笼日期格式有误！")
+    private LocalDate actualReturnedDate;
+
+    /**
+     * 回笼金额
+     */
+    @ApiModelProperty(value = "回笼金额", required = true)
+    @NotNull(message = "请输入回笼金额！")
+    @TypeMismatch(message = "回笼金额格式有误！")
+    @IsNumberPrecision(message = "回笼金额最多允许4位小数！", value = 4)
+    private BigDecimal returnedAmount;
+
+    /**
+     * 期末应收账款
+     */
+    @ApiModelProperty(value = "期末应收账款", required = true)
+    @NotNull(message = "请输入期末应收账款！")
+    @TypeMismatch(message = "期末应收账款格式有误！")
+    @IsNumberPrecision(message = "期末应收账款最多允许4位小数！", value = 4)
+    private BigDecimal endAccountReceivable;
+
 }
 }

@@ -11,6 +11,7 @@
         <result column="dept_id" property="deptId"/>
         <result column="dept_id" property="deptId"/>
         <result column="dept_name" property="deptName"/>
         <result column="dept_name" property="deptName"/>
         <result column="factory_type" property="factoryType"/>
         <result column="factory_type" property="factoryType"/>
+        <result column="type" property="type"/>
         <result column="create_by_id" property="createById"/>
         <result column="create_by_id" property="createById"/>
         <result column="create_by" property="createBy"/>
         <result column="create_by" property="createBy"/>
         <result column="update_by_id" property="updateById"/>
         <result column="update_by_id" property="updateById"/>
@@ -29,6 +30,7 @@
             tb.dept_id,
             tb.dept_id,
             d.name AS dept_name,
             d.name AS dept_name,
             tb.factory_type,
             tb.factory_type,
+            tb.type,
             tb.create_by_id,
             tb.create_by_id,
             tb.create_by,
             tb.create_by,
             tb.update_by_id,
             tb.update_by_id,
@@ -66,6 +68,9 @@
             <if test="vo.factoryType != null and vo.factoryType != ''">
             <if test="vo.factoryType != null and vo.factoryType != ''">
                 AND tb.factory_type = #{vo.factoryType}
                 AND tb.factory_type = #{vo.factoryType}
             </if>
             </if>
+            <if test="vo.type != null and vo.type != ''">
+                AND tb.type = #{vo.type}
+            </if>
         </where>
         </where>
         ORDER BY tb.create_time DESC
         ORDER BY tb.create_time DESC
     </select>
     </select>

@@ -101,6 +101,9 @@
             <if test="vo.type != null and vo.type != ''">
             <if test="vo.type != null and vo.type != ''">
                 AND tb.type = #{vo.type}
                 AND tb.type = #{vo.type}
             </if>
             </if>
+            <if test="vo.factoryType != null and vo.factoryType != ''">
+                AND tb.factory_type = #{vo.factoryType}
+            </if>
             <if test="vo.customerShortId != null and vo.customerShortId != ''">
             <if test="vo.customerShortId != null and vo.customerShortId != ''">
                 AND tb.customer_short_id = #{vo.customerShortId}
                 AND tb.customer_short_id = #{vo.customerShortId}
             </if>
             </if>