From 6332b04bc7991a310b13aef044082621d618479a Mon Sep 17 00:00:00 2001
From: shiyunteng <shiyunteng@example.com>
Date: 星期二, 19 五月 2026 17:02:19 +0800
Subject: [PATCH] feat:新增赊销、抵抹账功能 合同新增销售模式字段，新增生成新合同接口 出库：出库多余配件处理
---
platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/Contract.java | 8
platformx-business-finance-biz/src/main/resources/mapper/ContractMapper.xml | 96 ++++
platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/PaymentOffset.java | 82 +++
platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/PaymentOffsetService.java | 10
platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/CreditSalesServiceImpl.java | 27 +
platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/ContractOutBoundController.java | 12
platformx-business-finance-biz/src/main/resources/mapper/PaymentOffsetMapper.xml | 29 +
platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/ContractPaymentScheduleProcessServiceImpl.java | 401 ++++++++++++-----
platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/ContractController.java | 23 +
platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/mapper/PaymentOffsetMapper.java | 11
platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/CreditSalesService.java | 8
platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/ContractServiceImpl.java | 40 +
platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/PaymentConfirmServiceImpl.java | 41 +
platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/mapper/ContractMapper.java | 6
platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/dto/CreditSalesQueryDTO.java | 17
platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/PaymentOffsetController.java | 123 +++++
platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/CreditSalesController.java | 61 ++
platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/OutBoundServiceImpl.java | 35
platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/PaymentOffsetServiceImpl.java | 133 ++++++
platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/vo/ContractCreditSalesPageVo.java | 97 ++++
platformx-boot/src/main/resources/application-dev.yml | 4
platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/dto/ContractPaymentScheduleProcessAddDTO.java | 12
platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/ContractService.java | 2
platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/PaymentConfirmController.java | 8
platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/PaymentConfirmService.java | 2
platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/ContractOutBound.java | 14
26 files changed, 1,161 insertions(+), 141 deletions(-)
diff --git a/platformx-boot/src/main/resources/application-dev.yml b/platformx-boot/src/main/resources/application-dev.yml
index 62f079a..a1dd23e 100644
--- a/platformx-boot/src/main/resources/application-dev.yml
+++ b/platformx-boot/src/main/resources/application-dev.yml
@@ -37,3 +37,7 @@
# swagger 閰嶇疆
swagger:
token-url: ${swagger.gateway}/admin/oauth2/token
+
+#bip 閰嶇疆
+bip:
+ url:
diff --git a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/dto/ContractPaymentScheduleProcessAddDTO.java b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/dto/ContractPaymentScheduleProcessAddDTO.java
index e64d931..61d275b 100644
--- a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/dto/ContractPaymentScheduleProcessAddDTO.java
+++ b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/dto/ContractPaymentScheduleProcessAddDTO.java
@@ -2,21 +2,27 @@
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.persistence.Column;
import lombok.Data;
import java.util.Date;
+import java.util.List;
@Data
public class ContractPaymentScheduleProcessAddDTO {
@Schema(description = "闃舵ID")
- @Column(columnDefinition = "bigint comment '闃舵ID'")
private Long scheduleId;
@Schema(description = "灞ョ害鏃堕棿")
@JsonFormat(pattern = "yyyy-MM-dd")
- @Column(columnDefinition = "date comment '灞ョ害鏃堕棿'")
private Date processDate;
+ @Schema(description = "灞ョ害鍗曟嵁鍚嶇О")
+ private String outBoundAttNames;
+
+ @Schema(description = "灞ョ害鍗曟嵁璺緞")
+ private String outBoundAttPaths;
+
+ private List<Long> contractOutBoundIds;
+
}
diff --git a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/dto/CreditSalesQueryDTO.java b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/dto/CreditSalesQueryDTO.java
new file mode 100644
index 0000000..7e8daeb
--- /dev/null
+++ b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/dto/CreditSalesQueryDTO.java
@@ -0,0 +1,17 @@
+package com.by4cloud.platformx.business.dto;
+
+import lombok.Data;
+
+@Data
+public class CreditSalesQueryDTO {
+
+ private String contractName;
+
+ private String partyA;
+
+ private String productNames;
+
+ private String sortFiled;
+
+ private String sortMethod;
+}
diff --git a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/Contract.java b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/Contract.java
index de78174..00cdc25 100644
--- a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/Contract.java
+++ b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/Contract.java
@@ -147,6 +147,14 @@
@Column(columnDefinition = "bigint comment '妯＄増ID'")
private Long templateId;
+ @Schema(description = "閿�鍞ā寮�")
+ @Column(columnDefinition = "VARCHAR(16) comment '閿�鍞ā寮� 1 鎸夊崟鐢熶骇 2 鍏堜骇鍚庨攢 3 浠ｅ偍浠ｉ攢'")
+ private String salesModel;
+
+ @Schema(description = "宸蹭粯娆鹃噾棰�")
+ @Column(columnDefinition = "decimal(10,2) comment '宸蹭粯娆鹃噾棰�'")
+ private BigDecimal paidAmount;
+
/**
* 涓存椂瀛楁 - 鐢ㄤ簬鎺ユ敹瀹℃壒浜哄悕绉扮瓑鍏宠仈鏌ヨ缁撴灉
*/
diff --git a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/ContractOutBound.java b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/ContractOutBound.java
index d4d3c81..3c6334c 100644
--- a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/ContractOutBound.java
+++ b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/ContractOutBound.java
@@ -61,4 +61,18 @@
@Schema(description = "鍗曟嵁璺緞")
@Column(columnDefinition="text comment '鍗曟嵁璺緞'")
private String outBoundAttPaths;
+
+ @Schema(description = "鍒拌揣鏃堕棿")
+ @Column(columnDefinition="datetime comment '鍒拌揣鏃堕棿'")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date arrivalTime;
+
+ @Schema(description = "鍒拌揣鍗曟嵁鍚嶇О")
+ @Column(columnDefinition="text comment '鍒拌揣鍗曟嵁鍚嶇О'")
+ private String arrivalAttNames;
+
+ @Schema(description = "鍒拌揣鍗曟嵁璺緞")
+ @Column(columnDefinition="text comment '鍒拌揣鍗曟嵁璺緞'")
+ private String arrivalAttPaths;
+
}
diff --git a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/PaymentOffset.java b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/PaymentOffset.java
new file mode 100644
index 0000000..9c2b801
--- /dev/null
+++ b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/PaymentOffset.java
@@ -0,0 +1,82 @@
+package com.by4cloud.platformx.business.entity;
+
+import com.by4cloud.platformx.common.data.mybatis.BaseModel;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import lombok.Data;
+import org.hibernate.annotations.Table;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 2026骞�4鏈�29鏃� 10:46:07
+ * syt
+ */
+@Data
+@Entity//鍔犱簡鎵嶈兘鑷姩鐢熸垚琛�
+@Table(appliesTo="payment_offset",comment = "鎶垫姽璐�")//缁欒〃鍔犳敞閲�
+@jakarta.persistence.Table(name = "payment_offset")//鏁版嵁搴撳垱寤虹殑琛ㄦ槑
+public class PaymentOffset extends BaseModel<PaymentOffset> {
+
+ @Schema(description = "瀹㈠晢鍚嶇О")
+ @Column(columnDefinition="VARCHAR(64) comment '瀹㈠晢鍚嶇О'")
+ private String busGuestName;
+
+ @Schema(description = "瀹㈠晢ID")
+ @Column(columnDefinition="bigint comment '瀹㈠晢ID'")
+ private Long busGuestId;
+
+ @Schema(description = "鍚堝悓鍚嶇О")
+ @Column(columnDefinition="VARCHAR(64) comment '鍚堝悓鍚嶇О'")
+ private String contractName;
+
+ @Schema(description = "鍚堝悓ID")
+ @Column(columnDefinition="bigint comment '鍚堝悓ID'")
+ private Long contractId;
+
+ @Schema(description = "鍚堝悓缂栧彿")
+ @Column(columnDefinition = "VARCHAR(64) comment '鍚堝悓缂栧彿'")
+ private String contractNo;
+
+ @Schema(description = "鎶垫姽璐︽椂闂�")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @Column(columnDefinition="datetime comment '鎶垫姽璐︽椂闂�'")
+ private Date offsetTime;
+
+ @Schema(description = "鍚堝悓閲戦")
+ @Column(columnDefinition="decimal(10,2) comment '鍚堝悓閲戦 /鍏� 涓や綅灏忔暟'")
+ private BigDecimal contractAmount;
+
+ @Schema(description = "寮�绁ㄩ噾棰�")
+ @Column(columnDefinition="decimal(10,2) comment '鏈粯閲戦 /鍏� 涓や綅灏忔暟'")
+ private BigDecimal invoiceAmount;
+
+ @Schema(description = "浠樻閲戦")
+ @Column(columnDefinition="decimal(10,2) comment '浠樻閲戦 /鍏� 涓や綅灏忔暟'")
+ private BigDecimal paidAmount;
+
+ @Schema(description = "鏈粯閲戦")
+ @Column(columnDefinition="decimal(10,2) comment '鏈粯閲戦 /鍏� 涓や綅灏忔暟'")
+ private BigDecimal unpaidAmount;
+
+ @Schema(description = "鍙姷鎶归噾棰�")
+ @Column(columnDefinition="decimal(10,2) comment '鍙姷鎶归噾棰� /鍏� 涓や綅灏忔暟'")
+ private BigDecimal wipeOffAmount;
+
+ @Schema(description = "鎶垫姽閲戦")
+ @Column(columnDefinition="decimal(10,2) comment '鎶垫姽閲戦 /鍏� 涓や綅灏忔暟'")
+ private BigDecimal offsetAmount;
+
+ @Schema(description = "鍗忚鍚嶇О")
+ @Column(columnDefinition="text comment '鍗忚鍚嶇О'")
+ private String offsetAttNames;
+
+ @Schema(description = "鍗忚璺緞")
+ @Column(columnDefinition="text comment '鍗忚璺緞'")
+ private String offsetAttPaths;
+}
diff --git a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/vo/ContractCreditSalesPageVo.java b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/vo/ContractCreditSalesPageVo.java
new file mode 100644
index 0000000..97c0ddb
--- /dev/null
+++ b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/vo/ContractCreditSalesPageVo.java
@@ -0,0 +1,97 @@
+package com.by4cloud.platformx.business.vo;
+
+import com.by4cloud.platformx.business.entity.ContractPaymentSchedule;
+import com.by4cloud.platformx.business.entity.ContractSubjectMatter;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.persistence.Column;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+@Data
+public class ContractCreditSalesPageVo {
+
+ private Long id;
+
+ @Schema(description = "鍚堝悓鍚嶇О")
+ private String contractName;
+
+ @Schema(description = "鐢叉柟id")
+ private Long partyAId;
+
+ @Schema(description = "鐢叉柟鍚嶇О")
+ private String partyA;
+
+ @Schema(description = "涔欐柟id")
+ private Long partyBId;
+
+ @Schema(description = "涔欐柟鍚嶇О")
+ private String partyB;
+
+ @Schema(description = "鍚堝悓閲戦")
+ private Double amount;
+
+ @Schema(description = "甯佺锛圕NY/USD绛夛級")
+ private String currency;
+
+ @Schema(description = "鍚堝悓绫诲瀷锛�0-鐢熸垚寮� 1-澶囨寮忥級")
+ private Integer contractType;
+
+ @Schema(description = "渚涘簲灞炴�� 0-鎴愬搧 1-澶囦欢 2-澶т慨 3-鍏朵粬")
+ private Integer supplyAttribute;
+
+ @Schema(description = "鍚堝悓鐘舵�侊紙0-鑽夌 1-宸茬敓鏁� 2-宸茬粓姝� 3-宸茶繃鏈燂級")
+ private Integer contractStatus;
+
+ @Schema(description = "鍚堝悓鏈嶅姟灞炴�э紙0-浜у搧閿�鍞� 1-鏃犲舰鏈嶅姟锛�")
+ private Integer contractAttribute;
+
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
+ @Schema(description = "绛剧讲鏃ユ湡")
+ private String signDate;
+
+ @Schema(description = "浜や粯鍛ㄦ湡")
+ private Integer deliveryCycle;
+
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
+ @Schema(description = "鐢熸晥鏃ユ湡")
+ private String effectiveDate;
+
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @Schema(description = "鍒版湡鏃ユ湡")
+ private String expirationDate;
+
+ @Schema(description = "鍚堝悓闄勪欢URL")
+ private String attachmentUrl;
+
+ @Schema(description = "澶囨敞")
+ private String remark;
+
+ @Schema(description = "妯＄増ID")
+ private Long templateId;
+
+ @Schema(description = "宸插嚭搴撻噾棰�")
+ private BigDecimal outBoundAmount;
+
+ @Schema(description = "宸插紑绁ㄩ噾棰�")
+ private BigDecimal billingAmout;
+
+ @Schema(description = "璧婇攢閲戦")
+ private BigDecimal creditAmount;
+
+ @Schema(description = "璧婇攢浜у搧")
+ private String productNames;
+
+ @Schema(description = "鍚堝悓缂栧彿")
+ private String contractNo;
+
+ private List<ContractPaymentSchedule> contractPaymentSchedule;
+
+ private List<ContractSubjectMatter> contractSubjectMatter;
+}
diff --git a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/ContractController.java b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/ContractController.java
index b88aa1e..a17497a 100644
--- a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/ContractController.java
+++ b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/ContractController.java
@@ -26,6 +26,7 @@
import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.*;
+import java.math.BigDecimal;
import java.util.List;
import java.util.Objects;
@@ -150,5 +151,27 @@
return contractService.genCurrentOverdue();
}
+ /**
+ * 鐢熸垚鏂板悎鍚�
+ * @param id id
+ * @return R
+ */
+ @Operation(summary = "閫氳繃id鐢熸垚鏂板悎鍚�" , description = "閫氳繃id鐢熸垚鏂板悎鍚�" )
+ @GetMapping("/copyNewContract/{id}" )
+ public R copyNewContract(@PathVariable("id" ) Long id) {
+ return contractService.copyNewContract(id);
+ }
+
+ /**
+ * 鏍规嵁瀹㈠晢鏌ヨ鍚堝悓
+ * @param busId id
+ * @return R
+ */
+ @Operation(summary = "鏍规嵁瀹㈠晢鏌ヨ鍚堝悓" , description = "鏍规嵁瀹㈠晢鏌ヨ鍚堝悓" )
+ @GetMapping("/listByBusId/{busId}" )
+ public R listByBusId(@PathVariable("busId" ) Long busId) {
+ return R.ok(contractService.listByScope(Wrappers.<Contract>lambdaQuery().eq(Contract::getPartyAId,busId)
+ .gt(Contract::getBillingAmout,new BigDecimal("0"))));
+ }
}
\ No newline at end of file
diff --git a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/ContractOutBoundController.java b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/ContractOutBoundController.java
index 11a0b4f..a9a8854 100644
--- a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/ContractOutBoundController.java
+++ b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/ContractOutBoundController.java
@@ -121,4 +121,16 @@
public List<ContractOutBound> export(ContractOutBound contractOutBound,Long[] ids) {
return contractOutBoundService.list(Wrappers.lambdaQuery(contractOutBound).in(ArrayUtil.isNotEmpty(ids), ContractOutBound::getId, ids));
}
+
+ /**
+ * 鍘嗗彶鍑哄簱
+ * @param contractId 鍒嗛〉瀵硅薄
+ * @return
+ */
+ @GetMapping("/list/{contractId}" )
+ public R getContractOutBoundPage(@PathVariable("contractId") Long contractId) {
+ return R.ok(contractOutBoundService.list(Wrappers.<ContractOutBound>lambdaQuery().eq(ContractOutBound::getContractId,contractId)
+ .orderByAsc(ContractOutBound::getCreateTime)));
+ }
+
}
\ No newline at end of file
diff --git a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/CreditSalesController.java b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/CreditSalesController.java
new file mode 100644
index 0000000..159b456
--- /dev/null
+++ b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/CreditSalesController.java
@@ -0,0 +1,61 @@
+package com.by4cloud.platformx.business.controller;
+
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.ArrayUtil;
+import cn.hutool.core.util.ObjUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.by4cloud.platformx.business.dto.ContractAddDTO;
+import com.by4cloud.platformx.business.dto.ContractUpdateDTO;
+import com.by4cloud.platformx.business.dto.CreditSalesQueryDTO;
+import com.by4cloud.platformx.business.entity.Contract;
+import com.by4cloud.platformx.business.service.ContractService;
+import com.by4cloud.platformx.business.service.CreditSalesService;
+import com.by4cloud.platformx.common.core.util.R;
+import com.by4cloud.platformx.common.data.mybatis.BaseModel;
+import com.by4cloud.platformx.common.excel.annotation.ResponseExcel;
+import com.by4cloud.platformx.common.log.annotation.SysLog;
+import com.by4cloud.platformx.common.security.annotation.Inner;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.security.SecurityRequirement;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.RequiredArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
+import org.springdoc.core.annotations.ParameterObject;
+import org.springframework.http.HttpHeaders;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * 鍚堝悓绠＄悊
+ *
+ * @author platformx
+ * @date 2026-04-29 16:46:26
+ */
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/creditSales" )
+@Tag(description = "creditSales" , name = "璧婇攢" )
+@SecurityRequirement(name = HttpHeaders.AUTHORIZATION)
+public class CreditSalesController {
+
+ private final CreditSalesService creditSalesService;
+
+ /**
+ * 鍒嗛〉鏌ヨ
+ * @param page 鍒嗛〉瀵硅薄
+ * @param queryDTO
+ * @return
+ */
+ @Operation(summary = "鍒嗛〉鏌ヨ" , description = "鍒嗛〉鏌ヨ" )
+ @GetMapping("/page" )
+ @PreAuthorize("@pms.hasPermission('business_contract_view')" )
+ public R page(@ParameterObject Page page, @ParameterObject CreditSalesQueryDTO queryDTO) {
+ return R.ok(creditSalesService.page(page, queryDTO));
+ }
+
+}
\ No newline at end of file
diff --git a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/PaymentConfirmController.java b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/PaymentConfirmController.java
index f9af450..5bd0759 100644
--- a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/PaymentConfirmController.java
+++ b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/PaymentConfirmController.java
@@ -122,4 +122,12 @@
public List<PaymentConfirm> export(PaymentConfirm paymentConfirm,Long[] ids) {
return paymentConfirmService.list(Wrappers.lambdaQuery(paymentConfirm).in(ArrayUtil.isNotEmpty(ids), PaymentConfirm::getId, ids));
}
+
+ /**
+ * 瀹氭椂鏌ヨ鏀舵鍗�
+ */
+ @GetMapping("syncPaymentRecepit")
+ public R syncPaymentRecepit(){
+ return paymentConfirmService.syncPaymentRecepit();
+ }
}
\ No newline at end of file
diff --git a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/PaymentOffsetController.java b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/PaymentOffsetController.java
new file mode 100644
index 0000000..08e8459
--- /dev/null
+++ b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/PaymentOffsetController.java
@@ -0,0 +1,123 @@
+package com.by4cloud.platformx.business.controller;
+
+import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.util.ArrayUtil;
+import cn.hutool.core.collection.CollUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.by4cloud.platformx.common.core.util.R;
+import com.by4cloud.platformx.common.log.annotation.SysLog;
+import com.by4cloud.platformx.business.entity.PaymentOffset;
+import com.by4cloud.platformx.business.service.PaymentOffsetService;
+import org.springframework.security.access.prepost.PreAuthorize;
+import com.by4cloud.platformx.common.excel.annotation.ResponseExcel;
+import io.swagger.v3.oas.annotations.security.SecurityRequirement;
+import org.springdoc.core.annotations.ParameterObject;
+import org.springframework.http.HttpHeaders;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import java.util.Objects;
+
+/**
+ * 鎶垫姽璐�
+ *
+ * @author syt
+ * @date 2026-05-19 10:38:26
+ */
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/paymentOffset" )
+@Tag(description = "paymentOffset" , name = "鎶垫姽璐︾鐞�" )
+@SecurityRequirement(name = HttpHeaders.AUTHORIZATION)
+public class PaymentOffsetController {
+
+ private final PaymentOffsetService paymentOffsetService;
+
+ /**
+ * 鍒嗛〉鏌ヨ
+ * @param page 鍒嗛〉瀵硅薄
+ * @param paymentOffset 鎶垫姽璐�
+ * @return
+ */
+ @Operation(summary = "鍒嗛〉鏌ヨ" , description = "鍒嗛〉鏌ヨ" )
+ @GetMapping("/page" )
+ @PreAuthorize("@pms.hasPermission('business_paymentOffset_view')" )
+ public R getPaymentOffsetPage(@ParameterObject Page page, @ParameterObject PaymentOffset paymentOffset) {
+ LambdaQueryWrapper<PaymentOffset> wrapper = Wrappers.lambdaQuery();
+ wrapper.like(StrUtil.isNotBlank(paymentOffset.getBusGuestName()),PaymentOffset::getBusGuestName,paymentOffset.getBusGuestName());
+ wrapper.like(StrUtil.isNotBlank(paymentOffset.getContractName()),PaymentOffset::getContractName,paymentOffset.getContractName());
+ wrapper.orderByDesc(PaymentOffset::getCreateTime);
+ return R.ok(paymentOffsetService.page(page, wrapper));
+ }
+
+
+ /**
+ * 閫氳繃id鏌ヨ鎶垫姽璐�
+ * @param id id
+ * @return R
+ */
+ @Operation(summary = "閫氳繃id鏌ヨ" , description = "閫氳繃id鏌ヨ" )
+ @GetMapping("/{id}" )
+ @PreAuthorize("@pms.hasPermission('business_paymentOffset_view')" )
+ public R getById(@PathVariable("id" ) Long id) {
+ return R.ok(paymentOffsetService.getById(id));
+ }
+
+ /**
+ * 鏂板鎶垫姽璐�
+ * @param paymentOffset 鎶垫姽璐�
+ * @return R
+ */
+ @Operation(summary = "鏂板鎶垫姽璐�" , description = "鏂板鎶垫姽璐�" )
+ @SysLog("鏂板鎶垫姽璐�" )
+ @PostMapping
+ @PreAuthorize("@pms.hasPermission('business_paymentOffset_add')" )
+ public R save(@RequestBody PaymentOffset paymentOffset) {
+ return paymentOffsetService.add(paymentOffset);
+ }
+
+ /**
+ * 淇敼鎶垫姽璐�
+ * @param paymentOffset 鎶垫姽璐�
+ * @return R
+ */
+ @Operation(summary = "淇敼鎶垫姽璐�" , description = "淇敼鎶垫姽璐�" )
+ @SysLog("淇敼鎶垫姽璐�" )
+ @PutMapping
+ @PreAuthorize("@pms.hasPermission('business_paymentOffset_edit')" )
+ public R updateById(@RequestBody PaymentOffset paymentOffset) {
+ return R.ok(paymentOffsetService.updateById(paymentOffset));
+ }
+
+ /**
+ * 閫氳繃id鍒犻櫎鎶垫姽璐�
+ * @param ids id鍒楄〃
+ * @return R
+ */
+ @Operation(summary = "閫氳繃id鍒犻櫎鎶垫姽璐�" , description = "閫氳繃id鍒犻櫎鎶垫姽璐�" )
+ @SysLog("閫氳繃id鍒犻櫎鎶垫姽璐�" )
+ @DeleteMapping
+ @PreAuthorize("@pms.hasPermission('business_paymentOffset_del')" )
+ public R removeById(@RequestBody Long[] ids) {
+ return R.ok(paymentOffsetService.removeBatchByIds(CollUtil.toList(ids)));
+ }
+
+
+ /**
+ * 瀵煎嚭excel 琛ㄦ牸
+ * @param paymentOffset 鏌ヨ鏉′欢
+ * @param ids 瀵煎嚭鎸囧畾ID
+ * @return excel 鏂囦欢娴�
+ */
+ @ResponseExcel
+ @GetMapping("/export")
+ @PreAuthorize("@pms.hasPermission('business_paymentOffset_export')" )
+ public List<PaymentOffset> export(PaymentOffset paymentOffset,Long[] ids) {
+ return paymentOffsetService.list(Wrappers.lambdaQuery(paymentOffset).in(ArrayUtil.isNotEmpty(ids), PaymentOffset::getId, ids));
+ }
+}
\ No newline at end of file
diff --git a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/mapper/ContractMapper.java b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/mapper/ContractMapper.java
index 8068932..ab2b09d 100644
--- a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/mapper/ContractMapper.java
+++ b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/mapper/ContractMapper.java
@@ -1,12 +1,18 @@
package com.by4cloud.platformx.business.mapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.by4cloud.platformx.business.dto.CreditSalesQueryDTO;
import com.by4cloud.platformx.business.entity.Contract;
+import com.by4cloud.platformx.business.vo.ContractCreditSalesPageVo;
+import com.by4cloud.platformx.common.data.datascope.DataScope;
import com.by4cloud.platformx.common.data.datascope.PlatformxBaseMapper;
import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
/**
* @author 28254
*/
@Mapper
public interface ContractMapper extends PlatformxBaseMapper<Contract> {
+ Page<ContractCreditSalesPageVo> pageByCredit(Page page, @Param("queryDTO") CreditSalesQueryDTO queryDTO, DataScope comp_id);
}
diff --git a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/mapper/PaymentOffsetMapper.java b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/mapper/PaymentOffsetMapper.java
new file mode 100644
index 0000000..489afd5
--- /dev/null
+++ b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/mapper/PaymentOffsetMapper.java
@@ -0,0 +1,11 @@
+package com.by4cloud.platformx.business.mapper;
+
+import com.by4cloud.platformx.common.data.datascope.PlatformxBaseMapper;
+import com.by4cloud.platformx.business.entity.PaymentOffset;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface PaymentOffsetMapper extends PlatformxBaseMapper<PaymentOffset> {
+
+
+}
\ No newline at end of file
diff --git a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/ContractService.java b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/ContractService.java
index 636f2d1..8977d73 100644
--- a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/ContractService.java
+++ b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/ContractService.java
@@ -26,4 +26,6 @@
R refuseApproval(Long id);
void takeEffect(Long id);
+
+ R copyNewContract(Long id);
}
diff --git a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/CreditSalesService.java b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/CreditSalesService.java
new file mode 100644
index 0000000..61230ef
--- /dev/null
+++ b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/CreditSalesService.java
@@ -0,0 +1,8 @@
+package com.by4cloud.platformx.business.service;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.by4cloud.platformx.business.dto.CreditSalesQueryDTO;
+
+public interface CreditSalesService {
+ Page page(Page page, CreditSalesQueryDTO queryDTO);
+}
diff --git a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/PaymentConfirmService.java b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/PaymentConfirmService.java
index 0909fa5..bab880e 100644
--- a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/PaymentConfirmService.java
+++ b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/PaymentConfirmService.java
@@ -8,4 +8,6 @@
public interface PaymentConfirmService extends IIService<PaymentConfirm> {
R add(PaymentConfirmAddDTO addDTO);
+
+ R syncPaymentRecepit();
}
\ No newline at end of file
diff --git a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/PaymentOffsetService.java b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/PaymentOffsetService.java
new file mode 100644
index 0000000..18e75e9
--- /dev/null
+++ b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/PaymentOffsetService.java
@@ -0,0 +1,10 @@
+package com.by4cloud.platformx.business.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.by4cloud.platformx.business.entity.PaymentOffset;
+import com.by4cloud.platformx.common.core.util.R;
+
+public interface PaymentOffsetService extends IService<PaymentOffset> {
+
+ R add(PaymentOffset paymentOffset);
+}
\ No newline at end of file
diff --git a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/ContractPaymentScheduleProcessServiceImpl.java b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/ContractPaymentScheduleProcessServiceImpl.java
index be9ffc8..da08ddc 100644
--- a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/ContractPaymentScheduleProcessServiceImpl.java
+++ b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/ContractPaymentScheduleProcessServiceImpl.java
@@ -21,6 +21,9 @@
import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.stream.Collectors;
/**
* 灞ョ害鑺傜偣
@@ -33,166 +36,330 @@
public class ContractPaymentScheduleProcessServiceImpl extends ServiceImpl<ContractPaymentScheduleProcessMapper, ContractPaymentScheduleProcess> implements ContractPaymentScheduleProcessService {
private final ContractPaymentScheduleMapper contractPaymentScheduleMapper;
- private final ContractPaymentScheduleProcessMapper processMapper;
private final ContractMapper contractMapper;
private final ContractSubjectMatterMapper subjectMatterMapper;
private final PaymentConfirmMapper paymentConfirmMapper;
+ private final ContractOutBoundMapper contractOutBoundMapper;
@Override
public R add(ContractPaymentScheduleProcessAddDTO addDTO) {
ContractPaymentSchedule schedule = contractPaymentScheduleMapper.selectById(addDTO.getScheduleId());
- if (ObjUtil.isNull(schedule)){
+ if (ObjUtil.isNull(schedule)) {
return R.failed("灞ョ害闃舵涓庡悎鍚屼笉涓�鑷达紝璇疯仈绯绘妧鏈汉鍛�");
+ }
+ if (schedule.getStageName().equals("璐у埌绛炬敹") && ArrayUtil.isEmpty(addDTO.getContractOutBoundIds().toArray())) {
+ return R.failed("璇烽�夋嫨鍒拌揣鐨勫嚭搴撲俊鎭�");
}
//鍚堝悓
Contract contract = contractMapper.selectById(schedule.getContractId());
- List<ContractSubjectMatter> subjectMatterList = subjectMatterMapper.selectList(Wrappers.<ContractSubjectMatter>lambdaQuery().eq(ContractSubjectMatter::getContractId,contract.getId()));
- if (ArrayUtil.isEmpty(subjectMatterList.toArray())){
+ List<ContractSubjectMatter> subjectMatterList = subjectMatterMapper.selectList(Wrappers.<ContractSubjectMatter>lambdaQuery().eq(ContractSubjectMatter::getContractId, contract.getId()));
+ if (ArrayUtil.isEmpty(subjectMatterList.toArray())) {
return R.failed("璇ュ悎鍚屾爣鐨勭墿寮傚父锛岃鑱旂郴鎶�鏈汉鍛�");
}
- if (!subjectMatterList.stream().allMatch(item->item.getDeliveryStatus()==2)){
- return R.failed("鍑哄簱鏁伴噺灏忎簬褰撳墠鍚堝悓鏍囩殑鐗╂暟閲忥紝鏃犳硶杩涜褰撳墠鎿嶄綔");
+// if (!subjectMatterList.stream().allMatch(item -> item.getDeliveryStatus() == 2)) {
+// return R.failed("鍑哄簱鏁伴噺灏忎簬褰撳墠鍚堝悓鏍囩殑鐗╂暟閲忥紝鏃犳硶杩涜褰撳墠鎿嶄綔");
+// }
+ if (schedule.getStageName().equals("璐у埌绛炬敹")) {
+ //鏇存柊鍚堝悓鍑哄簱鍒拌揣鏃堕棿
+ addDTO.getContractOutBoundIds().forEach(contractOutBoundId -> {
+ ContractOutBound contractOutBound = contractOutBoundMapper.selectById(contractOutBoundId);
+ contractOutBound.setArrivalTime(addDTO.getProcessDate());
+ contractOutBound.setArrivalAttNames(addDTO.getOutBoundAttNames());
+ contractOutBound.setArrivalAttPaths(addDTO.getOutBoundAttPaths());
+ contractOutBoundMapper.updateById(contractOutBound);
+ });
}
- //鏂板褰撳墠闃舵搴旀敹
- PaymentConfirm currentConfim = new PaymentConfirm();
- currentConfim.setBusinessType(schedule.getStageName()+"搴旀敹");
- currentConfim.setBusGuestId(contract.getPartyAId());
- currentConfim.setBusGuestName(contract.getPartyA());
- currentConfim.setContractId(contract.getId());
- currentConfim.setContractName(contract.getContractName());
- currentConfim.setContractNo(contract.getContractNo());
- currentConfim.setScheduleId(schedule.getId());
- currentConfim.setScheduleName(schedule.getStageName());
- currentConfim.setConfirmTime(addDTO.getProcessDate());
- currentConfim.setTransationAmount(schedule.getPlannedAmount());
- currentConfim.setReceivableAmount(schedule.getPlannedAmount());
- PaymentConfirm lastConfirm = paymentConfirmMapper.selectOne(Wrappers.<PaymentConfirm>lambdaQuery().eq(PaymentConfirm::getContractId,contract.getId())
- .orderByDesc(PaymentConfirm::getCreateTime).last("limit 1"));
- BigDecimal lastTotal = new BigDecimal("0");
- if(ObjUtil.isNotNull(lastConfirm)){
- lastTotal = lastConfirm.getTotalAmount();
- }
- currentConfim.setTotalAmount(lastTotal.subtract(currentConfim.getReceivableAmount()));
- paymentConfirmMapper.insert(currentConfim);
//灞ョ害
- ContractPaymentScheduleProcess contractPaymentScheduleProcess = BeanUtil.copyProperties(addDTO,ContractPaymentScheduleProcess.class);
+ ContractPaymentScheduleProcess contractPaymentScheduleProcess = BeanUtil.copyProperties(addDTO, ContractPaymentScheduleProcess.class);
contractPaymentScheduleProcess.setContractId(schedule.getContractId());
contractPaymentScheduleProcess.setContractName(schedule.getContractName());
contractPaymentScheduleProcess.setScheduleId(schedule.getId());
contractPaymentScheduleProcess.setScheduleName(schedule.getStageName());
- baseMapper.insert(contractPaymentScheduleProcess);
+ ContractPaymentScheduleProcess lastProcess = baseMapper.selectOne(Wrappers.<ContractPaymentScheduleProcess>lambdaQuery().eq(ContractPaymentScheduleProcess::getContractId, schedule.getContractId())
+ .eq(ContractPaymentScheduleProcess::getScheduleId, schedule.getId()).last("limit 1"));
+ if (ObjUtil.isNull(lastProcess)) {
+ baseMapper.insert(contractPaymentScheduleProcess);
+ }
+
//鏇存柊褰撳墠闃舵
- if (ObjUtil.isNull(schedule.getEffectiveDate())) {
- schedule.setEffectiveDate(DateUtil.offsetDay(addDTO.getProcessDate(),schedule.getAgreedDays()));
+ if (ObjUtil.isNull(schedule.getEffectiveDate()) && ObjUtil.isNull(schedule.getEffectiveEndDate())) {
+ schedule.setEffectiveDate(DateUtil.offsetDay(addDTO.getProcessDate(), schedule.getAgreedDays()));
contractPaymentScheduleMapper.updateById(schedule);
}
+
//鏌ヨ鏄惁鏈変箣鍓嶉樁娈�
ContractPaymentSchedule beforeSchedule = contractPaymentScheduleMapper.selectOne(Wrappers.<ContractPaymentSchedule>lambdaQuery().eq(ContractPaymentSchedule::getContractId, schedule.getContractId())
.lt(ContractPaymentSchedule::getStageOrder, schedule.getStageOrder()).orderByDesc(ContractPaymentSchedule::getCreateTime).last("limit 1"));
- if (ObjUtil.isNotNull(beforeSchedule)){
+ if (ObjUtil.isNotNull(beforeSchedule) && ObjUtil.isNull(beforeSchedule.getEffectiveEndDate())) {
beforeSchedule.setEffectiveEndDate(schedule.getEffectiveDate());
contractPaymentScheduleMapper.updateById(beforeSchedule);
- //涔嬪墠闃舵鏄惁鏀舵瀹屾垚
-// if (beforeSchedule.getPaymentStatus()!=2){
-// //鏂板涔嬪墠闃舵瓒呮湡
-// PaymentConfirm beforeConfim = new PaymentConfirm();
-// beforeConfim.setBusinessType("搴旀敹瓒呮湡");
-// beforeConfim.setBusGuestId(contract.getPartyAId());
-// beforeConfim.setBusGuestName(contract.getPartyA());
-// beforeConfim.setContractId(contract.getId());
-// beforeConfim.setContractName(contract.getContractName());
-// beforeConfim.setContractNo(contract.getContractNo());
-// beforeConfim.setScheduleId(schedule.getId());
-// beforeConfim.setScheduleName(schedule.getStageName());
-// beforeConfim.setConfirmTime(addDTO.getProcessDate());
-// beforeConfim.setTransationAmount(schedule.getPlannedAmount());
-// PaymentConfirm newLastConfirm = paymentConfirmMapper.selectOne(Wrappers.<PaymentConfirm>lambdaQuery().eq(PaymentConfirm::getContractId,contract.getId())
-// .orderByDesc(PaymentConfirm::getCreateTime).last("limit 1"));
-// beforeConfim.setOverdueAmount(StrUtil.equals(schedule.getPaymentStatus()+"","0")?
-// schedule.getPlannedAmount():
-// schedule.getPlannedAmount().subtract(schedule.getActualAmount()));
-// beforeConfim.setTotalAmount(newLastConfirm.getTotalAmount());
-// paymentConfirmMapper.insert(beforeConfim);
-// }
+ }
- }
- //鏌ヨ鏄惁鏈夊悗缁樁娈�
- List<ContractPaymentSchedule> afterSchedule = contractPaymentScheduleMapper.selectList(Wrappers.<ContractPaymentSchedule>lambdaQuery()
- .eq(ContractPaymentSchedule::getContractId, schedule.getContractId())
- .gt(ContractPaymentSchedule::getStageOrder, schedule.getStageOrder()));
- if (ArrayUtil.isNotEmpty(afterSchedule.toArray())&&afterSchedule.size()==1){
- //鏈�鍚庨樁娈电敓鏁堟椂闂�
- ContractPaymentSchedule endSchedule = afterSchedule.get(0);
- if (StrUtil.equals(endSchedule.getStageName(),"璐ㄤ繚閲�")) {
- endSchedule.setEffectiveDate(DateUtil.offsetDay(addDTO.getProcessDate(), endSchedule.getAgreedDays()));
- endSchedule.setEffectiveEndDate(contract.getExpirationDate());
- contractPaymentScheduleMapper.updateById(endSchedule);
- //褰撳墠闃舵鐢熸晥鏃堕棿
- schedule.setEffectiveDate(DateUtil.offsetDay(addDTO.getProcessDate(), schedule.getAgreedDays()));
- schedule.setEffectiveEndDate(endSchedule.getEffectiveDate());
- contractPaymentScheduleMapper.updateById(schedule);
- //鏈�鍚庨樁娈靛簲鏀�
- PaymentConfirm newConfim = new PaymentConfirm();
- newConfim.setBusinessType(endSchedule.getStageName() + "搴旀敹");
- newConfim.setBusGuestId(contract.getPartyAId());
- newConfim.setBusGuestName(contract.getPartyA());
- newConfim.setContractId(contract.getId());
- newConfim.setContractName(contract.getContractName());
- newConfim.setContractNo(contract.getContractNo());
- newConfim.setScheduleId(endSchedule.getId());
- newConfim.setScheduleName(schedule.getStageName());
- newConfim.setConfirmTime(addDTO.getProcessDate());
- newConfim.setTransationAmount(endSchedule.getPlannedAmount());
- newConfim.setReceivableAmount(endSchedule.getPlannedAmount());
- PaymentConfirm lastNewConfirm = paymentConfirmMapper.selectOne(Wrappers.<PaymentConfirm>lambdaQuery().eq(PaymentConfirm::getContractId, contract.getId())
- .orderByDesc(PaymentConfirm::getCreateTime).last("limit 1"));
- BigDecimal lastNewTotal = new BigDecimal("0");
- if (ObjUtil.isNotNull(lastNewConfirm)) {
- lastNewTotal = lastNewConfirm.getTotalAmount();
+ List<ContractOutBound> contractOutBoundList = contractOutBoundMapper.selectList(Wrappers.<ContractOutBound>lambdaQuery().eq(ContractOutBound::getContractId, contract.getId())
+ .isNotNull(ContractOutBound::getArrivalTime));
+ if (schedule.getStageName().equals("璐у埌绛炬敹")) {
+ if (ArrayUtil.isNotEmpty(contractOutBoundList.toArray())
+ && ArrayUtil.isNotEmpty(subjectMatterList.toArray())) {
+ Map<String, BigDecimal> sumMap = contractOutBoundList.stream()
+ .collect(Collectors.groupingBy(
+ ContractOutBound::getSubjectMatterCode,
+ Collectors.reducing(
+ BigDecimal.ZERO,
+ ContractOutBound::getOutBoundNum,
+ BigDecimal::add
+ )
+ ));
+ Boolean outFlag = checkQuantityEquality(subjectMatterList, sumMap);
+ //鍑哄簱鍒拌揣涓庡悎鍚屾爣鐨勭墿绉嶇被鏁伴噺涓�鑷�
+ if (outFlag) {
+ //鏂板褰撳墠闃舵搴旀敹
+ PaymentConfirm currentConfim = new PaymentConfirm();
+ currentConfim.setBusinessType(schedule.getStageName() + "搴旀敹");
+ currentConfim.setBusGuestId(contract.getPartyAId());
+ currentConfim.setBusGuestName(contract.getPartyA());
+ currentConfim.setContractId(contract.getId());
+ currentConfim.setContractName(contract.getContractName());
+ currentConfim.setContractNo(contract.getContractNo());
+ currentConfim.setScheduleId(schedule.getId());
+ currentConfim.setScheduleName(schedule.getStageName());
+ currentConfim.setConfirmTime(addDTO.getProcessDate());
+ currentConfim.setTransationAmount(schedule.getPlannedAmount());
+ currentConfim.setReceivableAmount(schedule.getPlannedAmount());
+ PaymentConfirm lastConfirm = paymentConfirmMapper.selectOne(Wrappers.<PaymentConfirm>lambdaQuery().eq(PaymentConfirm::getContractId, contract.getId())
+ .orderByDesc(PaymentConfirm::getCreateTime).last("limit 1"));
+ BigDecimal lastTotal = new BigDecimal("0");
+ if (ObjUtil.isNotNull(lastConfirm)) {
+ lastTotal = lastConfirm.getTotalAmount();
+ }
+ currentConfim.setTotalAmount(lastTotal.subtract(currentConfim.getReceivableAmount()));
+ if (schedule.getPaymentRatio().compareTo(new BigDecimal("0")) > 0) {
+ paymentConfirmMapper.insert(currentConfim);
+ }
+
+ //鏌ヨ鏄惁鏈夊悗缁樁娈�
+ List<ContractPaymentSchedule> afterSchedule = contractPaymentScheduleMapper.selectList(Wrappers.<ContractPaymentSchedule>lambdaQuery()
+ .eq(ContractPaymentSchedule::getContractId, schedule.getContractId())
+ .gt(ContractPaymentSchedule::getStageOrder, schedule.getStageOrder()));
+ if (ArrayUtil.isNotEmpty(afterSchedule.toArray()) && afterSchedule.size() == 1) {
+ //鏈�鍚庨樁娈电敓鏁堟椂闂�
+ ContractPaymentSchedule endSchedule = afterSchedule.get(0);
+ if (StrUtil.equals(endSchedule.getStageName(), "璐ㄤ繚閲�")) {
+ endSchedule.setEffectiveDate(DateUtil.offsetDay(addDTO.getProcessDate(), endSchedule.getAgreedDays()));
+ endSchedule.setEffectiveEndDate(contract.getExpirationDate());
+ contractPaymentScheduleMapper.updateById(endSchedule);
+ //褰撳墠闃舵鐢熸晥鏃堕棿
+ schedule.setEffectiveDate(DateUtil.offsetDay(addDTO.getProcessDate(), schedule.getAgreedDays()));
+ schedule.setEffectiveEndDate(endSchedule.getEffectiveDate());
+ contractPaymentScheduleMapper.updateById(schedule);
+ //鏈�鍚庨樁娈靛簲鏀�
+ PaymentConfirm newConfim = new PaymentConfirm();
+ newConfim.setBusinessType(endSchedule.getStageName() + "搴旀敹");
+ newConfim.setBusGuestId(contract.getPartyAId());
+ newConfim.setBusGuestName(contract.getPartyA());
+ newConfim.setContractId(contract.getId());
+ newConfim.setContractName(contract.getContractName());
+ newConfim.setContractNo(contract.getContractNo());
+ newConfim.setScheduleId(endSchedule.getId());
+ newConfim.setScheduleName(schedule.getStageName());
+ newConfim.setConfirmTime(addDTO.getProcessDate());
+ newConfim.setTransationAmount(endSchedule.getPlannedAmount());
+ newConfim.setReceivableAmount(endSchedule.getPlannedAmount());
+ PaymentConfirm lastNewConfirm = paymentConfirmMapper.selectOne(Wrappers.<PaymentConfirm>lambdaQuery().eq(PaymentConfirm::getContractId, contract.getId())
+ .orderByDesc(PaymentConfirm::getCreateTime).last("limit 1"));
+ BigDecimal lastNewTotal = new BigDecimal("0");
+ if (ObjUtil.isNotNull(lastNewConfirm)) {
+ lastNewTotal = lastNewConfirm.getTotalAmount();
+ }
+ newConfim.setTotalAmount(lastNewTotal.subtract(newConfim.getReceivableAmount()));
+ if (endSchedule.getPaymentRatio().compareTo(new BigDecimal("0")) > 0) {
+ paymentConfirmMapper.insert(newConfim);
+ }
+
+ }
+ //鏇存柊鍚堝悓涓嬩釜闃舵
+ contract.setNextScheduleName(endSchedule.getStageName());
+ contractMapper.updateById(contract);
+ }
+ if (ArrayUtil.isNotEmpty(afterSchedule.toArray()) && afterSchedule.size() > 1) {
+ //鏇存柊鍚堝悓涓嬩釜闃舵
+ contract.setNextScheduleName(afterSchedule.get(0).getStageName());
+ contractMapper.updateById(contract);
+ }
+ if (ArrayUtil.isEmpty(afterSchedule.toArray())) {
+ schedule.setEffectiveEndDate(contract.getExpirationDate());
+ contractPaymentScheduleMapper.updateById(schedule);
+ //鏇存柊鍚堝悓涓嬩釜闃舵
+ contract.setNextScheduleName("鏃�");
+ contractMapper.updateById(contract);
+ //褰撳墠涓哄悎鍚屾渶鍚庨樁娈�
+ PaymentConfirm lastNewConfirm = paymentConfirmMapper.selectOne(Wrappers.<PaymentConfirm>lambdaQuery().eq(PaymentConfirm::getContractId, contract.getId())
+ .orderByDesc(PaymentConfirm::getCreateTime).last("limit 1"));
+ if (lastNewConfirm.getTotalAmount().compareTo(new BigDecimal("0")) >= 0) {
+ //鏈夐浠樹笖瓒呰繃搴旀敹 鍏抽棴鍚堝悓鐘舵��
+ contract.setContractStatus(3);
+ contractMapper.updateById(contract);
+ }
+ }
}
- newConfim.setTotalAmount(lastNewTotal.subtract(newConfim.getReceivableAmount()));
- paymentConfirmMapper.insert(newConfim);
}
- //鏇存柊鍚堝悓涓嬩釜闃舵
- contract.setNextScheduleName(endSchedule.getStageName());
- contractMapper.updateById(contract);
- }
- if(ArrayUtil.isNotEmpty(afterSchedule.toArray())&&afterSchedule.size()>1){
- //鏇存柊鍚堝悓涓嬩釜闃舵
- contract.setNextScheduleName(afterSchedule.get(0).getStageName());
- contractMapper.updateById(contract);
- }
- if(ArrayUtil.isEmpty(afterSchedule.toArray())){
- schedule.setEffectiveEndDate(contract.getExpirationDate());
- contractPaymentScheduleMapper.updateById(schedule);
- //鏇存柊鍚堝悓涓嬩釜闃舵
- contract.setNextScheduleName("鏃�");
- contractMapper.updateById(contract);
- //褰撳墠涓哄悎鍚屾渶鍚庨樁娈�
- PaymentConfirm lastNewConfirm = paymentConfirmMapper.selectOne(Wrappers.<PaymentConfirm>lambdaQuery().eq(PaymentConfirm::getContractId,contract.getId())
+ } else {
+ //鏂板褰撳墠闃舵搴旀敹
+ PaymentConfirm currentConfim = new PaymentConfirm();
+ currentConfim.setBusinessType(schedule.getStageName() + "搴旀敹");
+ currentConfim.setBusGuestId(contract.getPartyAId());
+ currentConfim.setBusGuestName(contract.getPartyA());
+ currentConfim.setContractId(contract.getId());
+ currentConfim.setContractName(contract.getContractName());
+ currentConfim.setContractNo(contract.getContractNo());
+ currentConfim.setScheduleId(schedule.getId());
+ currentConfim.setScheduleName(schedule.getStageName());
+ currentConfim.setConfirmTime(addDTO.getProcessDate());
+ currentConfim.setTransationAmount(schedule.getPlannedAmount());
+ currentConfim.setReceivableAmount(schedule.getPlannedAmount());
+ PaymentConfirm lastConfirm = paymentConfirmMapper.selectOne(Wrappers.<PaymentConfirm>lambdaQuery().eq(PaymentConfirm::getContractId, contract.getId())
.orderByDesc(PaymentConfirm::getCreateTime).last("limit 1"));
- if (lastNewConfirm.getTotalAmount().compareTo(new BigDecimal("0"))>=0){
- //鏈夐浠樹笖瓒呰繃搴旀敹 鍏抽棴鍚堝悓鐘舵��
- contract.setContractStatus(3);
+ BigDecimal lastTotal = new BigDecimal("0");
+ if (ObjUtil.isNotNull(lastConfirm)) {
+ lastTotal = lastConfirm.getTotalAmount();
+ }
+ currentConfim.setTotalAmount(lastTotal.subtract(currentConfim.getReceivableAmount()));
+ if (schedule.getPaymentRatio().compareTo(new BigDecimal("0")) > 0) {
+ paymentConfirmMapper.insert(currentConfim);
+ }
+
+ //鏌ヨ鏄惁鏈夊悗缁樁娈�
+ List<ContractPaymentSchedule> afterSchedule = contractPaymentScheduleMapper.selectList(Wrappers.<ContractPaymentSchedule>lambdaQuery()
+ .eq(ContractPaymentSchedule::getContractId, schedule.getContractId())
+ .gt(ContractPaymentSchedule::getStageOrder, schedule.getStageOrder()));
+ if (ArrayUtil.isNotEmpty(afterSchedule.toArray()) && afterSchedule.size() == 1) {
+ //鏈�鍚庨樁娈电敓鏁堟椂闂�
+ ContractPaymentSchedule endSchedule = afterSchedule.get(0);
+ if (StrUtil.equals(endSchedule.getStageName(), "璐ㄤ繚閲�")) {
+ endSchedule.setEffectiveDate(DateUtil.offsetDay(addDTO.getProcessDate(), endSchedule.getAgreedDays()));
+ endSchedule.setEffectiveEndDate(contract.getExpirationDate());
+ contractPaymentScheduleMapper.updateById(endSchedule);
+ //褰撳墠闃舵鐢熸晥鏃堕棿
+ schedule.setEffectiveDate(DateUtil.offsetDay(addDTO.getProcessDate(), schedule.getAgreedDays()));
+ schedule.setEffectiveEndDate(endSchedule.getEffectiveDate());
+ contractPaymentScheduleMapper.updateById(schedule);
+ //鏈�鍚庨樁娈靛簲鏀�
+ PaymentConfirm newConfim = new PaymentConfirm();
+ newConfim.setBusinessType(endSchedule.getStageName() + "搴旀敹");
+ newConfim.setBusGuestId(contract.getPartyAId());
+ newConfim.setBusGuestName(contract.getPartyA());
+ newConfim.setContractId(contract.getId());
+ newConfim.setContractName(contract.getContractName());
+ newConfim.setContractNo(contract.getContractNo());
+ newConfim.setScheduleId(endSchedule.getId());
+ newConfim.setScheduleName(schedule.getStageName());
+ newConfim.setConfirmTime(addDTO.getProcessDate());
+ newConfim.setTransationAmount(endSchedule.getPlannedAmount());
+ newConfim.setReceivableAmount(endSchedule.getPlannedAmount());
+ PaymentConfirm lastNewConfirm = paymentConfirmMapper.selectOne(Wrappers.<PaymentConfirm>lambdaQuery().eq(PaymentConfirm::getContractId, contract.getId())
+ .orderByDesc(PaymentConfirm::getCreateTime).last("limit 1"));
+ BigDecimal lastNewTotal = new BigDecimal("0");
+ if (ObjUtil.isNotNull(lastNewConfirm)) {
+ lastNewTotal = lastNewConfirm.getTotalAmount();
+ }
+ newConfim.setTotalAmount(lastNewTotal.subtract(newConfim.getReceivableAmount()));
+ if (endSchedule.getPaymentRatio().compareTo(new BigDecimal("0")) > 0) {
+ paymentConfirmMapper.insert(newConfim);
+ }
+
+ }
+ //鏇存柊鍚堝悓涓嬩釜闃舵
+ contract.setNextScheduleName(endSchedule.getStageName());
contractMapper.updateById(contract);
}
+ if (ArrayUtil.isNotEmpty(afterSchedule.toArray()) && afterSchedule.size() > 1) {
+ //鏇存柊鍚堝悓涓嬩釜闃舵
+ contract.setNextScheduleName(afterSchedule.get(0).getStageName());
+ contractMapper.updateById(contract);
+ }
+ if (ArrayUtil.isEmpty(afterSchedule.toArray())) {
+ schedule.setEffectiveEndDate(contract.getExpirationDate());
+ contractPaymentScheduleMapper.updateById(schedule);
+ //鏇存柊鍚堝悓涓嬩釜闃舵
+ contract.setNextScheduleName("鏃�");
+ contractMapper.updateById(contract);
+ //褰撳墠涓哄悎鍚屾渶鍚庨樁娈�
+ PaymentConfirm lastNewConfirm = paymentConfirmMapper.selectOne(Wrappers.<PaymentConfirm>lambdaQuery().eq(PaymentConfirm::getContractId, contract.getId())
+ .orderByDesc(PaymentConfirm::getCreateTime).last("limit 1"));
+ if (lastNewConfirm.getTotalAmount().compareTo(new BigDecimal("0")) >= 0) {
+ //鏈夐浠樹笖瓒呰繃搴旀敹 鍏抽棴鍚堝悓鐘舵��
+ contract.setContractStatus(3);
+ contractMapper.updateById(contract);
+ }
+ }
}
+
+
return R.ok();
+ }
+
+ public boolean checkQuantityEquality(List<ContractSubjectMatter> subjectMatterList, Map<String, BigDecimal> materialCodeMap) {
+ // 1. 鍩烘湰鏍￠獙
+ if (subjectMatterList == null || materialCodeMap == null) {
+ return false;
+ }
+
+ // 濡傛灉瑕佹眰涓よ�呭寘鍚殑鐗╂枡浠ｇ爜瀹屽叏涓�鑷翠笖鏁伴噺涓�鑷达紝鍏堟瘮杈� Key 鐨勬暟閲�
+ // 鎻愬彇 List 涓潪绌虹殑 materialCode
+ List<String> listCodes = subjectMatterList.stream()
+ .map(ContractSubjectMatter::getMaterialCode)
+ .filter(Objects::nonNull)
+ .distinct()
+ .sorted()
+ .collect(Collectors.toList());
+
+ List<String> mapKeys = materialCodeMap.keySet().stream()
+ .sorted()
+ .collect(Collectors.toList());
+
+ // 濡傛灉鐗╂枡缂栫爜闆嗗悎涓嶄竴鑷达紝鐩存帴杩斿洖 false
+ if (!listCodes.equals(mapKeys)) {
+ return false;
+ }
+
+ // 2. 閫愪釜姣旇緝鏁伴噺
+ // 鍋囪 ContractSubjectMatter 涓湁 getQuantity() 鏂规硶杩斿洖 BigDecimal 鎴� Number
+ for (ContractSubjectMatter item : subjectMatterList) {
+ String code = item.getMaterialCode();
+ if (code == null) continue;
+
+ BigDecimal mapValue = materialCodeMap.get(code);
+ BigDecimal listValue = item.getQuantity(); // 鍋囪杩欐槸 List 涓唬琛ㄦ暟閲忕殑瀛楁
+
+ // 澶勭悊 null 鎯呭喌
+ if (mapValue == null && listValue == null) {
+ continue; // 閮戒负绌鸿涓虹浉绛夛紝鎴栨牴鎹笟鍔″畾涓轰笉绛�
+ }
+ if (mapValue == null || listValue == null) {
+ return false; // 涓�涓负绌轰竴涓笉涓虹┖锛屼笉绛�
+ }
+
+ // 浣跨敤 compareTo 姣旇緝 BigDecimal 鍊硷紝0 琛ㄧず鐩哥瓑
+ if (listValue.compareTo(mapValue) != 0) {
+ return false; // 鍙戠幇涓嶇浉绛夛紝绔嬪嵆杩斿洖
+ }
+ }
+
+ return true; // 鎵�鏈夊尮閰嶉」鏁伴噺鍧囩浉绛�
}
@Override
public R selectScheduleProcess(Long id) {
MPJLambdaWrapper<ContractPaymentSchedule> wrapper = new MPJLambdaWrapper<ContractPaymentSchedule>()
- .select(ContractPaymentSchedule::getId,ContractPaymentSchedule::getStageName,ContractPaymentSchedule::getEffectiveDate,
- ContractPaymentSchedule::getPlannedAmount,ContractPaymentSchedule::getPlannedAmount,
- ContractPaymentSchedule::getEffectiveEndDate,ContractPaymentSchedule::getPaymentDate,
- ContractPaymentSchedule::getPaymentStatus,ContractPaymentSchedule::getActualAmount,
+ .select(ContractPaymentSchedule::getId, ContractPaymentSchedule::getStageName, ContractPaymentSchedule::getEffectiveDate,
+ ContractPaymentSchedule::getPlannedAmount, ContractPaymentSchedule::getPlannedAmount,
+ ContractPaymentSchedule::getEffectiveEndDate, ContractPaymentSchedule::getPaymentDate,
+ ContractPaymentSchedule::getPaymentStatus, ContractPaymentSchedule::getActualAmount,
ContractPaymentSchedule::getAgreedDays)
.select(ContractPaymentScheduleProcess::getProcessDate)
- .leftJoin(ContractPaymentScheduleProcess.class,ContractPaymentScheduleProcess::getScheduleId,ContractPaymentSchedule::getId)
- .eq(ContractPaymentSchedule::getContractId,id)
+ .leftJoin(ContractPaymentScheduleProcess.class, ContractPaymentScheduleProcess::getScheduleId, ContractPaymentSchedule::getId)
+ .eq(ContractPaymentSchedule::getContractId, id)
.orderByAsc(ContractPaymentSchedule::getCreateTime);
- List<ContractPaymentScheduleVo> scheduleVoList = contractPaymentScheduleMapper.selectJoinList(ContractPaymentScheduleVo.class,wrapper);
+ List<ContractPaymentScheduleVo> scheduleVoList = contractPaymentScheduleMapper.selectJoinList(ContractPaymentScheduleVo.class, wrapper);
return R.ok(scheduleVoList);
}
}
\ No newline at end of file
diff --git a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/ContractServiceImpl.java b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/ContractServiceImpl.java
index 081447a..c21a77e 100644
--- a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/ContractServiceImpl.java
+++ b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/ContractServiceImpl.java
@@ -52,6 +52,7 @@
contract.setPartyBId(SecurityUtils.getUser().getCompId());
contract.setPartyB(SecurityUtils.getUser().getCompName());
contract.setContractNo(ContractNumberGenerator.generateContractNumber());
+ contract.setPaidAmount(new BigDecimal("0"));
contract.setBillingStatus("0");
contract.setErpPushFlag("0");
List<Contract> contracts;
@@ -122,6 +123,7 @@
contract.setContractNo(ContractNumberGenerator.generateContractNumber());
contract.setBillingStatus("0");
contract.setErpPushFlag("0");
+ contract.setPaidAmount(new BigDecimal("0"));
List<Contract> contracts;
contracts = baseMapper.selectList(Wrappers.<Contract>lambdaQuery().eq(Contract::getContractNo,contract.getContractNo()));
while (ArrayUtil.isNotEmpty(contracts.toArray())){
@@ -226,7 +228,9 @@
lastNewTotal = lastNewConfirm.getTotalAmount();
}
paymentConfirm.setTotalAmount(lastNewTotal.subtract(paymentConfirm.getReceivableAmount()));
- paymentConfirmMapper.insert(paymentConfirm);
+ if (fitstSchedule.getPaymentRatio().compareTo(new BigDecimal("0"))>0){
+ paymentConfirmMapper.insert(paymentConfirm);
+ }
//鏂板鍚堝悓灞ョ害璁板綍
ContractPaymentScheduleProcess process = new ContractPaymentScheduleProcess();
process.setContractId(contract.getId());
@@ -238,7 +242,7 @@
//褰撳墠涓哄悎鍚屾渶鍚庨樁娈�
PaymentConfirm newConfirm = paymentConfirmMapper.selectOne(Wrappers.<PaymentConfirm>lambdaQuery().eq(PaymentConfirm::getContractId,contract.getId())
.orderByDesc(PaymentConfirm::getCreateTime).last("limit 1"));
- if (newConfirm.getTotalAmount().compareTo(new BigDecimal("0"))>=0){
+ if (ObjUtil.isNotNull(newConfirm)&&newConfirm.getTotalAmount().compareTo(new BigDecimal("0"))>=0){
//鏈夐浠樹笖瓒呰繃搴旀敹 鍏抽棴鍚堝悓鐘舵��
contract.setContractStatus(3);
baseMapper.updateById(contract);
@@ -277,7 +281,9 @@
lastNewTotal = lastNewConfirm.getTotalAmount();
}
paymentConfirm.setTotalAmount(lastNewTotal.subtract(paymentConfirm.getReceivableAmount()));
- paymentConfirmMapper.insert(paymentConfirm);
+ if (fitstSchedule.getPaymentRatio().compareTo(new BigDecimal("0"))>0) {
+ paymentConfirmMapper.insert(paymentConfirm);
+ }
}
//鏌ヨ鏄惁鏈夊悗缁樁娈�
List<ContractPaymentSchedule> afterSchedule = contractPaymentScheduleMapper.selectList(Wrappers.<ContractPaymentSchedule>lambdaQuery()
@@ -316,7 +322,9 @@
lastNewTotal = lastNewConfirm.getTotalAmount();
}
newConfim.setTotalAmount(lastNewTotal.subtract(newConfim.getReceivableAmount()));
- paymentConfirmMapper.insert(newConfim);
+ if (endSchedule.getPaymentRatio().compareTo(new BigDecimal("0"))>0) {
+ paymentConfirmMapper.insert(newConfim);
+ }
}
//鏇存柊鍚堝悓涓嬩釜闃舵
contract.setNextScheduleName(endSchedule.getStageName());
@@ -369,7 +377,7 @@
//鍒ゆ柇褰撳墠闃舵鏄惁宸茬敓鎴愪笂闃舵搴旀敹瓒呮湡
PaymentConfirm oiverdueConfirm = paymentConfirmMapper.selectOne(Wrappers.<PaymentConfirm>lambdaQuery().eq(PaymentConfirm::getScheduleId, contractPaymentSchedule.getId())
.eq(PaymentConfirm::getBusinessType, "搴旀敹瓒呮湡"));
- if (ObjUtil.isNull(oiverdueConfirm)) {
+ if (ObjUtil.isNull(oiverdueConfirm)&&overdueConfirm.getTransationAmount().compareTo(new BigDecimal("0"))>0) {
overdueConfirm.setCompId(contractPaymentSchedule.getCompId());
paymentConfirmMapper.insert(overdueConfirm);
}
@@ -390,7 +398,9 @@
.eq(CurrentOverdue::getScheduleId,currentOverdue.getScheduleId()).last("limit 1"));
if (ObjUtil.isNull(overdue)){
currentOverdue.setCompId(contractPaymentSchedule.getCompId());
- currentOverdueMapper.insert(currentOverdue);
+ if (currentOverdue.getReceivableAmount().compareTo(new BigDecimal("0"))>0){
+ currentOverdueMapper.insert(currentOverdue);
+ }
}else {
overdue.setOverdueDuration(BigDecimal.valueOf(DateUtil.betweenDay(contractPaymentSchedule.getEffectiveEndDate(),new Date(),true)));
currentOverdueMapper.updateById(overdue);
@@ -407,4 +417,22 @@
baseMapper.updateById(contract);
return R.ok();
}
+
+ @Override
+ public R copyNewContract(Long id) {
+ Contract oldContract = baseMapper.selectById(id);
+ Contract newContract = BeanUtil.copyProperties(oldContract,Contract.class,"id","createTime");
+ newContract.setContractNo(ContractNumberGenerator.generateContractNumber());
+ newContract.setPaidAmount(new BigDecimal("0"));
+ newContract.setBillingStatus("0");
+ newContract.setErpPushFlag("0");
+ List<Contract> contracts;
+ contracts = baseMapper.selectList(Wrappers.<Contract>lambdaQuery().eq(Contract::getContractNo,newContract.getContractNo()));
+ while (ArrayUtil.isNotEmpty(contracts.toArray())){
+ newContract.setContractNo(ContractNumberGenerator.generateContractNumber());
+ contracts = baseMapper.selectList(Wrappers.<Contract>lambdaQuery().eq(Contract::getContractNo,newContract.getContractNo()));
+ }
+ baseMapper.insert(newContract);
+ return R.ok();
+ }
}
diff --git a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/CreditSalesServiceImpl.java b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/CreditSalesServiceImpl.java
new file mode 100644
index 0000000..465302a
--- /dev/null
+++ b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/CreditSalesServiceImpl.java
@@ -0,0 +1,27 @@
+package com.by4cloud.platformx.business.service.impl;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.by4cloud.platformx.business.dto.CreditSalesQueryDTO;
+import com.by4cloud.platformx.business.mapper.ContractMapper;
+import com.by4cloud.platformx.business.service.CreditSalesService;
+import com.by4cloud.platformx.common.data.datascope.DataScope;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+
+/**
+ * 璧婇攢
+ *
+ * @author syt
+ * @date 2026-05-15 14:13:59
+ */
+@Service
+@RequiredArgsConstructor
+public class CreditSalesServiceImpl implements CreditSalesService {
+
+ private final ContractMapper contractMapper;
+
+ @Override
+ public Page page(Page page, CreditSalesQueryDTO queryDTO) {
+ return contractMapper.pageByCredit(page, queryDTO, DataScope.of("comp_id"));
+ }
+}
diff --git a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/OutBoundServiceImpl.java b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/OutBoundServiceImpl.java
index 252dee9..0ec467d 100644
--- a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/OutBoundServiceImpl.java
+++ b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/OutBoundServiceImpl.java
@@ -59,19 +59,16 @@
if (ArrayUtil.isEmpty(subjectMatterList.toArray())) {
return R.failed("娌℃湁鏌ヨ鍒扮浉鍏冲悎鍚岃鍗�");
}
- Double outTotal = subjectMatterList.stream().mapToDouble(item -> {
- // 浼樺厛鍒ゆ柇 remainNum
- if (item.getRemainingQuantity() != null && item.getRemainingQuantity().compareTo(new BigDecimal("0")) > 0) {
- return item.getRemainingQuantity().doubleValue();
- } else {
- // remainNum 涓� null 鎴� 0 鏃讹紝浣跨敤 quantity
- return item.getQuantity() == null ? 0.0 : item.getQuantity().doubleValue();
- }
- }).sum();
- BigDecimal orderNum = addDTO.getSubjectMatterList().stream().map(OutSubjectMatterAddDTO::getOutBoundNum)
+ List<String> erpCodeList = subjectMatterList.stream().map(ContractSubjectMatter::getMaterialCode).collect(Collectors.toList());
+ BigDecimal orderNum = subjectMatterList.stream().filter(item ->item.getDeliveryStatus()!=2)
+ .map(item ->item.getDeliveryStatus()==0?item.getQuantity():item.getRemainingQuantity())
+ .reduce(BigDecimal.ZERO, BigDecimal::add);
+ BigDecimal outTotal = addDTO.getSubjectMatterList().stream()
+ .filter(item->erpCodeList.contains(item.getSubjectMatterCode()))
+ .map(OutSubjectMatterAddDTO::getOutBoundNum)
.filter(num -> num != null) // 杩囨护鎺� null 鍊硷紝闃叉 NullPointerException
.reduce(BigDecimal.ZERO, BigDecimal::add);
- if (new BigDecimal(outTotal).compareTo(orderNum) < 0) {
+ if (outTotal.compareTo(orderNum) > 0) {
return R.failed("鍑哄簱鏁伴噺瓒呭嚭鍚堝悓璁㈠崟鏁伴噺");
}
//褰撳墠鍏ュ簱鏍囩殑鐗�
@@ -203,16 +200,22 @@
paymentConfirm.setTransationAmount(paymentConfirm.getTransationAmount().subtract(fhTotalAmount));
paymentConfirm.setReceivableAmount(paymentConfirm.getTransationAmount());
paymentConfirm.setTotalAmount(lastConfirm.getTotalAmount().subtract(paymentConfirm.getTransationAmount()));
- paymentConfirmMapper.insert(paymentConfirm);
+ if(schedule.getPaymentRatio().compareTo(new BigDecimal("0"))>0) {
+ paymentConfirmMapper.insert(paymentConfirm);
+ }
} else {
//涓嶅瓨鍦ㄥ彂璐у簲鏀� 鍑哄簱鎬婚
paymentConfirm.setTotalAmount(lastConfirm.getTotalAmount().subtract(paymentConfirm.getTransationAmount()));
- paymentConfirmMapper.insert(paymentConfirm);
+ if(schedule.getPaymentRatio().compareTo(new BigDecimal("0"))>0) {
+ paymentConfirmMapper.insert(paymentConfirm);
+ }
}
} else {
//鏃犱箣鍓嶉樁娈靛簲鏀�
paymentConfirm.setTotalAmount(paymentConfirm.getTransationAmount().multiply(new BigDecimal("-1")));
- paymentConfirmMapper.insert(paymentConfirm);
+ if(schedule.getPaymentRatio().compareTo(new BigDecimal("0"))>0) {
+ paymentConfirmMapper.insert(paymentConfirm);
+ }
}
//鏇存柊鍙戣揣鍓嶆敹娆剧敓鏁堟椂闂�
@@ -278,7 +281,9 @@
lastNewTotal = lastNewConfirm.getTotalAmount();
}
newConfim.setTotalAmount(lastNewTotal.subtract(newConfim.getReceivableAmount()));
- paymentConfirmMapper.insert(newConfim);
+ if(endSchedule.getPaymentRatio().compareTo(new BigDecimal("0"))>0) {
+ paymentConfirmMapper.insert(newConfim);
+ }
}
//鏇存柊鍚堝悓涓嬩釜闃舵
contract.setNextScheduleName(endSchedule.getStageName());
diff --git a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/PaymentConfirmServiceImpl.java b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/PaymentConfirmServiceImpl.java
index 498a055..9555670 100644
--- a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/PaymentConfirmServiceImpl.java
+++ b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/PaymentConfirmServiceImpl.java
@@ -1,9 +1,12 @@
package com.by4cloud.platformx.business.service.impl;
import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.ArrayUtil;
import cn.hutool.core.util.ObjUtil;
import cn.hutool.core.util.StrUtil;
+import cn.hutool.http.HttpUtil;
+import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.by4cloud.platformx.business.dto.PaymentConfirmAddDTO;
@@ -17,6 +20,7 @@
import com.by4cloud.platformx.business.service.PaymentConfirmService;
import com.by4cloud.platformx.common.core.util.R;
import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import java.math.BigDecimal;
@@ -39,6 +43,10 @@
private final ContractPaymentScheduleMapper contractPaymentScheduleMapper;
private final CurrentOverdueMapper currentOverdueMapper;
private final HistoryOverdueMapper historyOverdueMapper;
+
+ @Value("${bip.url}")
+ private String url;
+
@Override
public R add(PaymentConfirmAddDTO addDTO) {
@@ -92,6 +100,7 @@
entity.setConfirmTime(new Date());
baseMapper.insert(entity);
}
+ //鏇存柊浠樻闃舵浠樻
List<ContractPaymentSchedule> scheduleList = contractPaymentScheduleMapper.selectList(Wrappers.<ContractPaymentSchedule>lambdaQuery()
.eq(ContractPaymentSchedule::getContractId,contract.getId()).ne(ContractPaymentSchedule::getPaymentStatus,2)
.orderByAsc(ContractPaymentSchedule::getCreateTime));
@@ -145,6 +154,17 @@
}
}
}
+ //鏇存柊鍚堝悓宸蹭粯娆�
+ BigDecimal paid = new BigDecimal("0");
+ if (ObjUtil.isNotNull(contract.getPaidAmount())){
+ paid = contract.getPaidAmount();
+ }
+ paid = paid.add(addDTO.getTransationAmount());
+ contract.setPaidAmount(paid);
+ if (paid.compareTo(contract.getAmount())>0){
+ contract.setPaidAmount(contract.getAmount());
+ }
+ contractService.updateById(contract);
}
//杞嚭
if (StrUtil.equals(addDTO.getInOrOut(),"2")){
@@ -179,4 +199,25 @@
}
return R.ok();
}
+
+ @Override
+ public R syncPaymentRecepit() {
+
+ JSONObject params = new JSONObject();
+ params.put("pageIndex", 1);
+ params.put("pageSize", 999);
+ params.put("open_billDate_begin", DateUtil.offsetDay(new Date(),-1) + " 00:00:00");
+ params.put("open_billDate_begin", DateUtil.today() + " 00:00:00");
+ //鍗曟嵁鐘舵�佸凡瀹℃壒
+ params.put("verifyState", new String[]{"2"});
+ //寰�鏉ュ璞″鎴�
+ params.put("objectType", new String[]{"1"});
+ //鍗曚綅
+// JSONObject simpleMap = new JSONObject();
+// simpleMap.put("financeOrg.code", bipCode);
+// params.put("simple", simpleMap);
+ HttpUtil.post(url+"/yonbip/EFI/collection/list",params.toJSONString());
+
+ return null;
+ }
}
\ No newline at end of file
diff --git a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/PaymentOffsetServiceImpl.java b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/PaymentOffsetServiceImpl.java
new file mode 100644
index 0000000..9731065
--- /dev/null
+++ b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/PaymentOffsetServiceImpl.java
@@ -0,0 +1,133 @@
+package com.by4cloud.platformx.business.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ArrayUtil;
+import cn.hutool.core.util.ObjUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.by4cloud.platformx.business.entity.*;
+import com.by4cloud.platformx.business.mapper.*;
+import com.by4cloud.platformx.business.service.ContractService;
+import com.by4cloud.platformx.business.service.PaymentOffsetService;
+import com.by4cloud.platformx.common.core.util.R;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Objects;
+
+/**
+ * 鎶垫姽璐�
+ *
+ * @author syt
+ * @date 2026-05-19 10:38:26
+ */
+@Service
+@RequiredArgsConstructor
+public class PaymentOffsetServiceImpl extends ServiceImpl<PaymentOffsetMapper, PaymentOffset> implements PaymentOffsetService {
+
+ private final ContractService contractService;
+ private final PaymentConfirmMapper paymentConfirmMapper;
+ private final ContractPaymentScheduleMapper contractPaymentScheduleMapper;
+ private final CurrentOverdueMapper currentOverdueMapper;
+ private final HistoryOverdueMapper historyOverdueMapper;
+
+ @Override
+ public R add(PaymentOffset paymentOffset) {
+ baseMapper.insert(paymentOffset);
+ Contract contract = contractService.getById(paymentOffset.getContractId());
+
+ PaymentConfirm lastConfirm = paymentConfirmMapper.selectOne(Wrappers.<PaymentConfirm>lambdaQuery().eq(PaymentConfirm::getContractId,contract.getId())
+ .orderByDesc(PaymentConfirm::getCreateTime).last("limit 1"));
+ BigDecimal lastTotal = new BigDecimal("0");
+ if(ObjUtil.isNotNull(lastConfirm)){
+ lastTotal = lastConfirm.getTotalAmount();
+ }
+ PaymentConfirm entity = new PaymentConfirm();
+ entity.setContractId(contract.getId());
+ entity.setContractName(contract.getContractName());
+ entity.setContractNo(contract.getContractNo());
+ entity.setBusGuestId(paymentOffset.getBusGuestId());
+ entity.setBusGuestName(paymentOffset.getBusGuestName());
+ entity.setBusinessType("鎶垫姽璐�");
+ entity.setConfirmTime(paymentOffset.getOffsetTime());
+ entity.setTransationAmount(paymentOffset.getOffsetAmount());
+ entity.setTotalAmount(paymentOffset.getOffsetAmount().add(lastTotal));
+ paymentConfirmMapper.insert(entity);
+ //鏇存柊浠樻闃舵浠樻
+ List<ContractPaymentSchedule> scheduleList = contractPaymentScheduleMapper.selectList(Wrappers.<ContractPaymentSchedule>lambdaQuery()
+ .eq(ContractPaymentSchedule::getContractId,contract.getId()).ne(ContractPaymentSchedule::getPaymentStatus,2)
+ .orderByAsc(ContractPaymentSchedule::getCreateTime));
+ if (ArrayUtil.isNotEmpty(scheduleList.toArray())){
+ BigDecimal remain = paymentOffset.getOffsetAmount();
+ for (ContractPaymentSchedule schedule:scheduleList) {
+ BigDecimal lastRemain = remain;
+ remain = remain.subtract(StrUtil.equals(schedule.getPaymentStatus()+"","0")?schedule.getPlannedAmount():
+ schedule.getPlannedAmount().subtract(schedule.getActualAmount()));
+ if (remain.compareTo(new BigDecimal("0"))>=0){
+ schedule.setActualAmount(schedule.getPlannedAmount());
+ schedule.setPaymentDate(paymentOffset.getOffsetTime());
+ schedule.setPaymentStatus(2);
+ contractPaymentScheduleMapper.updateById(schedule);
+ //鏌ヨ鏄惁鏈夊綋鍓嶉�炬湡
+ CurrentOverdue currentOverdue = currentOverdueMapper.selectOne(Wrappers.<CurrentOverdue>lambdaQuery().eq(CurrentOverdue::getScheduleId,schedule.getId())
+ .eq(CurrentOverdue::getContractId,schedule.getContractId()).last("limit 1"));
+ if (ObjUtil.isNotNull(currentOverdue)){
+ //鏂板閫炬湡鍘嗗彶
+ HistoryOverdue historyOverdue = BeanUtil.copyProperties(currentOverdue,HistoryOverdue.class,"id");
+ historyOverdue.setPaymentTime(paymentOffset.getOffsetTime());
+ historyOverdue.setCompId(schedule.getCompId());
+ historyOverdueMapper.insert(historyOverdue);
+ //鍒犻櫎褰撳墠閫炬湡
+ currentOverdueMapper.deleteById(currentOverdue);
+ }
+ }else {
+ schedule.setActualAmount(StrUtil.equals(schedule.getPaymentStatus()+"","0")?schedule.getPlannedAmount().add(remain):
+ schedule.getActualAmount().add(lastRemain));
+ schedule.setPaymentDate(paymentOffset.getOffsetTime());
+ schedule.setPaymentStatus(1);
+ contractPaymentScheduleMapper.updateById(schedule);
+ //鏌ヨ鏄惁鏈夊綋鍓嶉�炬湡
+ CurrentOverdue currentOverdue = currentOverdueMapper.selectOne(Wrappers.<CurrentOverdue>lambdaQuery().eq(CurrentOverdue::getScheduleId,schedule.getId())
+ .eq(CurrentOverdue::getContractId,schedule.getContractId()).last("limit 1"));
+ if (ObjUtil.isNotNull(currentOverdue)){
+ //鏂板閫炬湡鍘嗗彶
+ HistoryOverdue historyOverdue = BeanUtil.copyProperties(currentOverdue,HistoryOverdue.class,"id");
+ historyOverdue.setReceivableAmount(lastRemain);
+ historyOverdue.setPaymentTime(paymentOffset.getOffsetTime());
+ historyOverdue.setCompId(schedule.getCompId());
+ historyOverdueMapper.insert(historyOverdue);
+ //鏌ヨ鍘嗗彶宸蹭粯閫炬湡閲戦
+ List<HistoryOverdue> historyOverdueList = historyOverdueMapper.selectList(Wrappers.<HistoryOverdue>lambdaQuery().eq(HistoryOverdue::getScheduleId,currentOverdue.getScheduleId()));
+ BigDecimal hisTotal = historyOverdueList.stream().map(item->item.getReceivableAmount()).reduce(BigDecimal.ZERO,BigDecimal::add);
+ //鏇存柊褰撳墠閫炬湡
+ currentOverdue.setReceivableAmount(schedule.getPlannedAmount().subtract(hisTotal));
+ currentOverdueMapper.updateById(currentOverdue);
+ }
+ break;
+ }
+ }
+ }
+ //鏇存柊鍚堝悓宸蹭粯娆�
+ BigDecimal paid = new BigDecimal("0");
+ if (ObjUtil.isNotNull(contract.getPaidAmount())){
+ paid = contract.getPaidAmount();
+ }
+ paid = paid.add(paymentOffset.getOffsetAmount());
+ contract.setPaidAmount(paid);
+ if (paid.compareTo(contract.getAmount())>0){
+ contract.setPaidAmount(contract.getAmount());
+ }
+ contractService.updateById(contract);
+ // 鏌ヨ鎵�鏈変粯娆鹃樁娈垫槸鍚﹂兘浠樻瀹屾垚
+ if (ArrayUtil.isNotEmpty(scheduleList.toArray())){
+ if (scheduleList.stream().allMatch(item -> Objects.equals(item.getPaymentStatus(), 2))){
+ contract.setContractStatus(3);
+ contractService.updateById(contract);
+ };
+ }
+ return R.ok();
+ }
+}
\ No newline at end of file
diff --git a/platformx-business-finance-biz/src/main/resources/mapper/ContractMapper.xml b/platformx-business-finance-biz/src/main/resources/mapper/ContractMapper.xml
index a251b1e..4409166 100644
--- a/platformx-business-finance-biz/src/main/resources/mapper/ContractMapper.xml
+++ b/platformx-business-finance-biz/src/main/resources/mapper/ContractMapper.xml
@@ -4,4 +4,100 @@
<mapper namespace="com.by4cloud.platformx.business.mapper.ContractMapper">
+ <select id="pageByCredit" resultType="com.by4cloud.platformx.business.vo.ContractCreditSalesPageVo">
+ SELECT
+ id,
+ contract_no,
+ contract_name,
+ party_a_id,
+ party_a,
+ party_b_id,
+ party_b,
+ amount,
+ currency,
+ contract_type,
+ supply_attribute,
+ contract_status,
+ contract_attribute,
+ sign_date,
+ effective_date,
+ delivery_cycle,
+ expiration_date,
+ attachment_url,
+ remark,
+ parent_id,
+ approve_time,
+ arrival_schedule_id,
+ accept_schedule_id,
+ erp_push_flag,
+ billing_status,
+ next_schedule_name,
+ template_id,
+ sales_model,
+ paid_amount,
+ create_by,
+ update_by,
+ create_time,
+ update_time,
+ del_flag,
+ comp_id,
+ (SELECT GROUP_CONCAT(DISTINCT t1.material_internal_name) from contract_subject_matter t1 WHERE t1.contract_id = t.id) productNames,
+ IFNULL( t.billing_amout, 0 ) billing_amout,
+ ( SELECT IFNULL( sum( unit_price * delivered_quantity ), 0 ) FROM contract_subject_matter t1 WHERE t1.contract_id = t.id ) outBoundAmount,
+ ((
+ SELECT
+ IFNULL( sum( unit_price * delivered_quantity ), 0 )
+ FROM
+ contract_subject_matter t1
+ WHERE
+ t1.contract_id = t.id
+ ) - IFNULL( t.billing_amout, 0 )) creditAmount
+ FROM
+ contract t
+ WHERE
+ (
+ IFNULL( t.billing_amout, 0 )<(
+ SELECT
+ IFNULL( sum( unit_price * delivered_quantity ), 0 )
+ FROM
+ contract_subject_matter t1
+ WHERE
+ t1.contract_id = t.id
+ ))=1
+ <if test="queryDTO.contractName !=null and queryDTO.contractName !=''">
+ and t.contract_name LIKE CONCAT('%', #{queryDTO.contractName}, '%')
+ </if>
+ <if test="queryDTO.partyA !=null and queryDTO.partyA !=''">
+ and t.party_a LIKE CONCAT('%', #{queryDTO.partyA}, '%')
+ </if>
+ <if test="queryDTO.productNames !=null and queryDTO.productNames !=''">
+ and (SELECT GROUP_CONCAT(DISTINCT t1.material_internal_name) from contract_subject_matter t1 WHERE t1.contract_id = t.id) LIKE CONCAT('%', #{queryDTO.productNames}, '%')
+ </if>
+ <choose>
+ <when test="queryDTO.sortFiled !=null and queryDTO.sortFiled !='' and queryDTO.sortFiled == 'sign_date'">
+ order by ${queryDTO.sortFiled}
+ </when>
+ <when test="queryDTO.sortFiled !=null and queryDTO.sortFiled !='' and queryDTO.sortFiled == 'creditAmount'">
+ order by ((
+ SELECT
+ IFNULL( sum( unit_price * delivered_quantity ), 0 )
+ FROM
+ contract_subject_matter t1
+ WHERE
+ t1.contract_id = t.id
+ ) - IFNULL( t.billing_amout, 0 ))
+ </when>
+ <otherwise>
+ order by t.create_time
+ </otherwise>
+ </choose>
+ <choose>
+ <when test="queryDTO.sortMethod !=null and queryDTO.sortMethod !=''">
+ ${queryDTO.sortMethod}
+ </when>
+ <otherwise>
+ desc
+ </otherwise>
+ </choose>
+ </select>
</mapper>
\ No newline at end of file
diff --git a/platformx-business-finance-biz/src/main/resources/mapper/PaymentOffsetMapper.xml b/platformx-business-finance-biz/src/main/resources/mapper/PaymentOffsetMapper.xml
new file mode 100644
index 0000000..934a5b0
--- /dev/null
+++ b/platformx-business-finance-biz/src/main/resources/mapper/PaymentOffsetMapper.xml
@@ -0,0 +1,29 @@
+<?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.by4cloud.platformx.business.mapper.PaymentOffsetMapper">
+
+ <resultMap id="paymentOffsetMap" type="com.by4cloud.platformx.business.entity.PaymentOffset">
+ <id property="id" column="id"/>
+ <result property="compId" column="comp_id"/>
+ <result property="busGuestId" column="bus_guest_id"/>
+ <result property="busGuestName" column="bus_guest_name"/>
+ <result property="contractAmount" column="contract_amount"/>
+ <result property="contractId" column="contract_id"/>
+ <result property="contractName" column="contract_name"/>
+ <result property="contractNo" column="contract_no"/>
+ <result property="offsetAttNames" column="offset_att_names"/>
+ <result property="offsetAttPaths" column="offset_att_paths"/>
+ <result property="offsetTime" column="offset_time"/>
+ <result property="unpaidAmount" column="unpaid_amount"/>
+ <result property="wipeOffAmount" column="wipe_off_amount"/>
+ <result property="invoiceAmount" column="invoice_amount"/>
+ <result property="offsetAmount" column="offset_amount"/>
+ <result property="paidAmount" column="paid_amount"/>
+ <result property="createBy" column="create_by"/>
+ <result property="createTime" column="create_time"/>
+ <result property="updateBy" column="update_by"/>
+ <result property="updateTime" column="update_time"/>
+ <result property="delFlag" column="del_flag"/>
+ </resultMap>
+</mapper>
\ No newline at end of file
--
Gitblit v1.9.1