From a422a984cfa2a5a2bbe89c6fa6947363e559bb4f Mon Sep 17 00:00:00 2001
From: shiyunteng <shiyunteng@example.com>
Date: 星期五, 22 五月 2026 09:29:14 +0800
Subject: [PATCH] feat:faet:出库加批次号，合同履约加销方购方履约，到货单据必填校验，验收单据必填校验，单位新增法人、委托代理人字段 、合同出库新增erp出库ID
---
platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/Contract.java | 12
platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/ContractSubjectMatterService.java | 2
platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/vo/ContractSubjectMatterVo.java | 24
platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/ContractPaymentScheduleProcessServiceImpl.java | 50 +
platformx-business-finance-biz/src/main/resources/mapper/BipRequestRecordMapper.xml | 19
platformx-business-finance-biz/src/main/resources/mapper/PaymentSlipMapper.xml | 24
platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/BipRequestRecord.java | 35 +
platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/utils/SignHelper.java | 46 +
platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/ContractController.java | 11
platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/OutBound.java | 4
platformx-business-finance-biz/pom.xml | 20
platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/ContractSubjectMatterServiceImpl.java | 16
platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/ContractSubjectMatterController.java | 10
platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/ContractServiceImpl.java | 267 ++++++++--
platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/PaymentConfirmServiceImpl.java | 784 +++++++++++++++++++++++++----
platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/OutBoundServiceImpl.java | 70 ++
platformx-boot/src/main/resources/application-dev.yml | 8
platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/ContractService.java | 8
platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/PaymentConfirm.java | 20
platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/mapper/PaymentSlipMapper.java | 12
platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/PaymentSlip.java | 47 +
platformx-business-finance-biz/src/main/resources/template/ymjjgclht.doc | 0
platformx-business-finance-biz/src/main/resources/mapper/ContractOutBoundMapper.xml | 1
platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/mapper/BipRequestRecordMapper.java | 11
platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/ContractOutBound.java | 4
25 files changed, 1,307 insertions(+), 198 deletions(-)
diff --git a/platformx-boot/src/main/resources/application-dev.yml b/platformx-boot/src/main/resources/application-dev.yml
index a1dd23e..8b6f823 100644
--- a/platformx-boot/src/main/resources/application-dev.yml
+++ b/platformx-boot/src/main/resources/application-dev.yml
@@ -41,3 +41,11 @@
#bip 閰嶇疆
bip:
url:
+ codes: 111111111111111111111111,222222222222222222
+ appKey:
+ appSecret:
+
+# 鏂囦欢涓婁紶閰嶇疆
+file:
+ local:
+ base-path: D:\\Users\\platformx\\Downloads\\img
\ No newline at end of file
diff --git a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/BipRequestRecord.java b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/BipRequestRecord.java
new file mode 100644
index 0000000..e77262b
--- /dev/null
+++ b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/BipRequestRecord.java
@@ -0,0 +1,35 @@
+package com.by4cloud.platformx.business.entity;
+
+import com.by4cloud.platformx.common.data.mybatis.BaseModel;
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import lombok.Data;
+import org.hibernate.annotations.Table;
+
+/**
+ * 鏃堕棿
+ * syt
+ */
+@Data
+@Entity//鍔犱簡鎵嶈兘鑷姩鐢熸垚琛�
+@Table(appliesTo="bip_request_record",comment = "bip璇锋眰璁板綍")//缁欒〃鍔犳敞閲�
+@jakarta.persistence.Table(name = "bip_request_record")//鏁版嵁搴撳垱寤虹殑琛ㄦ槑
+public class BipRequestRecord extends BaseModel<BipRequestRecord> {
+
+ @Schema(description = "鎺ュ彛鍚嶇О")
+ @Column(columnDefinition="VARCHAR(128) comment '鎺ュ彛鍚嶇О'")
+ private String interfaceName;
+
+ @Schema(description = "鍏ュ弬")
+ @Column(columnDefinition="text comment '鍏ュ弬'")
+ private String requestParams;
+
+ @Schema(description = "鍥炲弬")
+ @Column(columnDefinition="text comment '鍥炲弬'")
+ private String responseParams;
+
+ @Schema(description = "缁撴灉鐮�")
+ @Column(columnDefinition="VARCHAR(32) comment '缁撴灉鐮�'")
+ private String responseCode;
+}
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 00cdc25..eeaccdb 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
@@ -78,14 +78,18 @@
@Column(columnDefinition = "tinyint(2) default 0 comment '鍚堝悓鏈嶅姟灞炴��'")
private Integer contractAttribute;
- @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd")
@Schema(description = "绛剧讲鏃ユ湡")
@Column(columnDefinition = "date comment '绛剧讲鏃ユ湡'")
private Date signDate;
- @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
+ @Schema(description = "绛捐鍦扮偣")
+ @Column(columnDefinition = "VARCHAR(255) comment '绛捐鍦扮偣'")
+ private String signPlace;
+
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd")
@Schema(description = "鐢熸晥鏃ユ湡")
@Column(columnDefinition = "date comment '鐢熸晥鏃ユ湡'")
private Date effectiveDate;
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 3c6334c..02286f9 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
@@ -75,4 +75,8 @@
@Column(columnDefinition="text comment '鍒拌揣鍗曟嵁璺緞'")
private String arrivalAttPaths;
+ @Schema(description = "erp鍑哄簱ID")
+ @Column(columnDefinition="bigint comment 'erp鍑哄簱ID'")
+ private Long outBoundId;
+
}
diff --git a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/OutBound.java b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/OutBound.java
index ff4a396..5628275 100644
--- a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/OutBound.java
+++ b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/OutBound.java
@@ -24,6 +24,10 @@
@jakarta.persistence.Table(name = "out_bound")//鏁版嵁搴撳垱寤虹殑琛ㄦ槑
public class OutBound extends BaseModel<OutBound> {
+ @Schema(description = "鍑哄簱鎵规鍙�")
+ @Column(columnDefinition="VARCHAR(64) comment '鍑哄簱鎵规鍙�'")
+ private String batchNumber;
+
@Schema(description = "瀹㈠晢鍚嶇О")
@Column(columnDefinition="VARCHAR(64) comment '瀹㈠晢鍚嶇О'")
private String busGuestName;
diff --git a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/PaymentConfirm.java b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/PaymentConfirm.java
index c59bd42..05bd967 100644
--- a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/PaymentConfirm.java
+++ b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/PaymentConfirm.java
@@ -75,4 +75,24 @@
@Schema(description = "闃舵鍚嶇О")
@Column(columnDefinition = "VARCHAR(64) comment '闃舵鍚嶇О'")
private String scheduleName;
+
+ @Schema(description = "鏄惁涓築IP鍚屾")
+ @Column(columnDefinition="tinyint DEFAULT '0' COMMENT '鏄惁涓築IP鍚屾'")
+ private Integer isBip;
+
+ @Schema(description = "bip鏀舵鍗昳d ")
+ @Column(columnDefinition="VARCHAR(64) comment 'bip鏀舵鍗昳d'")
+ private String bipId;
+
+ /**
+ * 浠樻鏂瑰紡 0/鐜版眹 1/鎵垮厬 鏁版嵁瀛楀吀
+ */
+ @Schema(description = "浠樻鏂瑰紡 ")
+ @Column(columnDefinition="int(1) comment '浠樻鏂瑰紡'")
+ private Integer payType;
+
+ @Schema(description = "鏀舵鍗曠紪鍙�")
+ @Column(columnDefinition="VARCHAR(64) comment '鏀舵鍗曠紪鍙�'")
+ private String paymentCode;
+
}
diff --git a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/PaymentSlip.java b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/PaymentSlip.java
new file mode 100644
index 0000000..87105f0
--- /dev/null
+++ b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/PaymentSlip.java
@@ -0,0 +1,47 @@
+package com.by4cloud.platformx.business.entity;
+
+import com.by4cloud.platformx.common.data.mybatis.BaseModel;
+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 java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 2026骞�5鏈�22鏃� 08:41:53
+ * syt
+ */
+@Data
+@Entity//鍔犱簡鎵嶈兘鑷姩鐢熸垚琛�
+@Table(appliesTo="payment_slip",comment = "鏀舵鍗�")//缁欒〃鍔犳敞閲�
+@jakarta.persistence.Table(name = "payment_slip")//鏁版嵁搴撳垱寤虹殑琛ㄦ槑
+public class PaymentSlip extends BaseModel<PaymentSlip> {
+
+ @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="datetime comment '鏀舵鏃ユ湡'")
+ private Date paymentTime;
+
+ @Schema(description = "鏀舵閲戦")
+ @Column(columnDefinition="decimal(10,2) comment '鏀舵閲戦 /鍏� 涓や綅灏忔暟'")
+ private BigDecimal paymentAmount;
+
+ @Schema(description = "鏀舵鍗曠紪鍙�")
+ @Column(columnDefinition="VARCHAR(255) comment '鏀舵鍗曠紪鍙�'")
+ private String paymentNumber;
+
+ @Schema(description = "浠樻鏂瑰紡 ")
+ @Column(columnDefinition="VARCHAR(64) comment '浠樻鏂瑰紡'")
+ private String payType;
+
+}
diff --git a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/vo/ContractSubjectMatterVo.java b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/vo/ContractSubjectMatterVo.java
new file mode 100644
index 0000000..bd1db2f
--- /dev/null
+++ b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/vo/ContractSubjectMatterVo.java
@@ -0,0 +1,24 @@
+package com.by4cloud.platformx.business.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+public class ContractSubjectMatterVo {
+
+ private String materialName;
+
+ @Schema(description = "鏍囩殑鐗╃紪鐮侊紙鍐呴儴鍞竴缂栫爜锛�")
+ private String materialCode;
+
+ @Schema(description = "鏍囩殑鐗╃紪鐮侊紙鍐呴儴鍞竴鍚嶇О锛�")
+ private String materialInternalName;
+
+ @Schema(description = "鏁伴噺")
+ private BigDecimal quantity;
+
+ @Schema(description = "宸蹭氦浠樻暟閲�")
+ private BigDecimal deliveredQuantity;
+}
diff --git a/platformx-business-finance-biz/pom.xml b/platformx-business-finance-biz/pom.xml
index ffce21b..7ad150f 100644
--- a/platformx-business-finance-biz/pom.xml
+++ b/platformx-business-finance-biz/pom.xml
@@ -135,10 +135,17 @@
<groupId>com.by4cloud</groupId>
<artifactId>platformx-common-datasource</artifactId>
</dependency>
+ <!--easypoi-->
+ <dependency>
+ <groupId>com.deepoove</groupId>
+ <artifactId>poi-tl</artifactId>
+ <version>1.12.2</version> <!-- 璇蜂娇鐢ㄦ渶鏂扮ǔ瀹氱増 -->
+ </dependency>
- </dependencies>
+ </dependencies>
<build>
+
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -169,6 +176,17 @@
<skip>false</skip>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <configuration>
+ <encoding>UTF-8</encoding>
+ <nonFilteredFileExtensions>
+ <nonFilteredFileExtension>docx</nonFilteredFileExtension>
+ <nonFilteredFileExtension>xlsx</nonFilteredFileExtension>
+ </nonFilteredFileExtensions>
+ </configuration>
+ </plugin>
</plugins>
</build>
</profile>
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 a17497a..1608d7e 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
@@ -15,6 +15,7 @@
import com.by4cloud.platformx.business.service.ContractService;
import com.by4cloud.platformx.common.security.annotation.Inner;
import com.by4cloud.platformx.common.security.util.SecurityUtils;
+import jakarta.servlet.http.HttpServletResponse;
import org.apache.commons.lang3.StringUtils;
import org.springframework.security.access.prepost.PreAuthorize;
import com.by4cloud.platformx.common.excel.annotation.ResponseExcel;
@@ -174,4 +175,14 @@
.gt(Contract::getBillingAmout,new BigDecimal("0"))));
}
+ /**
+ * 鏍规嵁妯＄増鐢熸垚word涓�鐓ゆ満鍔犲伐鎵挎徑鍚堝悓
+ * @param id id
+ * @return R
+ */
+ @Operation(summary = "鏍规嵁妯＄増鐢熸垚word鍚堝悓" , description = "鏍规嵁妯＄増鐢熸垚word鍚堝悓" )
+ @GetMapping("/exportContractYMJJGCLWord/{id}" )
+ public void exportContractYMJJGCLWord(@PathVariable("id" ) Long id, HttpServletResponse response) {
+ contractService.exportContractYMJJGCLWord(id,response);
+ }
}
\ No newline at end of file
diff --git a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/ContractSubjectMatterController.java b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/ContractSubjectMatterController.java
index eee3ada..29ef60c 100644
--- a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/ContractSubjectMatterController.java
+++ b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/ContractSubjectMatterController.java
@@ -116,4 +116,14 @@
public List<ContractSubjectMatter> export(ContractSubjectMatter contractSubjectMatter,Long[] ids) {
return contractSubjectMatterService.list(Wrappers.lambdaQuery(contractSubjectMatter).in(ArrayUtil.isNotEmpty(ids), ContractSubjectMatter::getId, ids));
}
+
+ /**
+ * 閫氳繃鍚堝悓id鏌ヨ鏍囩殑鐗╁饱绾﹁繘搴�
+ * @param id id
+ * @return R
+ */
+ @GetMapping("/selectSubjectMatterProcess/{id}" )
+ public R selectSubjectMatterProcess(@PathVariable("id" ) Long id) {
+ return contractSubjectMatterService.selectSubjectMatterProcess(id);
+ }
}
\ No newline at end of file
diff --git a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/mapper/BipRequestRecordMapper.java b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/mapper/BipRequestRecordMapper.java
new file mode 100644
index 0000000..b6504f7
--- /dev/null
+++ b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/mapper/BipRequestRecordMapper.java
@@ -0,0 +1,11 @@
+package com.by4cloud.platformx.business.mapper;
+
+import com.by4cloud.platformx.business.entity.BipRequestRecord;
+import com.by4cloud.platformx.common.data.datascope.PlatformxBaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface BipRequestRecordMapper extends PlatformxBaseMapper<BipRequestRecord> {
+
+
+}
\ No newline at end of file
diff --git a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/mapper/PaymentSlipMapper.java b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/mapper/PaymentSlipMapper.java
new file mode 100644
index 0000000..8eee3dc
--- /dev/null
+++ b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/mapper/PaymentSlipMapper.java
@@ -0,0 +1,12 @@
+package com.by4cloud.platformx.business.mapper;
+
+import com.by4cloud.platformx.business.entity.PaymentSlip;
+
+import com.by4cloud.platformx.common.data.datascope.PlatformxBaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface PaymentSlipMapper extends PlatformxBaseMapper<PaymentSlip> {
+
+
+}
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 8977d73..4110226 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
@@ -7,6 +7,7 @@
import com.by4cloud.platformx.business.vo.ContractDetailVo;
import com.by4cloud.platformx.common.core.util.R;
import com.by4cloud.platformx.common.data.mybatis.IIService;
+import jakarta.servlet.http.HttpServletResponse;
/**
* @author 28254
@@ -28,4 +29,11 @@
void takeEffect(Long id);
R copyNewContract(Long id);
+
+ /**
+ * 涓�鐓ゆ満鍔犲伐鎵挎徑鍚堝悓
+ * @param id
+ * @param response
+ */
+ void exportContractYMJJGCLWord(Long id,HttpServletResponse response);
}
diff --git a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/ContractSubjectMatterService.java b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/ContractSubjectMatterService.java
index 2e7709a..09a4c79 100644
--- a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/ContractSubjectMatterService.java
+++ b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/ContractSubjectMatterService.java
@@ -2,7 +2,9 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.by4cloud.platformx.business.entity.ContractSubjectMatter;
+import com.by4cloud.platformx.common.core.util.R;
public interface ContractSubjectMatterService extends IService<ContractSubjectMatter> {
+ R selectSubjectMatterProcess(Long id);
}
\ 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 da08ddc..f722306 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
@@ -14,15 +14,13 @@
import com.by4cloud.platformx.business.vo.ContractPaymentScheduleVo;
import com.by4cloud.platformx.business.vo.ScheduleProcessVo;
import com.by4cloud.platformx.common.core.util.R;
+import com.by4cloud.platformx.common.security.util.SecurityUtils;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import java.math.BigDecimal;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
+import java.util.*;
import java.util.stream.Collectors;
/**
@@ -130,6 +128,50 @@
BigDecimal lastTotal = new BigDecimal("0");
if (ObjUtil.isNotNull(lastConfirm)) {
lastTotal = lastConfirm.getTotalAmount();
+ }else {
+ //瀹㈡埛浠樻瀹屾垚鍚堝悓
+ List<Contract> customerCompleteContractList = contractMapper.selectList(Wrappers.<Contract>lambdaQuery().eq(Contract::getPartyAId, contract.getPartyAId())
+ .eq(Contract::getPartyBId, SecurityUtils.getUser().getCompId()).apply(" amount = paid_amount"));
+ if (ArrayUtil.isNotEmpty(customerCompleteContractList)){
+ List<BigDecimal> outAmountList = new ArrayList<>();
+ for (Contract completeContract:customerCompleteContractList
+ ) {
+ PaymentConfirm contractLastConfirm = paymentConfirmMapper.selectOne(Wrappers.<PaymentConfirm>lambdaQuery().eq(PaymentConfirm::getContractId,completeContract.getId())
+ .orderByDesc(PaymentConfirm::getCreateTime).last("limit 1"));
+ //鏌ヨ瀹㈡埛浠樻瀹屾垚鍚堝悓涓渶鍚庢槑缁嗛噾棰� 鏈夐鏀惰浆鍏ュ綋鍓嶅悎鍚�
+ if (contractLastConfirm.getTotalAmount().compareTo(new BigDecimal("0"))>0){
+ //鏂板瀹屾垚浠樻鍚堝悓 璧勯噾杞嚭
+ PaymentConfirm outConfirm = BeanUtil.copyProperties(contractLastConfirm,PaymentConfirm.class,"id","transationAmount",
+ "advanceAmount","receivableAmount","overdueAmount","totalAmount");
+ outConfirm.setBusinessType("璧勯噾杞嚭");
+ outConfirm.setConfirmTime(new Date());
+ outConfirm.setTransationAmount(contractLastConfirm.getTotalAmount());
+ outConfirm.setTotalAmount(new BigDecimal("0"));
+ paymentConfirmMapper.insert(outConfirm);
+ outAmountList.add(outConfirm.getTransationAmount());
+ }
+ }
+ if (ArrayUtil.isNotEmpty(outAmountList.toArray())){
+ BigDecimal currentSum = new BigDecimal("0");
+ for (BigDecimal currentAmount:outAmountList
+ ) {
+ currentSum=currentSum.add(currentAmount);
+ //鏂板褰撳墠鍚堝悓 璧勯噾杞叆
+ PaymentConfirm inConfirm = BeanUtil.copyProperties(lastConfirm,PaymentConfirm.class,"id","transationAmount",
+ "advanceAmount","receivableAmount","overdueAmount","totalAmount");
+ inConfirm.setBusinessType("璧勯噾杞叆");
+ inConfirm.setConfirmTime(new Date());
+ inConfirm.setTransationAmount(currentSum.subtract(currentAmount));
+ inConfirm.setTotalAmount(lastConfirm.getTotalAmount().add(currentSum));
+ if (inConfirm.getTotalAmount().compareTo(new BigDecimal("0"))>0){
+ inConfirm.setAdvanceAmount(inConfirm.getTotalAmount());
+ }else if (inConfirm.getTotalAmount().compareTo(new BigDecimal("0"))<0){
+ inConfirm.setReceivableAmount(inConfirm.getTotalAmount().multiply(new BigDecimal("-1")));
+ }
+ paymentConfirmMapper.insert(inConfirm);
+ }
+ }
+ }
}
currentConfim.setTotalAmount(lastTotal.subtract(currentConfim.getReceivableAmount()));
if (schedule.getPaymentRatio().compareTo(new BigDecimal("0")) > 0) {
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 c21a77e..921a9dc 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
@@ -1,12 +1,16 @@
package com.by4cloud.platformx.business.service.impl;
import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.convert.Convert;
+import cn.hutool.core.date.DatePattern;
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 com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.by4cloud.platformx.admin.api.entity.SysDept;
+import com.by4cloud.platformx.admin.api.feign.RemoteDeptService;
import com.by4cloud.platformx.business.api.feign.RemoteFlowProcessService;
import com.by4cloud.platformx.business.constant.FlowNameEnum;
import com.by4cloud.platformx.business.dto.ContractAddDTO;
@@ -18,17 +22,23 @@
import com.by4cloud.platformx.business.vo.ContractDetailVo;
import com.by4cloud.platformx.common.core.util.R;
import com.by4cloud.platformx.common.security.util.SecurityUtils;
-import com.by4cloud.platformx.flow.task.api.feign.RemoteBusinessService;
import com.by4cloud.platformx.flow.task.dto.ProcessInstanceParamDto;
+import com.deepoove.poi.XWPFTemplate;
+import com.deepoove.poi.config.Configure;
+import com.deepoove.poi.data.RowRenderData;
+import com.deepoove.poi.plugin.table.LoopRowTableRenderPolicy;
+import jakarta.servlet.http.HttpServletResponse;
import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.core.io.ClassPathResource;
import org.springframework.stereotype.Service;
-import java.io.Serializable;
+import java.io.IOException;
+import java.io.OutputStream;
import java.math.BigDecimal;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.AtomicReference;
/**
* @author cd
@@ -44,7 +54,13 @@
private final ContractPaymentScheduleProcessMapper contractPaymentScheduleProcessMapper;
private final PaymentConfirmMapper paymentConfirmMapper;
private final CurrentOverdueMapper currentOverdueMapper;
+ private final BusinessCustomerMapper businessCustomerMapper;
private final RemoteFlowProcessService remoteFlowProcessService;
+ private final ContractTemplateMapper contractTemplateMapper;
+ private final RemoteDeptService remoteDeptService;
+
+ @Value("${file.local.base-path}")
+ private String basePath;
@Override
public R add(ContractAddDTO addDTO) {
@@ -208,29 +224,8 @@
.orderByAsc(ContractPaymentSchedule::getCreateTime).last("limit 1"));
if (fitstSchedule.getStageName().equals("鍚堝悓绛捐")){
//鏂板搴旀敹
- PaymentConfirm paymentConfirm = new PaymentConfirm();
- paymentConfirm.setBusinessType("鍚堝悓绛捐搴旀敹");
- paymentConfirm.setBusGuestId(contract.getPartyAId());
- paymentConfirm.setBusGuestName(contract.getPartyA());
- paymentConfirm.setContractId(contract.getId());
- paymentConfirm.setContractName(contract.getContractName());
- paymentConfirm.setContractNo(contract.getContractNo());
- paymentConfirm.setScheduleId(fitstSchedule.getId());
- paymentConfirm.setScheduleName(fitstSchedule.getStageName());
- paymentConfirm.setConfirmTime(new Date());
- paymentConfirm.setTransationAmount(fitstSchedule.getPlannedAmount());
- paymentConfirm.setReceivableAmount(fitstSchedule.getPlannedAmount());
- paymentConfirm.setTotalAmount(fitstSchedule.getPlannedAmount().multiply(new BigDecimal("-1")));
- 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();
- }
- paymentConfirm.setTotalAmount(lastNewTotal.subtract(paymentConfirm.getReceivableAmount()));
- if (fitstSchedule.getPaymentRatio().compareTo(new BigDecimal("0"))>0){
- paymentConfirmMapper.insert(paymentConfirm);
- }
+ savePaymentConfirm(contract,fitstSchedule);
+
//鏂板鍚堝悓灞ョ害璁板綍
ContractPaymentScheduleProcess process = new ContractPaymentScheduleProcess();
process.setContractId(contract.getId());
@@ -239,14 +234,14 @@
process.setScheduleName(fitstSchedule.getStageName());
process.setProcessDate(contract.getSignDate());
contractPaymentScheduleProcessMapper.insert(process);
- //褰撳墠涓哄悎鍚屾渶鍚庨樁娈�
- PaymentConfirm newConfirm = paymentConfirmMapper.selectOne(Wrappers.<PaymentConfirm>lambdaQuery().eq(PaymentConfirm::getContractId,contract.getId())
- .orderByDesc(PaymentConfirm::getCreateTime).last("limit 1"));
- if (ObjUtil.isNotNull(newConfirm)&&newConfirm.getTotalAmount().compareTo(new BigDecimal("0"))>=0){
- //鏈夐浠樹笖瓒呰繃搴旀敹 鍏抽棴鍚堝悓鐘舵��
- contract.setContractStatus(3);
- baseMapper.updateById(contract);
- }
+// //褰撳墠涓哄悎鍚屾渶鍚庨樁娈�
+// PaymentConfirm newConfirm = paymentConfirmMapper.selectOne(Wrappers.<PaymentConfirm>lambdaQuery().eq(PaymentConfirm::getContractId,contract.getId())
+// .orderByDesc(PaymentConfirm::getCreateTime).last("limit 1"));
+// if (ObjUtil.isNotNull(newConfirm)&&newConfirm.getTotalAmount().compareTo(new BigDecimal("0"))>=0){
+// //鏈夐浠樹笖瓒呰繃搴旀敹 鍏抽棴鍚堝悓鐘舵��
+// contract.setContractStatus(3);
+// baseMapper.updateById(contract);
+// }
}else if (fitstSchedule.getStageName().equals("鍙戣揣鍓�")) {
//鏇存柊鍚堝悓涓嬩釜闃舵
contract.setNextScheduleName("鏃�");
@@ -261,29 +256,7 @@
baseMapper.updateById(contract);
}else {
//鏂板搴旀敹
- PaymentConfirm paymentConfirm = new PaymentConfirm();
- paymentConfirm.setBusinessType("璐ㄤ繚閲�");
- paymentConfirm.setBusGuestId(contract.getPartyAId());
- paymentConfirm.setBusGuestName(contract.getPartyA());
- paymentConfirm.setContractId(contract.getId());
- paymentConfirm.setContractName(contract.getContractName());
- paymentConfirm.setContractNo(contract.getContractNo());
- paymentConfirm.setScheduleId(fitstSchedule.getId());
- paymentConfirm.setScheduleName(fitstSchedule.getStageName());
- paymentConfirm.setConfirmTime(new Date());
- paymentConfirm.setTransationAmount(fitstSchedule.getPlannedAmount());
- paymentConfirm.setReceivableAmount(fitstSchedule.getPlannedAmount());
- paymentConfirm.setTotalAmount(fitstSchedule.getPlannedAmount().multiply(new BigDecimal("-1")));
- 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();
- }
- paymentConfirm.setTotalAmount(lastNewTotal.subtract(paymentConfirm.getReceivableAmount()));
- if (fitstSchedule.getPaymentRatio().compareTo(new BigDecimal("0"))>0) {
- paymentConfirmMapper.insert(paymentConfirm);
- }
+ savePaymentConfirm(contract,fitstSchedule);
}
//鏌ヨ鏄惁鏈夊悗缁樁娈�
List<ContractPaymentSchedule> afterSchedule = contractPaymentScheduleMapper.selectList(Wrappers.<ContractPaymentSchedule>lambdaQuery()
@@ -343,6 +316,76 @@
fitstSchedule.setEffectiveDate(DateUtil.offsetDay(contract.getSignDate(),fitstSchedule.getAgreedDays()));
fitstSchedule.setEffectiveEndDate(contract.getExpirationDate());
contractPaymentScheduleMapper.updateById(fitstSchedule);
+ }
+ }
+
+ private void savePaymentConfirm(Contract contract, ContractPaymentSchedule schedule) {
+ PaymentConfirm paymentConfirm = new PaymentConfirm();
+ paymentConfirm.setBusinessType(schedule.getStageName()+"搴旀敹");
+ paymentConfirm.setBusGuestId(contract.getPartyAId());
+ paymentConfirm.setBusGuestName(contract.getPartyA());
+ paymentConfirm.setContractId(contract.getId());
+ paymentConfirm.setContractName(contract.getContractName());
+ paymentConfirm.setContractNo(contract.getContractNo());
+ paymentConfirm.setScheduleId(schedule.getId());
+ paymentConfirm.setScheduleName(schedule.getStageName());
+ paymentConfirm.setConfirmTime(new Date());
+ paymentConfirm.setTransationAmount(schedule.getPlannedAmount());
+ paymentConfirm.setReceivableAmount(schedule.getPlannedAmount());
+ paymentConfirm.setTotalAmount(schedule.getPlannedAmount().multiply(new BigDecimal("-1")));
+ 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();
+ }
+ paymentConfirm.setTotalAmount(lastNewTotal.subtract(paymentConfirm.getReceivableAmount()));
+ if (schedule.getPaymentRatio().compareTo(new BigDecimal("0"))>0){
+ paymentConfirmMapper.insert(paymentConfirm);
+ }
+ //瀹㈡埛浠樻瀹屾垚鍚堝悓
+ List<Contract> customerCompleteContractList = baseMapper.selectList(Wrappers.<Contract>lambdaQuery().eq(Contract::getPartyAId, contract.getPartyAId())
+ .eq(Contract::getPartyBId,SecurityUtils.getUser().getCompId()).apply(" amount = paid_amount"));
+ if (ArrayUtil.isNotEmpty(customerCompleteContractList)){
+ List<BigDecimal> outAmountList = new ArrayList<>();
+ for (Contract completeContract:customerCompleteContractList
+ ) {
+ PaymentConfirm contractLastConfirm = paymentConfirmMapper.selectOne(Wrappers.<PaymentConfirm>lambdaQuery().eq(PaymentConfirm::getContractId,completeContract.getId())
+ .orderByDesc(PaymentConfirm::getCreateTime).last("limit 1"));
+ //鏌ヨ瀹㈡埛浠樻瀹屾垚鍚堝悓涓渶鍚庢槑缁嗛噾棰� 鏈夐鏀惰浆鍏ュ綋鍓嶅悎鍚�
+ if (contractLastConfirm.getTotalAmount().compareTo(new BigDecimal("0"))>0){
+ //鏂板瀹屾垚浠樻鍚堝悓 璧勯噾杞嚭
+ PaymentConfirm outConfirm = BeanUtil.copyProperties(contractLastConfirm,PaymentConfirm.class,"id","transationAmount",
+ "advanceAmount","receivableAmount","overdueAmount","totalAmount");
+ outConfirm.setBusinessType("璧勯噾杞嚭");
+ outConfirm.setConfirmTime(new Date());
+ outConfirm.setTransationAmount(contractLastConfirm.getTotalAmount());
+ outConfirm.setTotalAmount(new BigDecimal("0"));
+ paymentConfirmMapper.insert(outConfirm);
+ outAmountList.add(outConfirm.getTransationAmount());
+ }
+ }
+ if (ArrayUtil.isNotEmpty(outAmountList.toArray())){
+ BigDecimal currentSum = new BigDecimal("0");
+ for (BigDecimal currentAmount:outAmountList
+ ) {
+ currentSum=currentSum.add(currentAmount);
+ //鏂板褰撳墠鍚堝悓 璧勯噾杞叆
+ PaymentConfirm inConfirm = BeanUtil.copyProperties(paymentConfirm,PaymentConfirm.class,"id","transationAmount",
+ "advanceAmount","receivableAmount","overdueAmount","totalAmount");
+ inConfirm.setBusinessType("璧勯噾杞叆");
+ inConfirm.setConfirmTime(new Date());
+ inConfirm.setTransationAmount(currentSum.subtract(currentAmount));
+ inConfirm.setTotalAmount(paymentConfirm.getTotalAmount().add(currentSum));
+ if (inConfirm.getTotalAmount().compareTo(new BigDecimal("0"))>0){
+ inConfirm.setAdvanceAmount(inConfirm.getTotalAmount());
+ }else if (inConfirm.getTotalAmount().compareTo(new BigDecimal("0"))<0){
+ inConfirm.setReceivableAmount(inConfirm.getTotalAmount().multiply(new BigDecimal("-1")));
+ }
+ paymentConfirmMapper.insert(inConfirm);
+ }
+ }
+
}
}
@@ -426,6 +469,7 @@
newContract.setPaidAmount(new BigDecimal("0"));
newContract.setBillingStatus("0");
newContract.setErpPushFlag("0");
+ newContract.setContractStatus(0);
List<Contract> contracts;
contracts = baseMapper.selectList(Wrappers.<Contract>lambdaQuery().eq(Contract::getContractNo,newContract.getContractNo()));
while (ArrayUtil.isNotEmpty(contracts.toArray())){
@@ -433,6 +477,111 @@
contracts = baseMapper.selectList(Wrappers.<Contract>lambdaQuery().eq(Contract::getContractNo,newContract.getContractNo()));
}
baseMapper.insert(newContract);
+ List<ContractSubjectMatter> subjectMatterList = contractSubjectMatterMapper.selectList(Wrappers.<ContractSubjectMatter>lambdaQuery().eq(ContractSubjectMatter::getContractId,id));
+ subjectMatterList.stream().forEach(contractSubjectMatter -> {
+ ContractSubjectMatter subjectMatter = BeanUtil.copyProperties(contractSubjectMatter,ContractSubjectMatter.class,"id","createTime");
+ subjectMatter.setContractId(newContract.getId());
+ subjectMatter.setDeliveryStatus(0);
+ subjectMatter.setDeliveredQuantity(new BigDecimal("0"));
+ subjectMatter.setRemainingQuantity(new BigDecimal("0"));
+ contractSubjectMatterMapper.insert(subjectMatter);
+ });
+ List<ContractPaymentSchedule> scheduleList = contractPaymentScheduleMapper.selectList(Wrappers.<ContractPaymentSchedule>lambdaQuery().eq(ContractPaymentSchedule::getContractId,id));
+ scheduleList.stream().forEach(contractPaymentSchedule -> {
+ ContractPaymentSchedule schedule = BeanUtil.copyProperties(contractPaymentSchedule,ContractPaymentSchedule.class,"id","createTime");
+ schedule.setContractId(newContract.getId());
+ schedule.setPaymentStatus(0);
+ schedule.setActualAmount(new BigDecimal("0"));
+ schedule.setEffectiveDate(null);
+ schedule.setEffectiveEndDate(null);
+ contractPaymentScheduleMapper.insert(schedule);
+ });
return R.ok();
}
+
+ @Override
+ public void exportContractYMJJGCLWord(Long id, HttpServletResponse response) {
+ Contract contract = baseMapper.selectById(id);
+ List<ContractSubjectMatter> subjectMatterList = contractSubjectMatterMapper.selectList(Wrappers.<ContractSubjectMatter>lambdaQuery()
+ .eq(ContractSubjectMatter::getContractId,id).orderByAsc(ContractSubjectMatter::getCreateTime));
+ Map<String,Object> map = new HashMap<>();
+ //鍚堝悓鍩烘湰淇℃伅
+ map.put("partyA",contract.getPartyA());
+ map.put("partyB",contract.getPartyB());
+ map.put("contractNo",contract.getContractNo());
+ map.put("signPlace",contract.getSignPlace());
+ map.put("signDate",DateUtil.formatDate(contract.getSignDate()));
+ map.put("signDateYMD",DateUtil.format(contract.getSignDate(), DatePattern.CHINESE_DATE_PATTERN));
+ map.put("total", contract.getAmount());
+ map.put("amountWords", Convert.digitToChinese(contract.getAmount()));
+ //鏍囩殑鐗�
+ List<Map<String,Object>> items = new ArrayList<>();
+ List<RowRenderData> dataList = new ArrayList<>();
+ AtomicReference<Integer> no = new AtomicReference<>(0);
+ subjectMatterList.stream().forEach(contractSubjectMatter -> {
+ Map<String,Object> item = new HashMap<>();
+ item.put("no",no);
+ item.put("materialName",contractSubjectMatter.getMaterialName());
+ item.put("guige","");
+ item.put("unit","");
+ item.put("quantity",contractSubjectMatter.getQuantity());
+ item.put("danzhong","");
+ item.put("zongzhong","");
+ item.put("unitPrice",contractSubjectMatter.getUnitPrice());
+ item.put("price",contractSubjectMatter.getTotalAmount());
+ items.add(item);
+ no.updateAndGet(v -> v + 1);
+ });
+ map.put("items",items);
+ //瀹氬埗鏂�
+ BusinessCustomer customer = businessCustomerMapper.selectById(contract.getPartyAId());
+ map.put("companyName",customer.getCompanyName());
+ map.put("legalPerson",customer.getLegalPerson());
+ map.put("contactPhone",customer.getContactPhone());
+ map.put("bankName",customer.getBankName());
+ map.put("bankAccount",customer.getBankAccount());
+
+ //鎵挎徑鏂�
+ R<SysDept> r = remoteDeptService.getById(contract.getPartyBId());
+ SysDept dept = r.getData();
+ map.put("companyName",dept.getOrgName());
+ map.put("legalPerson1",StrUtil.isNotEmpty(dept.getLegalPerson())?dept.getLegalPerson():"");
+ map.put("entrustedAgent",StrUtil.isNotEmpty(dept.getLegalPerson())?"":dept.getEntrustedAgent());
+ map.put("orgContact",dept.getOrgContact());
+ map.put("orgBank",dept.getOrgBank());
+ map.put("orgBankAccount",dept.getOrgBankAccount());
+
+ //鐢熸垚鏂囦欢鍚�
+ Long time = new Date().getTime();
+ // 鐢熸垚鐨剋ord鏍煎紡
+ String formatSuffix = ".docx";
+ // 鎷兼帴鍚庣殑鏂囦欢鍚�
+ String fileName = time + formatSuffix;//鏂囦欢鍚� 甯﹀悗缂�
+ //瀵煎嚭word
+ try {
+ // 1. 鍔犺浇妯＄増
+ // 鍋囪妯＄増鍦� resources/templates/template.docx
+ ClassPathResource resource = new ClassPathResource("template/ymjjgclht.docx");
+ // 閰嶇疆鍒楄〃绛栫暐
+ Configure config = Configure.builder()
+ .bind("items", new LoopRowTableRenderPolicy()) // 灏� items 缁戝畾鍒拌寰幆绛栫暐
+ .build();
+ // 2. 缂栬瘧骞舵覆鏌撴暟鎹�
+ XWPFTemplate xwpfTemplate = XWPFTemplate.compile(resource.getInputStream(),config).render(map);
+
+ // 3. 璁剧疆鍝嶅簲澶�
+ response.setContentType("application/vnd.openxmlformats-officedocument.wordprocessingml.document");
+ response.setCharacterEncoding("utf-8");
+ response.setHeader("Content-disposition", "attachment;filename*=utf-8''" + fileName + ".docx");
+
+ // 4. 鍐欏叆杈撳嚭娴�
+ OutputStream out = response.getOutputStream();
+ xwpfTemplate.write(out);
+ out.flush();
+ out.close();
+ xwpfTemplate.close(); // 閲嶈锛氬叧闂ā鐗堥噴鏀捐祫婧�
+ }catch (IOException e) {
+ e.printStackTrace();
+ }
+ }
}
diff --git a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/ContractSubjectMatterServiceImpl.java b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/ContractSubjectMatterServiceImpl.java
index 43c9c85..7f133c5 100644
--- a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/ContractSubjectMatterServiceImpl.java
+++ b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/ContractSubjectMatterServiceImpl.java
@@ -4,7 +4,14 @@
import com.by4cloud.platformx.business.entity.ContractSubjectMatter;
import com.by4cloud.platformx.business.mapper.ContractSubjectMatterMapper;
import com.by4cloud.platformx.business.service.ContractSubjectMatterService;
+import com.by4cloud.platformx.business.vo.ContractSubjectMatterVo;
+import com.by4cloud.platformx.common.core.util.R;
+import com.by4cloud.platformx.common.data.mybatis.BaseModel;
+import com.github.yulichang.wrapper.MPJLambdaWrapper;
import org.springframework.stereotype.Service;
+
+import java.util.List;
+
/**
* 鍚堝悓鏍囩殑鐗╂槑缁嗚〃
*
@@ -13,4 +20,13 @@
*/
@Service
public class ContractSubjectMatterServiceImpl extends ServiceImpl<ContractSubjectMatterMapper, ContractSubjectMatter> implements ContractSubjectMatterService {
+ @Override
+ public R selectSubjectMatterProcess(Long id) {
+ MPJLambdaWrapper<ContractSubjectMatter> wrapper = new MPJLambdaWrapper<ContractSubjectMatter>()
+ .selectAll(ContractSubjectMatter.class)
+ .eq(ContractSubjectMatter::getContractId,id)
+ .orderByAsc(ContractSubjectMatter::getCreateTime);
+ List<ContractSubjectMatterVo> matterVoList = baseMapper.selectJoinList(ContractSubjectMatterVo.class,wrapper);
+ return R.ok(matterVoList);
+ }
}
\ No newline at end of file
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 0ec467d..ba953e1 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
@@ -1,6 +1,7 @@
package com.by4cloud.platformx.business.service.impl;
import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.date.DatePattern;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.ArrayUtil;
import cn.hutool.core.util.ObjUtil;
@@ -13,6 +14,7 @@
import com.by4cloud.platformx.business.mapper.*;
import com.by4cloud.platformx.business.service.OutBoundService;
import com.by4cloud.platformx.common.core.util.R;
+import com.by4cloud.platformx.common.security.util.SecurityUtils;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
@@ -73,8 +75,16 @@
}
//褰撳墠鍏ュ簱鏍囩殑鐗�
Map<Long, Object> currentOutMap = new HashMap<>();
+ //鍑哄簱鎵规
+ String batchNumber = DateUtil.format(new Date(), DatePattern.PURE_DATETIME_MS_PATTERN);
//鍑哄簱
addDTO.getSubjectMatterList().stream().forEach(outSubjectMatterAddDTO -> {
+ OutBound outBound = BeanUtil.copyProperties(outSubjectMatterAddDTO, OutBound.class);
+ outBound.setBatchNumber(batchNumber);
+ outBound.setBusGuestName(addDTO.getBusGuestName());
+ outBound.setBusGuestId(addDTO.getBusGuestId());
+ outBound.setOutBoundTime(addDTO.getOutBoundTime());
+ baseMapper.insert(outBound);
BigDecimal remainNum = outSubjectMatterAddDTO.getOutBoundNum();
for (ContractSubjectMatter subjectMatter : subjectMatterList) {
if (outSubjectMatterAddDTO.getSubjectMatterCode().equals(subjectMatter.getMaterialCode())) {
@@ -92,7 +102,7 @@
contractSubjectMatterMapper.updateById(subjectMatter);
currentOutMap.put(subjectMatter.getContractId(), subjectMatter);
//鏂板鍚堝悓鍑哄簱鍘嗗彶
- saveContractOutBound(contract, addDTO, subjectMatter);
+ saveContractOutBound(contract, addDTO, subjectMatter,outBound.getId());
} else {
BigDecimal currentOut = remainNum.add(subjectMatter.getRemainingQuantity());
subjectMatter.setDeliveredQuantity(subjectMatter.getQuantity().add(remainNum));
@@ -103,7 +113,7 @@
contractSubjectMatterMapper.updateById(subjectMatter);
currentOutMap.put(subjectMatter.getContractId(), subjectMatter);
//鏂板鍚堝悓鍑哄簱鍘嗗彶
- saveContractOutBound(contract, addDTO, subjectMatter);
+ saveContractOutBound(contract, addDTO, subjectMatter,outBound.getId());
break;
}
@@ -119,7 +129,7 @@
contractSubjectMatterMapper.updateById(subjectMatter);
currentOutMap.put(subjectMatter.getContractId(), subjectMatter);
//鏂板鍚堝悓鍑哄簱鍘嗗彶
- saveContractOutBound(contract, addDTO, subjectMatter);
+ saveContractOutBound(contract, addDTO, subjectMatter,outBound.getId());
} else {
BigDecimal currentOut = remainNum.add(subjectMatter.getQuantity());
subjectMatter.setDeliveredQuantity(subjectMatter.getQuantity().add(remainNum));
@@ -130,17 +140,13 @@
contractSubjectMatterMapper.updateById(subjectMatter);
currentOutMap.put(subjectMatter.getContractId(), subjectMatter);
//鏂板鍚堝悓鍑哄簱鍘嗗彶
- saveContractOutBound(contract, addDTO, subjectMatter);
+ saveContractOutBound(contract, addDTO, subjectMatter,outBound.getId());
break;
}
}
}
}
- OutBound outBound = BeanUtil.copyProperties(outSubjectMatterAddDTO, OutBound.class);
- outBound.setBusGuestName(addDTO.getBusGuestName());
- outBound.setBusGuestId(addDTO.getBusGuestId());
- outBound.setOutBoundTime(addDTO.getOutBoundTime());
- baseMapper.insert(outBound);
+
});
//鍑哄簱搴旀敹娆炬槑缁�
@@ -215,6 +221,49 @@
paymentConfirm.setTotalAmount(paymentConfirm.getTransationAmount().multiply(new BigDecimal("-1")));
if(schedule.getPaymentRatio().compareTo(new BigDecimal("0"))>0) {
paymentConfirmMapper.insert(paymentConfirm);
+ //瀹㈡埛浠樻瀹屾垚鍚堝悓
+ List<Contract> customerCompleteContractList = contractMapper.selectList(Wrappers.<Contract>lambdaQuery().eq(Contract::getPartyAId, contract.getPartyAId())
+ .eq(Contract::getPartyBId, SecurityUtils.getUser().getCompId()).apply(" amount = paid_amount"));
+ if (ArrayUtil.isNotEmpty(customerCompleteContractList)){
+ List<BigDecimal> outAmountList = new ArrayList<>();
+ for (Contract completeContract:customerCompleteContractList
+ ) {
+ PaymentConfirm contractLastConfirm = paymentConfirmMapper.selectOne(Wrappers.<PaymentConfirm>lambdaQuery().eq(PaymentConfirm::getContractId,completeContract.getId())
+ .orderByDesc(PaymentConfirm::getCreateTime).last("limit 1"));
+ //鏌ヨ瀹㈡埛浠樻瀹屾垚鍚堝悓涓渶鍚庢槑缁嗛噾棰� 鏈夐鏀惰浆鍏ュ綋鍓嶅悎鍚�
+ if (contractLastConfirm.getTotalAmount().compareTo(new BigDecimal("0"))>0){
+ //鏂板瀹屾垚浠樻鍚堝悓 璧勯噾杞嚭
+ PaymentConfirm outConfirm = BeanUtil.copyProperties(contractLastConfirm,PaymentConfirm.class,"id","transationAmount",
+ "advanceAmount","receivableAmount","overdueAmount","totalAmount");
+ outConfirm.setBusinessType("璧勯噾杞嚭");
+ outConfirm.setConfirmTime(new Date());
+ outConfirm.setTransationAmount(contractLastConfirm.getTotalAmount());
+ outConfirm.setTotalAmount(new BigDecimal("0"));
+ paymentConfirmMapper.insert(outConfirm);
+ outAmountList.add(outConfirm.getTransationAmount());
+ }
+ }
+ if (ArrayUtil.isNotEmpty(outAmountList.toArray())){
+ BigDecimal currentSum = new BigDecimal("0");
+ for (BigDecimal currentAmount:outAmountList
+ ) {
+ currentSum=currentSum.add(currentAmount);
+ //鏂板褰撳墠鍚堝悓 璧勯噾杞叆
+ PaymentConfirm inConfirm = BeanUtil.copyProperties(paymentConfirm,PaymentConfirm.class,"id","transationAmount",
+ "advanceAmount","receivableAmount","overdueAmount","totalAmount");
+ inConfirm.setBusinessType("璧勯噾杞叆");
+ inConfirm.setConfirmTime(new Date());
+ inConfirm.setTransationAmount(currentSum.subtract(currentAmount));
+ inConfirm.setTotalAmount(paymentConfirm.getTotalAmount().add(currentSum));
+ if (inConfirm.getTotalAmount().compareTo(new BigDecimal("0"))>0){
+ inConfirm.setAdvanceAmount(inConfirm.getTotalAmount());
+ }else if (inConfirm.getTotalAmount().compareTo(new BigDecimal("0"))<0){
+ inConfirm.setReceivableAmount(inConfirm.getTotalAmount().multiply(new BigDecimal("-1")));
+ }
+ paymentConfirmMapper.insert(inConfirm);
+ }
+ }
+ }
}
}
@@ -316,7 +365,7 @@
return R.ok();
}
- private void saveContractOutBound(Contract contract, OutBoundAddDTO addDTO, ContractSubjectMatter subjectMatter) {
+ private void saveContractOutBound(Contract contract, OutBoundAddDTO addDTO, ContractSubjectMatter subjectMatter,Long outBoundId) {
ContractOutBound contractOutBound = new ContractOutBound();
contractOutBound.setContractId(contract.getId());
contractOutBound.setContractName(contract.getContractName());
@@ -328,6 +377,7 @@
contractOutBound.setOutBoundNum(subjectMatter.getLastDeliveredQuantity());
contractOutBound.setOutBoundAttNames(addDTO.getOutBoundAttNames());
contractOutBound.setOutBoundAttPaths(addDTO.getOutBoundAttPaths());
+ contractOutBound.setOutBoundId(outBoundId);
contractOutBoundMapper.insert(contractOutBound);
}
}
\ No newline at end of file
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 9555670..81b05af 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,32 +1,39 @@
package com.by4cloud.platformx.business.service.impl;
import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.date.DatePattern;
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.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.by4cloud.platformx.admin.api.entity.SysDept;
+import com.by4cloud.platformx.admin.api.feign.RemoteDeptService;
import com.by4cloud.platformx.business.dto.PaymentConfirmAddDTO;
import com.by4cloud.platformx.business.entity.*;
-import com.by4cloud.platformx.business.mapper.ContractPaymentScheduleMapper;
-import com.by4cloud.platformx.business.mapper.CurrentOverdueMapper;
-import com.by4cloud.platformx.business.mapper.HistoryOverdueMapper;
-import com.by4cloud.platformx.business.mapper.PaymentConfirmMapper;
+import com.by4cloud.platformx.business.mapper.*;
import com.by4cloud.platformx.business.service.BusinessCustomerService;
import com.by4cloud.platformx.business.service.ContractService;
import com.by4cloud.platformx.business.service.PaymentConfirmService;
+import com.by4cloud.platformx.business.utils.SignHelper;
import com.by4cloud.platformx.common.core.util.R;
+import com.by4cloud.platformx.common.security.util.SecurityUtils;
import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Value;
+import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Service;
+import java.io.UnsupportedEncodingException;
import java.math.BigDecimal;
-import java.util.Date;
-import java.util.List;
-import java.util.Objects;
+import java.security.InvalidKeyException;
+import java.security.NoSuchAlgorithmException;
+import java.util.*;
+import java.util.concurrent.TimeUnit;
/**
* 鏀舵纭
@@ -34,6 +41,7 @@
* @author syt
* @date 2026-04-29 11:33:26
*/
+@Slf4j
@Service
@RequiredArgsConstructor
public class PaymentConfirmServiceImpl extends ServiceImpl<PaymentConfirmMapper, PaymentConfirm> implements PaymentConfirmService {
@@ -43,109 +51,608 @@
private final ContractPaymentScheduleMapper contractPaymentScheduleMapper;
private final CurrentOverdueMapper currentOverdueMapper;
private final HistoryOverdueMapper historyOverdueMapper;
+ private final PaymentSlipMapper paymentSlipMapper;
+ private final BipRequestRecordMapper bipRequestRecordMapper;
+ private final RemoteDeptService remoteDeptService;
+ private final RedisTemplate redisTemplate;
@Value("${bip.url}")
private String url;
+ @Value("${bip.codes}")
+ private String codes;
+
+ @Value("${bip.appKey}")
+ private String appKey;
+
+ @Value("${bip.appSecret}")
+ private String appSecret;
@Override
public R add(PaymentConfirmAddDTO addDTO) {
- Contract contract = contractService.getOne(Wrappers.<Contract>lambdaQuery().eq(Contract::getContractNo,addDTO.getContractNo()));
- if(ObjUtil.isNull(contract)){
- return R.failed("鍚堝悓鏌ヨ澶辫触锛岃妫�鏌ュ悎鍚岀紪鍙�");
+ if (StrUtil.isNotBlank(addDTO.getContractNo())) {
+ Contract contract = contractService.getOne(Wrappers.<Contract>lambdaQuery().eq(Contract::getContractNo, addDTO.getContractNo()));
+ BusinessCustomer customer = businessCustomerService.getOne(Wrappers.<BusinessCustomer>lambdaQuery()
+ .eq(StrUtil.isNotBlank(addDTO.getBusGuestName()), BusinessCustomer::getCompanyName, addDTO.getBusGuestName())
+ .eq(StrUtil.isNotBlank(addDTO.getBusGuestId()), BusinessCustomer::getId, addDTO.getBusGuestId()));
+ if (ObjUtil.isNull(customer)) {
+ return R.failed("瀹㈠晢鏌ヨ澶辫触锛岃妫�鏌ュ鍟�");
+ }
+
+ PaymentConfirm lastConfirm = baseMapper.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();
+ }
+
+ //杞叆
+ if (StrUtil.equals(addDTO.getInOrOut(), "1")) {
+ BigDecimal newtotal = addDTO.getTransationAmount().add(lastTotal);
+ PaymentConfirm entity = new PaymentConfirm();
+ entity.setContractId(contract.getId());
+ entity.setContractName(contract.getContractName());
+ entity.setContractNo(addDTO.getContractNo());
+ if (ObjUtil.isNotNull(lastConfirm)) {
+ entity.setScheduleId(lastConfirm.getScheduleId());
+ entity.setScheduleName(lastConfirm.getScheduleName());
+ }
+ entity.setBusGuestId(customer.getId());
+ entity.setBusGuestName(customer.getCompanyName());
+ entity.setBusinessType("瀹㈡埛浠樻");
+ if (newtotal.compareTo(new BigDecimal("0")) > 0) {
+ entity.setTransationAmount(addDTO.getTransationAmount());
+ entity.setAdvanceAmount(newtotal);
+ entity.setTotalAmount(newtotal);
+ entity.setConfirmTime(new Date());
+ baseMapper.insert(entity);
+ } else if (newtotal.compareTo(new BigDecimal("0")) == 0) {
+ entity.setTransationAmount(addDTO.getTransationAmount());
+ entity.setTotalAmount(newtotal);
+ entity.setConfirmTime(new Date());
+ baseMapper.insert(entity);
+ } else {
+ entity.setTransationAmount(addDTO.getTransationAmount());
+ entity.setReceivableAmount(newtotal.multiply(new BigDecimal("-1")));
+ entity.setTotalAmount(newtotal);
+ 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));
+ if (ArrayUtil.isNotEmpty(scheduleList.toArray())) {
+ BigDecimal remain = addDTO.getTransationAmount();
+ 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(addDTO.getConfirmTime());
+ 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(addDTO.getConfirmTime());
+ 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(addDTO.getConfirmTime());
+ 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(addDTO.getConfirmTime());
+ 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(addDTO.getTransationAmount());
+ contract.setPaidAmount(paid);
+ if (paid.compareTo(contract.getAmount()) > 0) {
+ contract.setPaidAmount(contract.getAmount());
+ }
+ contractService.updateById(contract);
+ }
+ //杞嚭
+ if (StrUtil.equals(addDTO.getInOrOut(), "2")) {
+ PaymentConfirm entity = new PaymentConfirm();
+ entity.setContractId(contract.getId());
+ entity.setContractName(contract.getContractName());
+ entity.setContractNo(addDTO.getContractNo());
+
+ entity.setBusGuestId(customer.getId());
+ entity.setBusGuestName(customer.getCompanyName());
+ entity.setBusinessType("");
+ entity.setTransationAmount(addDTO.getTransationAmount());
+ BigDecimal newtotal = addDTO.getTransationAmount().multiply(new BigDecimal("-1")).add(lastConfirm.getTotalAmount());
+ if (newtotal.compareTo(new BigDecimal("0")) > 0) {
+ entity.setAdvanceAmount(newtotal);
+ entity.setTotalAmount(newtotal);
+ } else if (newtotal.compareTo(new BigDecimal("0")) == 0) {
+ entity.setTotalAmount(newtotal);
+ } else {
+ return R.failed("褰撳墠瀹㈡埛浣欓涓�" + lastConfirm.getTotalAmount() + "涓嶈冻浠ユ弧瓒冲綋鍓嶅彂鐢熼噾棰濓紝鏃犳硶鎿嶄綔");
+ }
+ entity.setConfirmTime(new Date());
+ baseMapper.insert(entity);
+ }
+ // 鏌ヨ鎵�鏈変粯娆鹃樁娈垫槸鍚﹂兘浠樻瀹屾垚
+ List<ContractPaymentSchedule> scheduleList = contractPaymentScheduleMapper.selectList(Wrappers.<ContractPaymentSchedule>lambdaQuery().eq(ContractPaymentSchedule::getContractId, contract.getId()));
+ if (ArrayUtil.isNotEmpty(scheduleList.toArray())) {
+ if (scheduleList.stream().allMatch(item -> Objects.equals(item.getPaymentStatus(), 2))) {
+ contract.setContractStatus(3);
+ contractService.updateById(contract);
+ }
+ ;
+ }
+ }else {
+ List<Contract> customerContractList = contractService.list(Wrappers.<Contract>lambdaQuery().eq(Contract::getPartyAId, addDTO.getBusGuestId())
+ .eq(Contract::getPartyBId,SecurityUtils.getUser().getCompId()).orderByAsc(Contract::getCreateTime).apply(" amount != paid_amount"));
+ if (ArrayUtil.isEmpty(customerContractList.toArray())) {
+ return R.failed("涓烘煡璇㈠埌鏈粯娆惧悎鍚�");
+ }
+ BusinessCustomer customer = businessCustomerService.getOne(Wrappers.<BusinessCustomer>lambdaQuery()
+ .eq(StrUtil.isNotBlank(addDTO.getBusGuestName()), BusinessCustomer::getCompanyName, addDTO.getBusGuestName())
+ .eq(ObjUtil.isNotNull(addDTO.getBusGuestId()), BusinessCustomer::getId, addDTO.getBusGuestId())
+ .last("limit 1"));
+ if (ObjUtil.isNull(customer)) {
+ return R.failed("瀹㈠晢鏌ヨ澶辫触");
+ }
+
+ BigDecimal transtionAmount = addDTO.getTransationAmount();
+ //鍓╀綑浠樻
+ BigDecimal transtionRemainAmount = transtionAmount;
+ //鏀跺埌浠樻鐨勫悎鍚�
+ List<Contract> payContractList = new ArrayList<>();
+ //浠樻瀹屾垚鐨勫悎鍚�
+ List<Contract> payCompleteContractList = new ArrayList<>();
+ //浠樻鏈畬鎴愮殑鍚堝悓
+ List<Contract> payNoCompleteContractList = new ArrayList<>();
+ //鏈夐浠樻鐨勫悎鍚�
+ List<Contract> advanceContractList = new ArrayList<>();
+ //浠樻鏃堕棿
+ Date payDate = addDTO.getConfirmTime();
+ for (Contract contract : customerContractList) {
+ PaymentConfirm lastConfirm = baseMapper.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();
+ }
+
+ //鍚堝悓鏈�杩戞槑缁嗘�婚涓�0 鎴� > 0 鎯呭喌涓�
+ if (lastTotal.compareTo(new BigDecimal("0")) >= 0) {
+ log.info("褰撳墠鍚堝悓鍙凤細{},鏄庣粏鎬婚鏃犲簲鏀舵", contract.getContractNo());
+ advanceContractList.add(contract);
+ continue;
+ }
+
+ transtionRemainAmount = transtionRemainAmount.add(lastTotal);
+ PaymentConfirm entity = new PaymentConfirm();
+ entity.setContractId(contract.getId());
+ entity.setContractName(contract.getContractName());
+ entity.setContractNo(contract.getContractNo());
+ if (ObjUtil.isNotNull(lastConfirm)) {
+ entity.setScheduleId(lastConfirm.getScheduleId());
+ entity.setScheduleName(lastConfirm.getScheduleName());
+ }
+ entity.setBusGuestId(customer.getId());
+ entity.setBusGuestName(customer.getCompanyName());
+ entity.setBusinessType("瀹㈡埛浠樻");
+ if (transtionRemainAmount.compareTo(new BigDecimal("0")) > 0) {
+ entity.setTransationAmount(lastTotal.multiply(new BigDecimal("-1")));
+ entity.setTotalAmount(new BigDecimal("0"));
+ entity.setConfirmTime(payDate);
+ baseMapper.insert(entity);
+ payContractList.add(contract);
+ } else if (transtionRemainAmount.compareTo(new BigDecimal("0")) == 0) {
+ entity.setTransationAmount(lastTotal.multiply(new BigDecimal("-1")));
+ entity.setTotalAmount(new BigDecimal("0"));
+ entity.setConfirmTime(payDate);
+ baseMapper.insert(entity);
+ payContractList.add(contract);
+ break;
+ } else {
+ entity.setTransationAmount(transtionRemainAmount.subtract(lastTotal));
+ entity.setTotalAmount(transtionAmount);
+ entity.setConfirmTime(payDate);
+ baseMapper.insert(entity);
+ payContractList.add(contract);
+ break;
+ }
+ }
+
+ payContractList.stream().forEach(contract -> {
+ //鏇存柊浠樻闃舵浠樻
+ 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 = transtionAmount;
+ for (ContractPaymentSchedule schedule : scheduleList) {
+ BigDecimal lastRemain = remain;
+ remain = lastRemain.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(payDate);
+ 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(payDate);
+ 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(payDate);
+ 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(payDate);
+ 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;
+ }
+ }
+ }
+ //鍚堝悓鎵�鏈変粯娆鹃樁娈�
+ List<ContractPaymentSchedule> payComScheduleList = contractPaymentScheduleMapper.selectList(Wrappers.<ContractPaymentSchedule>lambdaQuery()
+ .eq(ContractPaymentSchedule::getContractId, contract.getId()).ne(ContractPaymentSchedule::getPaymentStatus, 0)
+ );
+ if (ArrayUtil.isNotEmpty(payComScheduleList.toArray())){
+ BigDecimal payTotal = payComScheduleList.stream().map(item->StrUtil.equals(item.getPaymentStatus() + "", "0") ? item.getPlannedAmount() :
+ item.getActualAmount()).reduce(BigDecimal.ZERO,BigDecimal::add);
+ contract.setPaidAmount(payTotal);
+ if (payComScheduleList.stream().allMatch(item -> Objects.equals(item.getPaymentStatus(), 2))) {
+ contract.setContractStatus(3);
+ }
+ contractService.updateById(contract);
+ if (contract.getAmount().compareTo(contract.getPaidAmount()) == 0) {
+ payCompleteContractList.add(contract);
+ }
+ //浠樻 涓� 浠樻鏈叏浠�
+ if (contract.getAmount().compareTo(contract.getPaidAmount()) > 0) {
+ payNoCompleteContractList.add(contract);
+ }
+ }
+ });
+
+ //瀹㈡埛棰勪粯鏈夊墿浣� 涓� 鏈夐浠樻鐨勫悎鍚�
+ if (transtionRemainAmount.compareTo(new BigDecimal("0")) > 0) {
+ if (ArrayUtil.isNotEmpty(payNoCompleteContractList.toArray())){
+ //浣欓 鏀惧埌浠樻鏈畬鎴愬悎鍚� 棰勬敹
+ Contract lastContract = payNoCompleteContractList.get(0);
+ //淇濆瓨鏄庣粏
+ saveNewPaymentConfirm(customer,null,lastContract,transtionRemainAmount,payDate);
+ }
+ if (ArrayUtil.isEmpty(payNoCompleteContractList.toArray())&&ArrayUtil.isNotEmpty(advanceContractList.toArray())){
+ //瀹㈡埛棰勪粯鏈夊墿浣� 娌℃湁棰勪粯娆剧殑鍚堝悓
+ Contract lastContract = advanceContractList.get(0);
+ //淇濆瓨鏄庣粏
+ saveNewPaymentConfirm(customer,null,lastContract,transtionRemainAmount,payDate);
+ }
+ if (ArrayUtil.isEmpty(payNoCompleteContractList.toArray())&&ArrayUtil.isEmpty(advanceContractList.toArray())
+ &&ArrayUtil.isNotEmpty(payCompleteContractList.toArray())) {
+ //瀹㈡埛棰勪粯鏈夊墿浣� 娌℃湁棰勪粯娆剧殑鍚堝悓
+ Contract lastContract = payCompleteContractList.get(payCompleteContractList.size() - 1);
+ //淇濆瓨鏄庣粏
+ saveNewPaymentConfirm(customer,null,lastContract,transtionRemainAmount,payDate);
+
+ }
+ }
+ }
+ return R.ok();
+ }
+
+ @Override
+ public R syncPaymentRecepit() {
+ String accessToken = "";
+ if (redisTemplate.hasKey("BIP_TOKEN")) {
+ accessToken = (String) redisTemplate.opsForValue().get("BIP_TOKEN");
+ } else {
+ getAccessToken(accessToken);
+ }
+ if (StrUtil.isEmpty(accessToken)) {
+ return R.failed("鑾峰彇token澶辫触");
+ }
+ String[] bipCodeArr = codes.split(",");
+ for (String bipCode : bipCodeArr) {
+ //鍏ュ弬
+ JSONObject params = genParams(bipCode);
+ String finalAccessToken = accessToken;
+ new Thread(() -> {
+ try {
+ Thread.sleep(500);
+ } catch (InterruptedException e) {
+ throw new RuntimeException(e);
+ }
+ log.info("SK_CX Request:", params.toJSONString());
+ String result = HttpUtil.post(url + "/yonbip/EFI/collection/list?access_token=" + finalAccessToken, params.toJSONString());
+ log.info("SK_CX Response:{}", result);
+ //淇濆瓨璇锋眰璁板綍
+ saveBipRequestRecord(params, result);
+ JSONObject resultJson = JSONObject.parseObject(result);
+ if (resultJson.containsKey("code") && resultJson.getString("code").equals("200")) {
+ handleAndSave(bipCode, resultJson);
+ }
+
+ }).start();
+ }
+ return R.ok();
+ }
+
+ private JSONObject genParams(String bipCode){
+ 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);
+ return params;
+ }
+
+ private void getAccessToken(String accessToken) {
+ long timestamp = System.currentTimeMillis();
+ Map<String, Object> paramMap = new HashMap<>();
+ paramMap.put("appKey", appKey);
+ paramMap.put("timestamp", timestamp);
+ String signature = null;
+ try {
+ signature = SignHelper.sign(paramMap, appSecret);
+ } catch (NoSuchAlgorithmException e) {
+ throw new RuntimeException(e);
+ } catch (UnsupportedEncodingException e) {
+ throw new RuntimeException(e);
+ } catch (InvalidKeyException e) {
+ throw new RuntimeException(e);
+ }
+ String getTokenResult = HttpUtil.get(url + "/iuap-api-auth/open-auth/selfAppAuth/getAccessToken?appKey=" + appKey + "×tamp=" + timestamp
+ + "&signature=" + signature);
+ log.info("Get access_token Response:", getTokenResult);
+ JSONObject tokenJson = JSONObject.parseObject(getTokenResult);
+ if (!tokenJson.containsKey("code") || !tokenJson.getString("code").equals("200")) {
+ log.error("Get access_token ERROR");
+ return;
+ }
+ if (ObjUtil.isNull(tokenJson.get("data")) || ObjUtil.isNull(JSONObject.parseObject(tokenJson.getString("data")))) {
+ log.error("access_token value exception");
+ return;
+ }
+ accessToken = JSONObject.parseObject(tokenJson.getString("data")).getString("access_token");
+ log.info("access_token value:", accessToken);
+ redisTemplate.opsForValue().set("BIP_TOKEN", accessToken, tokenJson.getIntValue("expire") - 10, TimeUnit.SECONDS);
+ }
+
+ private void saveBipRequestRecord(JSONObject params, String result) {
+ BipRequestRecord record = new BipRequestRecord();
+ record.setInterfaceName("<XSJZ_SK_CX_001>-鏀舵鍗曟煡璇㈡帴鍙�");
+ record.setRequestParams(params.toJSONString());
+ record.setResponseParams(result);
+ record.setResponseCode(JSONObject.parseObject(result).getString("code"));
+ bipRequestRecordMapper.insert(record);
+ }
+
+ private void handleAndSave(String bipCode, JSONObject resultJson) {
+ R<SysDept> r = remoteDeptService.selectDeptByBipCode(bipCode);
+ if (!r.isOk()) {
+ log.error("bipcode鏌ヨ鍗曚綅澶辫触");
+ return;
+ }
+ SysDept dept = r.getData();
+ JSONObject dataJson = JSONObject.parseObject(resultJson.getString("data"));
+ if (ObjUtil.isNull(dataJson)) {
+ log.error("杩斿洖缁撴灉涓璬ata瑙ｆ瀽澶辫触");
+ return;
+ }
+ JSONArray recordList = JSONArray.parseArray(resultJson.getString("recordList"));
+ if (ArrayUtil.isEmpty(recordList.toArray())) {
+ log.error("杩斿洖缁撴灉涓璻ecordList涓虹┖");
+ return;
+ }
+ log.info("==================寮�濮嬪鐞嗘敹娆惧崟淇℃伅===================");
+ recordList.stream().forEach(record -> {
+
+ savePaymentConfirm((JSONObject) record, dept);
+ });
+ log.info("==================缁撴潫澶勭悊鏀舵鍗曚俊鎭�===================");
+ }
+
+ private void savePaymentConfirm(JSONObject record, SysDept dept) {
+
+ List<Contract> contractList = contractService.list(Wrappers.<Contract>lambdaQuery().eq(Contract::getPartyA, record.getString("bodyItemCustomerName"))
+ .eq(Contract::getPartyBId, dept.getDeptId()).orderByAsc(Contract::getCreateTime));
+ if (ArrayUtil.isEmpty(contractList.toArray())) {
+ log.error("浠樻鍗昳d锛歿},鐢叉柟锛歿},涔欐柟锛歿},鏃犵浉鍏冲悎鍚�", record.getString("id"), record.getString("bodyItemCustomerName"), dept.getName());
+ return;
}
BusinessCustomer customer = businessCustomerService.getOne(Wrappers.<BusinessCustomer>lambdaQuery()
- .eq(StrUtil.isNotBlank(addDTO.getBusGuestName()),BusinessCustomer::getCompanyName,addDTO.getBusGuestName())
- .eq(StrUtil.isNotBlank(addDTO.getBusGuestId()),BusinessCustomer::getId,addDTO.getBusGuestId()));
- if(ObjUtil.isNull(customer)){
- return R.failed("瀹㈠晢鏌ヨ澶辫触锛岃妫�鏌ュ鍟�");
+ .eq(StrUtil.isNotBlank(record.getString("bodyItemCustomerName")), BusinessCustomer::getCompanyName, record.getString("bodyItemCustomerName"))
+ );
+ if (ObjUtil.isNull(customer)) {
+ log.error("浠樻鍗昳d锛歿},瀹㈠晢鏌ヨ澶辫触锛岃妫�鏌ュ鍟�", record.getString("id"));
+ return;
}
-
- PaymentConfirm lastConfirm = baseMapper.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();
+ if (ObjUtil.isNull(record.getBigDecimal("bodyItemOriTaxExcludedAmount"))) {
+ log.error("浠樻鍗昳d锛歿},浠樻鍗曟棤绋庨噾棰濓紝寮傚父", record.getString("id"));
+ return;
}
+ //淇濆瓨浠樻鍗�
+ Boolean codeFlag = savePaymentSlip(customer,record);
+ if (codeFlag){
+ log.error("浠樻鍗昳d锛歿},浠樻鍗曞凡瀛樺湪");
+ return;
+ }
+ BigDecimal transtionAmount = record.getBigDecimal("bodyItemOriTaxExcludedAmount");
+ //鍓╀綑浠樻
+ BigDecimal transtionRemainAmount = transtionAmount;
+ //鏀跺埌浠樻鐨勫悎鍚�
+ List<Contract> payContractList = new ArrayList<>();
+ //浠樻瀹屾垚鐨勫悎鍚�
+ List<Contract> payCompleteContractList = new ArrayList<>();
+ //浠樻鏈畬鎴愮殑鍚堝悓
+ List<Contract> payNoCompleteContractList = new ArrayList<>();
+ //鏈夐浠樻鐨勫悎鍚�
+ List<Contract> advanceContractList = new ArrayList<>();
+ //浠樻鏃堕棿
+ Date payDate = DateUtil.parse(record.getString("billDate"), DatePattern.NORM_DATETIME_FORMAT);
+ for (Contract contract : contractList) {
+ PaymentConfirm lastConfirm = baseMapper.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();
+ }
- //杞叆
- if (StrUtil.equals(addDTO.getInOrOut(),"1")){
- BigDecimal newtotal = addDTO.getTransationAmount().add(lastTotal);
+ //鍚堝悓鏈�杩戞槑缁嗘�婚涓�0 鎴� > 0 鎯呭喌涓�
+ if (lastTotal.compareTo(new BigDecimal("0")) >= 0) {
+ log.info("褰撳墠鍚堝悓鍙凤細{},鏄庣粏鎬婚鏃犲簲鏀舵", contract.getContractNo());
+ advanceContractList.add(contract);
+ continue;
+ }
+
+ transtionRemainAmount = transtionRemainAmount.add(lastTotal);
PaymentConfirm entity = new PaymentConfirm();
entity.setContractId(contract.getId());
entity.setContractName(contract.getContractName());
- entity.setContractNo(addDTO.getContractNo());
- if(ObjUtil.isNotNull(lastConfirm)){
+ entity.setContractNo(contract.getContractNo());
+ if (ObjUtil.isNotNull(lastConfirm)) {
entity.setScheduleId(lastConfirm.getScheduleId());
entity.setScheduleName(lastConfirm.getScheduleName());
}
entity.setBusGuestId(customer.getId());
entity.setBusGuestName(customer.getCompanyName());
entity.setBusinessType("瀹㈡埛浠樻");
- if (newtotal.compareTo(new BigDecimal("0"))>0){
- entity.setTransationAmount(addDTO.getTransationAmount());
- entity.setAdvanceAmount(newtotal);
- entity.setTotalAmount(newtotal);
- entity.setConfirmTime(new Date());
+ entity.setIsBip(1);
+ entity.setPaymentCode(record.getString("code"));
+ entity.setPayType(record.get("bodyItemSettleModeName") != null ? record.getString("bodyItemSettleModeName").contains("鎵垮厬姹囩エ") ? 1 : 0 : null);
+ entity.setBipId(record.getString("id"));
+ if (transtionRemainAmount.compareTo(new BigDecimal("0")) > 0) {
+ entity.setTransationAmount(lastTotal.multiply(new BigDecimal("-1")));
+ entity.setTotalAmount(new BigDecimal("0"));
+ entity.setConfirmTime(payDate);
baseMapper.insert(entity);
- }else if (newtotal.compareTo(new BigDecimal("0"))==0){
- entity.setTransationAmount(addDTO.getTransationAmount());
- entity.setTotalAmount(newtotal);
- entity.setConfirmTime(new Date());
+ } else if (transtionRemainAmount.compareTo(new BigDecimal("0")) == 0) {
+ entity.setTransationAmount(lastTotal.multiply(new BigDecimal("-1")));
+ entity.setTotalAmount(new BigDecimal("0"));
+ entity.setConfirmTime(payDate);
baseMapper.insert(entity);
- }else {
- entity.setTransationAmount(addDTO.getTransationAmount());
- entity.setReceivableAmount(newtotal.multiply(new BigDecimal("-1")));
- entity.setTotalAmount(newtotal);
- entity.setConfirmTime(new Date());
+ break;
+ } else {
+ entity.setTransationAmount(transtionRemainAmount.subtract(lastTotal));
+ entity.setTotalAmount(transtionAmount);
+ entity.setConfirmTime(payDate);
baseMapper.insert(entity);
+ break;
}
+ }
+
+ payContractList.stream().forEach(contract -> {
//鏇存柊浠樻闃舵浠樻
List<ContractPaymentSchedule> scheduleList = contractPaymentScheduleMapper.selectList(Wrappers.<ContractPaymentSchedule>lambdaQuery()
- .eq(ContractPaymentSchedule::getContractId,contract.getId()).ne(ContractPaymentSchedule::getPaymentStatus,2)
+ .eq(ContractPaymentSchedule::getContractId, contract.getId()).ne(ContractPaymentSchedule::getPaymentStatus, 2)
.orderByAsc(ContractPaymentSchedule::getCreateTime));
- if (ArrayUtil.isNotEmpty(scheduleList.toArray())){
- BigDecimal remain = addDTO.getTransationAmount();
- for (ContractPaymentSchedule schedule:scheduleList) {
+ if (ArrayUtil.isNotEmpty(scheduleList.toArray())) {
+ BigDecimal remain = transtionAmount;
+ for (ContractPaymentSchedule schedule : scheduleList) {
BigDecimal lastRemain = remain;
- remain = remain.subtract(StrUtil.equals(schedule.getPaymentStatus()+"","0")?schedule.getPlannedAmount():
+ remain = remain.subtract(StrUtil.equals(schedule.getPaymentStatus() + "", "0") ? schedule.getPlannedAmount() :
schedule.getPlannedAmount().subtract(schedule.getActualAmount()));
- if (remain.compareTo(new BigDecimal("0"))>=0){
+ if (remain.compareTo(new BigDecimal("0")) >= 0) {
schedule.setActualAmount(schedule.getPlannedAmount());
- schedule.setPaymentDate(addDTO.getConfirmTime());
+ schedule.setPaymentDate(payDate);
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)){
+ 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(addDTO.getConfirmTime());
+ HistoryOverdue historyOverdue = BeanUtil.copyProperties(currentOverdue, HistoryOverdue.class, "id");
+ historyOverdue.setPaymentTime(payDate);
historyOverdue.setCompId(schedule.getCompId());
historyOverdueMapper.insert(historyOverdue);
//鍒犻櫎褰撳墠閫炬湡
currentOverdueMapper.deleteById(currentOverdue);
}
- }else {
- schedule.setActualAmount(StrUtil.equals(schedule.getPaymentStatus()+"","0")?schedule.getPlannedAmount().add(remain):
+ } else {
+ schedule.setActualAmount(StrUtil.equals(schedule.getPaymentStatus() + "", "0") ? schedule.getPlannedAmount().add(remain) :
schedule.getActualAmount().add(lastRemain));
- schedule.setPaymentDate(addDTO.getConfirmTime());
+ schedule.setPaymentDate(payDate);
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)){
+ 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 historyOverdue = BeanUtil.copyProperties(currentOverdue, HistoryOverdue.class, "id");
historyOverdue.setReceivableAmount(lastRemain);
- historyOverdue.setPaymentTime(addDTO.getConfirmTime());
+ historyOverdue.setPaymentTime(payDate);
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);
+ 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);
@@ -154,70 +661,107 @@
}
}
}
- //鏇存柊鍚堝悓宸蹭粯娆�
- 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")){
- PaymentConfirm entity = new PaymentConfirm();
- entity.setContractId(contract.getId());
- entity.setContractName(contract.getContractName());
- entity.setContractNo(addDTO.getContractNo());
-
- entity.setBusGuestId(customer.getId());
- entity.setBusGuestName(customer.getCompanyName());
- entity.setBusinessType("");
- entity.setTransationAmount(addDTO.getTransationAmount());
- BigDecimal newtotal = addDTO.getTransationAmount().multiply(new BigDecimal("-1")).add(lastConfirm.getTotalAmount());
- if (newtotal.compareTo(new BigDecimal("0"))>0){
- entity.setAdvanceAmount(newtotal);
- entity.setTotalAmount(newtotal);
- }else if (newtotal.compareTo(new BigDecimal("0"))==0){
- entity.setTotalAmount(newtotal);
- }else {
- return R.failed("褰撳墠瀹㈡埛浣欓涓�"+lastConfirm.getTotalAmount()+"涓嶈冻浠ユ弧瓒冲綋鍓嶅彂鐢熼噾棰濓紝鏃犳硶鎿嶄綔");
- }
- entity.setConfirmTime(new Date());
- baseMapper.insert(entity);
- }
- // 鏌ヨ鎵�鏈変粯娆鹃樁娈垫槸鍚﹂兘浠樻瀹屾垚
- List<ContractPaymentSchedule> scheduleList = contractPaymentScheduleMapper.selectList(Wrappers.<ContractPaymentSchedule>lambdaQuery().eq(ContractPaymentSchedule::getContractId,contract.getId()));
- if (ArrayUtil.isNotEmpty(scheduleList.toArray())){
- if (scheduleList.stream().allMatch(item -> Objects.equals(item.getPaymentStatus(), 2))){
- contract.setContractStatus(3);
+ //鍚堝悓鎵�鏈変粯娆鹃樁娈�
+ List<ContractPaymentSchedule> payComScheduleList = contractPaymentScheduleMapper.selectList(Wrappers.<ContractPaymentSchedule>lambdaQuery()
+ .eq(ContractPaymentSchedule::getContractId, contract.getId()).ne(ContractPaymentSchedule::getPaymentStatus, 0)
+ );
+ if (ArrayUtil.isNotEmpty(payComScheduleList.toArray())){
+ BigDecimal payTotal = payComScheduleList.stream().map(item->StrUtil.equals(item.getPaymentStatus() + "", "0") ? item.getPlannedAmount() :
+ item.getActualAmount()).reduce(BigDecimal.ZERO,BigDecimal::add);
+ contract.setPaidAmount(payTotal);
+ if (payComScheduleList.stream().allMatch(item -> Objects.equals(item.getPaymentStatus(), 2))) {
+ contract.setContractStatus(3);
+ }
contractService.updateById(contract);
- };
+ if (contract.getAmount().compareTo(contract.getPaidAmount()) == 0) {
+ payCompleteContractList.add(contract);
+ }
+ //浠樻 涓� 浠樻鏈叏浠�
+ if (contract.getAmount().compareTo(contract.getPaidAmount()) > 0) {
+ payNoCompleteContractList.add(contract);
+ }
+ }
+ });
+
+ //瀹㈡埛棰勪粯鏈夊墿浣� 涓� 鏈夐浠樻鐨勫悎鍚�
+ if (transtionRemainAmount.compareTo(new BigDecimal("0")) > 0) {
+ if (ArrayUtil.isNotEmpty(payNoCompleteContractList.toArray())){
+ //浣欓 鏀惧埌浠樻鏈畬鎴愬悎鍚� 棰勬敹
+ Contract lastContract = payNoCompleteContractList.get(payNoCompleteContractList.size() - 1);
+ //淇濆瓨鏄庣粏
+ saveNewPaymentConfirm(customer,record,lastContract,transtionRemainAmount,payDate);
+ }
+ if (ArrayUtil.isEmpty(payNoCompleteContractList.toArray())&&ArrayUtil.isNotEmpty(advanceContractList.toArray())){
+ //瀹㈡埛棰勪粯鏈夊墿浣� 娌℃湁棰勪粯娆剧殑鍚堝悓
+ Contract lastContract = payNoCompleteContractList.get(payNoCompleteContractList.size() - 1);
+ //淇濆瓨鏄庣粏
+ saveNewPaymentConfirm(customer,record,lastContract,transtionRemainAmount,payDate);
+ }
+ if (ArrayUtil.isEmpty(payNoCompleteContractList.toArray())&&ArrayUtil.isEmpty(advanceContractList.toArray())
+ &&ArrayUtil.isNotEmpty(payCompleteContractList.toArray())) {
+ //瀹㈡埛棰勪粯鏈夊墿浣� 娌℃湁棰勪粯娆剧殑鍚堝悓
+ Contract lastContract = payCompleteContractList.get(payCompleteContractList.size() - 1);
+ //淇濆瓨鏄庣粏
+ saveNewPaymentConfirm(customer,record,lastContract,transtionRemainAmount,payDate);
+
+ }
}
- return R.ok();
}
- @Override
- public R syncPaymentRecepit() {
+ private Boolean savePaymentSlip(BusinessCustomer customer, JSONObject record) {
+ PaymentSlip slip = new PaymentSlip();
+ slip.setBusGuestId(customer.getId());
+ slip.setBusGuestName(customer.getCompanyName());
+ slip.setPaymentTime(ObjUtil.isNotNull(record.get("billDate"))?
+ DateUtil.parse(record.getString("billDate"), DatePattern.NORM_DATETIME_FORMAT):new Date());
+ slip.setPaymentAmount(ObjUtil.isNotNull(record.get("bodyItemOriTaxExcludedAmount"))?record.getBigDecimal("bodyItemOriTaxExcludedAmount"):new BigDecimal("0"));
+ slip.setPayType(ObjUtil.isNotNull(record.get("bodyItemSettleModeName"))?record.getString("bodyItemSettleModeName"):"");
+ if (ObjUtil.isNotNull(record.get("code"))){
+ slip.setPaymentNumber(record.getString("code"));
+ PaymentSlip paymentSlip = paymentSlipMapper.selectOne(Wrappers.<PaymentSlip>lambdaQuery().eq(PaymentSlip::getPaymentNumber,slip.getPaymentNumber()));
+ if (ObjUtil.isNull(paymentSlip)) {
+ paymentSlipMapper.insert(slip);
+ return false;
+ }
+ }
+ return true;
+ }
- 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());
+ public void saveNewPaymentConfirm(BusinessCustomer customer,JSONObject record,Contract contract,BigDecimal transtionRemainAmount
+ ,Date payDate){
+ PaymentConfirm entity = new PaymentConfirm();
+ entity.setContractId(contract.getId());
+ entity.setContractName(contract.getContractName());
+ entity.setContractNo(contract.getContractNo());
+ PaymentConfirm lastConfirm = baseMapper.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();
+ }
- return null;
+ if (ObjUtil.isNotNull(lastConfirm)) {
+ entity.setScheduleId(lastConfirm.getScheduleId());
+ entity.setScheduleName(lastConfirm.getScheduleName());
+ }
+
+ entity.setBusGuestId(customer.getId());
+ entity.setBusGuestName(customer.getCompanyName());
+ entity.setBusinessType("瀹㈡埛浠樻");
+ if (ObjUtil.isNotNull(record)){
+ entity.setIsBip(1);
+ entity.setPaymentCode(record.getString("code"));
+ entity.setPayType(record.get("bodyItemSettleModeName") != null ? record.getString("bodyItemSettleModeName").contains("鎵垮厬姹囩エ") ? 1 : 0 : null);
+ entity.setBipId(record.getString("id"));
+ }
+ entity.setConfirmTime(payDate);
+ entity.setTransationAmount(transtionRemainAmount);
+ entity.setTotalAmount(transtionRemainAmount.add(lastTotal));
+ if (entity.getTotalAmount().compareTo(new BigDecimal("0"))>0){
+ entity.setAdvanceAmount(entity.getTotalAmount());
+ }else if (entity.getTotalAmount().compareTo(new BigDecimal("0"))<0){
+ entity.setReceivableAmount(entity.getTotalAmount().multiply(new BigDecimal("-1")));
+ }
+ baseMapper.insert(entity);
}
}
\ No newline at end of file
diff --git a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/utils/SignHelper.java b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/utils/SignHelper.java
new file mode 100644
index 0000000..0df5a58
--- /dev/null
+++ b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/utils/SignHelper.java
@@ -0,0 +1,46 @@
+package com.by4cloud.platformx.business.utils;
+
+import javax.crypto.Mac;
+import javax.crypto.spec.SecretKeySpec;
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
+import java.security.InvalidKeyException;
+import java.security.NoSuchAlgorithmException;
+import java.util.Base64;
+import java.util.Map;
+import java.util.TreeMap;
+
+/**
+ * 璇锋眰寮�鏀惧钩鍙板浠舵巿鏉冪浉鍏虫帴鍙ｇ殑鍔犵绫�
+ * SignHelper
+ *
+ * syt
+ * 2026骞�5鏈�20鏃� 10:31:44
+ */
+public class SignHelper {
+
+
+ /**
+ * 鎸夊弬鏁板悕鎺掑簭鍚庝緷娆℃嫾鎺ュ弬鏁板悕绉颁笌鏁板�硷紝 涔嬪悗瀵硅瀛楃涓蹭娇鐢� HmacSHA256 鍔犵锛� 鍔犵缁撴灉杩涜 base 64 杩斿洖
+ *
+ */
+ public static String sign(Map<String, Object> params, String suiteSecret) throws
+ NoSuchAlgorithmException, UnsupportedEncodingException, InvalidKeyException {
+ Map<String, Object> treeMap;
+ if (params instanceof TreeMap) {
+ treeMap = params;
+ } else {
+ treeMap = new TreeMap<>(params);
+ }
+ StringBuilder stringBuilder = new StringBuilder();
+ for (Map.Entry<String, Object> entry : treeMap.entrySet()) {
+ stringBuilder.append(entry.getKey()).append(entry.getValue());
+ }
+ Mac mac = Mac.getInstance("HmacSHA256");
+ mac.init(new SecretKeySpec(suiteSecret.getBytes(StandardCharsets.UTF_8), "HmacSHA256"));
+ byte[] signData = mac.doFinal(stringBuilder.toString().getBytes(StandardCharsets.UTF_8));
+ String base64String = Base64.getEncoder().encodeToString(signData);
+ return URLEncoder.encode(base64String, "UTF-8");
+ }
+}
diff --git a/platformx-business-finance-biz/src/main/resources/mapper/BipRequestRecordMapper.xml b/platformx-business-finance-biz/src/main/resources/mapper/BipRequestRecordMapper.xml
new file mode 100644
index 0000000..131d825
--- /dev/null
+++ b/platformx-business-finance-biz/src/main/resources/mapper/BipRequestRecordMapper.xml
@@ -0,0 +1,19 @@
+<?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.BipRequestRecordMapper">
+
+ <resultMap id="bipRequestRecordMap" type="com.by4cloud.platformx.business.entity.BipRequestRecord">
+ <id property="id" column="id"/>
+ <result property="compId" column="comp_id"/>
+ <result property="interfaceName" column="interface_name"/>
+ <result property="requestParams" column="request_params"/>
+ <result property="responseCode" column="response_code"/>
+ <result property="responseParams" column="response_params"/>
+ <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
diff --git a/platformx-business-finance-biz/src/main/resources/mapper/ContractOutBoundMapper.xml b/platformx-business-finance-biz/src/main/resources/mapper/ContractOutBoundMapper.xml
index ddb7f2b..f50d5db 100644
--- a/platformx-business-finance-biz/src/main/resources/mapper/ContractOutBoundMapper.xml
+++ b/platformx-business-finance-biz/src/main/resources/mapper/ContractOutBoundMapper.xml
@@ -16,6 +16,7 @@
<result property="outBoundTime" column="out_bound_time"/>
<result property="subjectMatterCode" column="subject_matter_code"/>
<result property="subjectMatterName" column="subject_matter_name"/>
+ <result property="outBoundId" column="out_bound_id"/>
<result property="createBy" column="create_by"/>
<result property="createTime" column="create_time"/>
<result property="updateBy" column="update_by"/>
diff --git a/platformx-business-finance-biz/src/main/resources/mapper/PaymentSlipMapper.xml b/platformx-business-finance-biz/src/main/resources/mapper/PaymentSlipMapper.xml
new file mode 100644
index 0000000..0568405
--- /dev/null
+++ b/platformx-business-finance-biz/src/main/resources/mapper/PaymentSlipMapper.xml
@@ -0,0 +1,24 @@
+<?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.PaymentSlipMapper">
+
+ <resultMap id="paymentSlipMap" type="com.by4cloud.platformx.business.entity.PaymentSlip">
+ <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="businessType" column="business_type"/>
+ <result property="gatheringAccount" column="gathering_account"/>
+ <result property="payType" column="pay_type"/>
+ <result property="paymentAccount" column="payment_account"/>
+ <result property="paymentAmount" column="payment_amount"/>
+ <result property="paymentNumber" column="payment_number"/>
+ <result property="paymentTime" column="payment_time"/>
+ <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
diff --git a/platformx-business-finance-biz/src/main/resources/template/ymjjgclht.doc b/platformx-business-finance-biz/src/main/resources/template/ymjjgclht.doc
new file mode 100644
index 0000000..a5b550f
--- /dev/null
+++ b/platformx-business-finance-biz/src/main/resources/template/ymjjgclht.doc
Binary files differ
--
Gitblit v1.9.1