杰生重构 合同付款

hx-service-api/storage-restructure-api/src/main/java/com/fjhx/entity/contract/Contract.java

@@ -79,6 +79,11 @@ public class Contract extends StorageBaseEntity {
     private BigDecimal hadPayAmount;
 
     /**
+     * 冲抵金额
+     */
+    private BigDecimal offsetAmount;
+
+    /**
      * 增值税
      */
     private BigDecimal taxValue;
@@ -94,6 +99,11 @@ public class Contract extends StorageBaseEntity {
     private Integer status;
 
     /**
+     * 完成时间
+     */
+    private Date completeTime;
+
+    /**
      * 合同审批状态（0待审批，1审批中，2已审批，3已驳回，4已撤回）
      */
     private Integer flowStatus;

hx-service-api/storage-restructure-api/src/main/java/com/fjhx/entity/contract/ContractPay.java

@@ -0,0 +1,113 @@
+package com.fjhx.entity.contract;
+
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.IdType;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotation.Version;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.fjhx.base.StorageBaseEntity;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableField;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 合同付款
+ * </p>
+ *
+ * @author ${author}
+ * @since 2022-09-29
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class ContractPay extends StorageBaseEntity {
+
+
+    /**
+     * 合同id
+     */
+    private Long contractId;
+
+    /**
+     * 付款单类型 （0发起申请，1发起预付款）
+     */
+    private Integer type;
+
+    /**
+     * 申请付款金额
+     */
+    private BigDecimal payAmount;
+
+    /**
+     * 退货冲抵金额
+     */
+    private BigDecimal backAmount;
+
+    /**
+     * 运费冲抵金额
+     */
+    private BigDecimal expressAmount;
+
+    /**
+     * 其他冲抵金额
+     */
+    private BigDecimal balanceAmount;
+
+    /**
+     * 实际应付金额
+     */
+    private BigDecimal actAmount;
+
+    /**
+     * 申请付款状态 （0审批中，1已审批，2已支付）
+     */
+    private Integer status;
+
+    /**
+     * 审批状态 （0待审批，1审批中，2已审批，3已驳回，4已撤回）
+     */
+    private Integer flowStatus;
+
+    /**
+     * 审核时间
+     */
+    private Date approvalTime;
+
+    /**
+     * 交货时间
+     */
+    private Date deliveryTime;
+
+    /**
+     * 银行卡号
+     */
+    private String bankAccout;
+
+    /**
+     * 账户名称
+     */
+    private String bankAccoutName;
+
+    /**
+     * 开户行
+     */
+    private String openBank;
+
+    /**
+     * 付款说明
+     */
+    private String remark;
+
+    /**
+     * 逻辑删除 0未删除 1已删除
+     */
+    @TableField(fill = FieldFill.INSERT)
+    @TableLogic
+    private Integer delFlag;
+
+    private String oldId;
+
+
+}

hx-service-api/storage-restructure-api/src/main/java/com/fjhx/enums/ContractPayStatusEnum.java

@@ -0,0 +1,48 @@
+package com.fjhx.enums;
+
+import lombok.Getter;
+
+import java.util.HashMap;
+
+/**
+ * 质检状态
+ */
+@Getter
+public enum ContractPayStatusEnum {
+
+    UNDER_APPROVAL(0, "审批中"),
+    HAVE_IN_HAND(1, "进行中"),
+    COMPLETED(2, "已完成");
+
+    private final Integer type;
+    private final String name;
+
+    private static final HashMap<Integer, ContractPayStatusEnum> map = new HashMap<>();
+
+    ContractPayStatusEnum(Integer type, String name) {
+        this.type = type;
+        this.name = name;
+    }
+
+    static {
+        for (ContractPayStatusEnum value : ContractPayStatusEnum.values()) {
+            map.put(value.getType(), value);
+        }
+    }
+
+    /**
+     * 根据type获取枚举
+     */
+    public static ContractPayStatusEnum get(Integer type) {
+        return map.get(type);
+    }
+
+    /**
+     * 根据type值获取枚举
+     */
+    public static String getName(Integer type) {
+        return map.get(type).getName();
+    }
+
+
+}

hx-service-api/storage-restructure-api/src/main/java/com/fjhx/params/contract/ContractPayEx.java

@@ -0,0 +1,17 @@
+package com.fjhx.params.contract;
+
+import com.fjhx.entity.contract.ContractPay;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 合同付款
+ *
+ * @author ${author}
+ * @since 2022-09-29
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class ContractPayEx extends ContractPay {
+
+}

hx-service-api/storage-restructure-api/src/main/java/com/fjhx/params/contract/ContractPayVo.java

@@ -0,0 +1,17 @@
+package com.fjhx.params.contract;
+
+import com.fjhx.entity.contract.ContractPay;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 合同付款
+ *
+ * @author ${author}
+ * @since 2022-09-29
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class ContractPayVo extends ContractPay {
+
+}

hx-service-api/storage-restructure-api/src/main/java/com/fjhx/params/contract/DateStatisticsResult.java

@@ -0,0 +1,103 @@
+package com.fjhx.params.contract;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+@Data
+public class DateStatisticsResult {
+
+    /**
+     * 展示日期
+     */
+    private String showDate;
+
+    /**
+     * 统计开始时间
+     */
+    private Date beginTime;
+
+    /**
+     * 统计结束时间
+     */
+    private Date endTime;
+
+    /**
+     * 账期类型 1之前账期 2当前账期 3未来账期
+     */
+    private Integer type;
+
+    /**
+     * 已付预付款
+     */
+    private BigDecimal paidPayInAdvance;
+
+    /**
+     * 已付有账期
+     */
+    private BigDecimal paidAccountingPeriod;
+
+    /**
+     * 未付预付款
+     */
+    private BigDecimal unpaidPayInAdvance;
+
+    /**
+     * 未付有账期
+     */
+    private BigDecimal unpaidAccountingPeriod;
+
+    /**
+     * 获取付款合计
+     */
+    public BigDecimal getTotalPaid() {
+        return getPaidPayInAdvance().add(getPaidAccountingPeriod());
+    }
+
+    /**
+     * 获取未付款合计
+     */
+    public BigDecimal getTotalUnpaid() {
+        return getUnpaidPayInAdvance().add(getUnpaidAccountingPeriod());
+    }
+
+    /**
+     * 获取应付预付款
+     */
+    public BigDecimal getCopeWithPayInAdvance() {
+        return getPaidPayInAdvance().add(getUnpaidPayInAdvance());
+    }
+
+    /**
+     * 获取应付有账期
+     */
+    public BigDecimal getCopeWithAccountingPeriod() {
+        return getPaidAccountingPeriod().add(getUnpaidAccountingPeriod());
+    }
+
+    /**
+     * 获取应付总数
+     */
+    public BigDecimal getTotalCopeWith() {
+        return getCopeWithPayInAdvance().add(getCopeWithAccountingPeriod());
+    }
+
+    public BigDecimal getPaidPayInAdvance() {
+        return paidPayInAdvance == null ? BigDecimal.ZERO : paidPayInAdvance;
+    }
+
+    public BigDecimal getPaidAccountingPeriod() {
+        return paidAccountingPeriod == null ? BigDecimal.ZERO : paidAccountingPeriod;
+    }
+
+    public BigDecimal getUnpaidPayInAdvance() {
+        return unpaidPayInAdvance == null ? BigDecimal.ZERO : unpaidPayInAdvance;
+    }
+
+    public BigDecimal getUnpaidAccountingPeriod() {
+        return unpaidAccountingPeriod == null ? BigDecimal.ZERO : unpaidAccountingPeriod;
+    }
+
+
+}

hx-service-api/storage-restructure-api/src/main/java/com/fjhx/params/contract/DateStatisticsVo.java

@@ -0,0 +1,43 @@
+package com.fjhx.params.contract;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+@Data
+public class DateStatisticsVo {
+
+    /**
+     * 帐期
+     */
+    private Integer accountDate;
+
+    /**
+     * 完成时间
+     */
+    private Date completeTime;
+
+    /**
+     * 质检修正金额
+     */
+    private BigDecimal adjustAmount;
+
+    /**
+     * 退货金额
+     */
+    private BigDecimal backAmount;
+
+    /**
+     * 已付金额
+     */
+    private BigDecimal hadPayAmount;
+
+    /**
+     * 冲抵金额
+     */
+    private BigDecimal offsetAmount;
+
+
+
+}

hx-service/storage-restructure/src/main/java/com/fjhx/controller/contract/ContractDetailsController.java

@@ -21,4 +21,3 @@ public class ContractDetailsController {
     private ContractDetailsService contractDetailsService;
 
 }
-

hx-service/storage-restructure/src/main/java/com/fjhx/controller/contract/ContractPayController.java

@@ -0,0 +1,63 @@
+package com.fjhx.controller.contract;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.entity.contract.ContractPay;
+import com.fjhx.params.contract.ContractPayVo;
+import com.fjhx.params.contract.DateStatisticsResult;
+import com.fjhx.service.contract.ContractPayService;
+import org.springblade.core.tool.api.R;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Map;
+
+/**
+ * <p>
+ * 合同付款 前端控制器
+ * </p>
+ *
+ * @author ${author}
+ * @since 2022-09-29
+ */
+@RestController
+@RequestMapping("/contractPay")
+public class ContractPayController {
+
+    @Autowired
+    private ContractPayService contractPayService;
+
+    @PostMapping("/page")
+    public R page(@RequestBody Map<String, String> condition) {
+        Page<ContractPay> result = contractPayService.getPage(condition);
+        return R.success(result);
+    }
+
+    @PostMapping("/add")
+    public R add(@RequestBody ContractPayVo contractPayVo) {
+        contractPayService.add(contractPayVo);
+        return R.success();
+    }
+
+    @PostMapping("/edit")
+    public R edit(@RequestBody ContractPayVo contractPayVo) {
+        contractPayService.edit(contractPayVo);
+        return R.success();
+    }
+
+    @PostMapping("/delete")
+    public R delete(@RequestBody ContractPayVo contractPayVo) {
+        contractPayService.delete(contractPayVo);
+        return R.success();
+    }
+
+    @PostMapping("/dateStatistics")
+    public R dateStatistics() {
+        Map<Integer, DateStatisticsResult> result = contractPayService.dateStatistics();
+        return R.success(result);
+    }
+
+}
+

hx-service/storage-restructure/src/main/java/com/fjhx/mapper/contract/ContractPayMapper.java

@@ -0,0 +1,19 @@
+package com.fjhx.mapper.contract;
+
+import com.fjhx.entity.contract.ContractPay;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.fjhx.params.contract.DateStatisticsVo;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 合同付款 Mapper 接口
+ * </p>
+ *
+ * @author ${author}
+ * @since 2022-09-29
+ */
+public interface ContractPayMapper extends BaseMapper<ContractPay> {
+
+}

hx-service/storage-restructure/src/main/java/com/fjhx/mapper/contract/ContractPayMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.fjhx.mapper.contract.ContractPayMapper">
+
+</mapper>

hx-service/storage-restructure/src/main/java/com/fjhx/service/contract/ContractPayService.java

@@ -0,0 +1,32 @@
+package com.fjhx.service.contract;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.entity.contract.ContractPay;
+import com.fjhx.params.contract.ContractPayVo;
+import com.fjhx.base.StorageBaseService;
+import com.fjhx.params.contract.DateStatisticsResult;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 合同付款 服务类
+ * </p>
+ *
+ * @author ${author}
+ * @since 2022-09-29
+ */
+public interface ContractPayService extends StorageBaseService<ContractPay> {
+
+    Page<ContractPay> getPage(Map<String, String> condition);
+
+    void add(ContractPayVo contractPayVo);
+
+    void edit(ContractPayVo contractPayVo);
+
+    void delete(ContractPayVo contractPayVo);
+
+    Map<Integer, DateStatisticsResult> dateStatistics();
+
+}

hx-service/storage-restructure/src/main/java/com/fjhx/service/contract/impl/ContractDetailsServiceImpl.java

@@ -121,6 +121,7 @@ public class ContractDetailsServiceImpl extends ServiceImpl<ContractDetailsMappe
                 Contract contract = new Contract();
                 contract.setId(contractDetails.getContractId());
                 contract.setStatus(ContractStatusEnum.COMPLETED.getType());
+                contractDetails.setCompleteTime(date);
                 contract.setShipmentStatus(StatusConstant.YES);
                 contractList.add(contract);
             } else {

hx-service/storage-restructure/src/main/java/com/fjhx/service/contract/impl/ContractPayServiceImpl.java

@@ -0,0 +1,194 @@
+package com.fjhx.service.contract.impl;
+
+import cn.hutool.core.date.DateUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fjhx.entity.contract.Contract;
+import com.fjhx.entity.contract.ContractPay;
+import com.fjhx.enums.ContractPayStatusEnum;
+import com.fjhx.enums.ContractStatusEnum;
+import com.fjhx.mapper.contract.ContractPayMapper;
+import com.fjhx.params.contract.ContractPayVo;
+import com.fjhx.params.contract.DateStatisticsResult;
+import com.fjhx.service.contract.ContractPayService;
+import com.fjhx.service.contract.ContractService;
+import com.fjhx.utils.WrapperUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 合同付款 服务实现类
+ * </p>
+ *
+ * @author ${author}
+ * @since 2022-09-29
+ */
+@Service
+public class ContractPayServiceImpl extends ServiceImpl<ContractPayMapper, ContractPay> implements ContractPayService {
+
+    @Autowired
+    private ContractService contractService;
+
+    @Override
+    public Page<ContractPay> getPage(Map<String, String> condition) {
+
+        QueryWrapper<ContractPay> wrapper = Wrappers.query();
+
+        WrapperUtil.init(condition, wrapper)
+                .createTimeDesc();
+
+        Page<ContractPay> page = page(condition, wrapper);
+        return page;
+    }
+
+    @Override
+    public void add(ContractPayVo contractPayVo) {
+        save(contractPayVo);
+    }
+
+    @Override
+    public void edit(ContractPayVo contractPayVo) {
+        updateById(contractPayVo);
+    }
+
+    @Override
+    public void delete(ContractPayVo contractPayVo) {
+        removeById(contractPayVo.getId());
+    }
+
+    @Override
+    public Map<Integer, DateStatisticsResult> dateStatistics() {
+
+        Date date = new Date();
+
+        // 获取合同完成但未付款的数据
+        List<Contract> contractList = contractService.list(Wrappers.<Contract>lambdaQuery()
+                .lt(Contract::getPayStatus, ContractPayStatusEnum.COMPLETED)
+                .and(q -> q.eq(Contract::getAccountDate, 0)
+                        .or(w -> w.gt(Contract::getAccountDate, 0)
+                                .eq(Contract::getStatus, ContractStatusEnum.COMPLETED.getType()))));
+
+        // 初始化返回结果
+        Map<Integer, DateStatisticsResult> result = dateStatisticsResultInit(date);
+
+        for (Contract contract : contractList) {
+            // 付款日期
+            Date paymentDate = DateUtil.offsetDay(contract.getCompleteTime(), contract.getAccountDate());
+            // 已付金额
+            BigDecimal hadPayAmount = contract.getHadPayAmount();
+            // 未付金额 = 质检金额 - 退货金额 - 已付金额 + 冲抵金额
+            BigDecimal notHadPayAmount = contract.getAdjustAmount().subtract(contract.getBackAmount())
+                    .subtract(hadPayAmount).add(contract.getOffsetAmount());
+
+            for (DateStatisticsResult item : result.values()) {
+                if (paymentDate.compareTo(item.getEndTime()) < 0) {
+                    // 预付款
+                    if (contract.getAccountDate() == 0) {
+                        // 未付预付款
+                        if (item.getType() == 1) {
+                            result.get(2).setUnpaidPayInAdvance(item.getUnpaidPayInAdvance().add(notHadPayAmount));
+                        } else {
+                            item.setUnpaidPayInAdvance(item.getUnpaidPayInAdvance().add(notHadPayAmount));
+                        }
+                        // 已付预付款
+                        item.setPaidPayInAdvance(item.getPaidPayInAdvance().add(hadPayAmount));
+                    }
+                    // 有账期
+                    else {
+                        // 未付有账期
+                        if (item.getType() == 1) {
+                            result.get(2).setUnpaidAccountingPeriod(item.getUnpaidAccountingPeriod().add(notHadPayAmount));
+                        } else {
+                            item.setUnpaidAccountingPeriod(item.getUnpaidAccountingPeriod().add(notHadPayAmount));
+                        }
+                        // 已付有账期
+                        item.setPaidAccountingPeriod(item.getPaidAccountingPeriod().add(hadPayAmount));
+                    }
+
+                    break;
+                }
+            }
+        }
+
+        return result;
+    }
+
+    /**
+     * 合同付款时间段统计返回值初始化
+     *
+     * @param date 当前日期
+     */
+    private Map<Integer, DateStatisticsResult> dateStatisticsResultInit(Date date) {
+
+        Map<Integer, DateStatisticsResult> result = new LinkedHashMap<>();
+
+        // 本月1号
+        Date beginOfMonth = DateUtil.beginOfMonth(date);
+        // 本月15号
+        Date midOfMonth = DateUtil.offsetDay(beginOfMonth, 14);
+        // 本月最后一天
+        Date endOfMonth = DateUtil.endOfMonth(date);
+        // 下月1号
+        Date nextBeginOfMonth = DateUtil.offsetMonth(beginOfMonth, 1);
+        // 下月15号
+        Date nextMidOfMonth = DateUtil.offsetMonth(midOfMonth, 1);
+        // 下月最后一天
+        Date nextEndOfMonth = DateUtil.endOfMonth(nextBeginOfMonth);
+        // 下下月1号
+        Date nextTwoBeginOfMonth = DateUtil.offsetMonth(beginOfMonth, 2);
+        // 下下月15号
+        Date nextTwoMidOfMonth = DateUtil.offsetMonth(midOfMonth, 2);
+        // 下下月最后一天
+        Date nextTwoEndOfMonth = DateUtil.endOfMonth(nextTwoBeginOfMonth);
+
+        // 距离月初有几天
+        long day = DateUtil.betweenDay(date, beginOfMonth, true);
+
+        // 当前月和未来2个月一共6个账期
+        for (int i = 1; i <= 6; i++) {
+            switch (i) {
+                case 1:
+                    result.put(i, getDateStatisticsResult(day < 15 ? 2 : 1, beginOfMonth, DateUtil.endOfDay(midOfMonth)));
+                    break;
+                case 2:
+                    result.put(i, getDateStatisticsResult(day < 15 ? 3 : 2, DateUtil.offsetDay(midOfMonth, 1), endOfMonth));
+                    break;
+                case 3:
+                    result.put(i, getDateStatisticsResult(3, nextBeginOfMonth, DateUtil.endOfDay(nextMidOfMonth)));
+                    break;
+                case 4:
+                    result.put(i, getDateStatisticsResult(3, DateUtil.offsetDay(nextMidOfMonth, 1), nextEndOfMonth));
+                    break;
+                case 5:
+                    result.put(i, getDateStatisticsResult(3, nextTwoBeginOfMonth, DateUtil.endOfDay(nextTwoMidOfMonth)));
+                    break;
+                case 6:
+                    result.put(i, getDateStatisticsResult(3, DateUtil.offsetDay(nextTwoMidOfMonth, 1), nextTwoEndOfMonth));
+                    break;
+            }
+        }
+
+        return result;
+    }
+
+
+    private DateStatisticsResult getDateStatisticsResult(Integer type, Date beginTime, Date endTime) {
+        DateStatisticsResult dateStatisticsResult = new DateStatisticsResult();
+        dateStatisticsResult.setType(type);
+        dateStatisticsResult.setShowDate(DateUtil.format(endTime, "MM月dd日"));
+        dateStatisticsResult.setBeginTime(beginTime);
+        dateStatisticsResult.setEndTime(endTime);
+        return dateStatisticsResult;
+    }
+
+
+}

hx-service/storage/src/main/java/com/fjhx/stock/mapper/StockWaterMapper.xml

@@ -262,8 +262,7 @@
                asot.ApplyReason
         FROM apply_stockoutdetail asod
                  LEFT JOIN apply_stockouttag asot ON asod.ID = asot.LinkBackDetailId
-        WHERE asod.BackMaterialProgress = 4
-          AND asod.balancePurBillNo = #{balancePurBillNo}
+        WHERE asod.balancePurBillNo = #{balancePurBillNo}
     </select>
 
     <select id="receiptList" resultType="java.util.Map">