From c427840445fefb679a287dbeaba81bd417388aeb Mon Sep 17 00:00:00 2001
From: shiyunteng <shiyunteng@example.com>
Date: 星期五, 04 九月 2026 17:10:44 +0800
Subject: [PATCH] feat:开票和bip推送分离 新增bip报账单 新增合同标的物变更
---
platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/BankStatementServiceImpl.java | 133 +++
platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/mapper/BipViewMapper.java | 6
platformx-business-finance-biz/src/main/resources/mapper/ProductMapper.xml | 4
platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/ContractPaymentScheduleProcessService.java | 5
platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/ContractPaymentScheduleProcessServiceImpl.java | 9
platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/dto/ContractInvoiceUpateDTO.java | 12
platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/ContractController.java | 25
platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/ContractInvoiceController.java | 48 +
platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/dto/ToInvoiceDTO.java | 79 ++
platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/dto/GenInvoiceInfoDTO.java | 9
platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/BankStatementItem.java | 3
platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/ContractServiceImpl.java | 103 ++
platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/PaymentConfirmServiceImpl.java | 570 +++++-----------
platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/vo/InvoiceItemVo.java | 16
platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/mapper/ContractSubjectMatterChangeMapper.java | 17
platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/OutBoundServiceImpl.java | 45
platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/vo/ContractDetailVo.java | 2
platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/TaxCodeServiceImpl.java | 1
platformx-business-finance-biz/src/main/resources/mapper/BipDictMapper.xml | 19
platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/ContractInvoiceServiceImpl.java | 548 +++++++++++----
platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/BankStatementController.java | 11
platformx-business-finance-biz/src/main/resources/mapper/ContractInvoiceMapper.xml | 4
platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/vo/ContractPageVo.java | 4
platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/BankStatement.java | 4
platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/MeterReadRecordServiceImpl.java | 6
platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/dto/ContractSubjectChangeDTO.java | 22
platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/dto/TaxCodeQueryDTO.java | 2
platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/vo/ContractInvoiceBipVo.java | 39 +
platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/vo/CustInfoVo.java | 4
platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/ContractService.java | 4
platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/BipDict.java | 36 +
platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/vo/StatementContractVo.java | 2
platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/BankStatementService.java | 2
platformx-business-finance-biz/src/main/resources/mapper/ContractSubjectMatterChangeMapper.xml | 76 ++
platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/vo/HomeInvoiceVo.java | 6
platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/mapper/BipDictMapper.java | 11
platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/ContractSubjectMatterChange.java | 47 +
platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/vo/GenInvoiceInfoVo.java | 15
platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/dto/ContractInvoiceQueryDTO.java | 2
platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/vo/OrgInfoVo.java | 13
platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/ErpRequestRecord.java | 6
platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/ContractInvoiceService.java | 15
42 files changed, 1,364 insertions(+), 621 deletions(-)
diff --git a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/dto/ContractInvoiceQueryDTO.java b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/dto/ContractInvoiceQueryDTO.java
index 698c8ff..af41368 100644
--- a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/dto/ContractInvoiceQueryDTO.java
+++ b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/dto/ContractInvoiceQueryDTO.java
@@ -13,4 +13,6 @@
* 1/钃� 2/绾�
*/
private String invoiceCategory;
+
+ private String bwRequestResult;
}
diff --git a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/dto/ContractInvoiceUpateDTO.java b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/dto/ContractInvoiceUpateDTO.java
new file mode 100644
index 0000000..99570b5
--- /dev/null
+++ b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/dto/ContractInvoiceUpateDTO.java
@@ -0,0 +1,12 @@
+package com.by4cloud.platformx.business.dto;
+
+import lombok.Data;
+
+@Data
+public class ContractInvoiceUpateDTO {
+
+ private String invoicePreview;
+
+ private Long id;
+
+}
diff --git a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/dto/ContractSubjectChangeDTO.java b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/dto/ContractSubjectChangeDTO.java
new file mode 100644
index 0000000..40674e5
--- /dev/null
+++ b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/dto/ContractSubjectChangeDTO.java
@@ -0,0 +1,22 @@
+package com.by4cloud.platformx.business.dto;
+
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.persistence.Column;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+@Data
+public class ContractSubjectChangeDTO {
+
+ private String id;
+
+ private List<ContractSubjectMatterAddDTO> contractSubjectMatter;
+
+}
diff --git a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/dto/GenInvoiceInfoDTO.java b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/dto/GenInvoiceInfoDTO.java
index fdf79ab..4e96c53 100644
--- a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/dto/GenInvoiceInfoDTO.java
+++ b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/dto/GenInvoiceInfoDTO.java
@@ -1,5 +1,6 @@
package com.by4cloud.platformx.business.dto;
+import com.by4cloud.platformx.business.vo.ContractInvoiceBipVo;
import com.by4cloud.platformx.business.vo.ContractOutBoundInvoiceVo;
import lombok.Data;
@@ -18,7 +19,15 @@
private String vehicleNo;
+ private String origin;
+
+ private String tonnage;
+
+ private String passengersLimited;
+
private String certificateNo;
private String vehicleData;
+
+ private String remarks;
}
diff --git a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/dto/TaxCodeQueryDTO.java b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/dto/TaxCodeQueryDTO.java
index 550c714..71a56de 100644
--- a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/dto/TaxCodeQueryDTO.java
+++ b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/dto/TaxCodeQueryDTO.java
@@ -7,6 +7,8 @@
private String mc;
+ private String jc;
+
private String bm;
private Integer childNum;
diff --git a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/dto/ToInvoiceDTO.java b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/dto/ToInvoiceDTO.java
new file mode 100644
index 0000000..13414dd
--- /dev/null
+++ b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/dto/ToInvoiceDTO.java
@@ -0,0 +1,79 @@
+package com.by4cloud.platformx.business.dto;
+
+import com.by4cloud.platformx.business.vo.ContractInvoiceBipVo;
+import com.by4cloud.platformx.business.vo.ContractOutBoundInvoiceVo;
+import com.by4cloud.platformx.business.vo.InvoiceItemVo;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+@Data
+public class ToInvoiceDTO {
+
+ @Schema(description = "鍚堝悓id")
+ private Long contractId;
+
+ @Schema(description = "鍚堝悓绫诲瀷")
+ private String contractCategory;
+
+ @Schema(description = "棰勫紑鍙戠エ")
+ private String advanceInvoice;
+
+ @Schema(description = "杞︽灦鍙�")
+ private String vehicleNo;
+
+ @Schema(description = "杞﹁締鍚堟牸璇佸彿")
+ private String certificateNo;
+
+ @Schema(description = "浜ょ◣鍒嗙被")
+ private String invoiceType;
+
+ @Schema(description = "鏈哄姩杞︿氦绋庡垎绫�")
+ private String invoiceVehicleType;
+
+ @Schema(description = "鐢叉柟鍚嶇О")
+ private String partyA;
+
+ @Schema(description = "鐢叉柟绋庡彿")
+ private String partyAOrgCode;
+
+ @Schema(description = "涔欐柟鍚嶇О")
+ private String partyB;
+
+ @Schema(description = "涔欐柟绋庡彿")
+ private String partyBOrgCode;
+
+ @Schema(description = "鐢叉柟寮�鎴疯")
+ private String partyAOpenBank;
+
+ @Schema(description = "鐢叉柟閾惰璐﹀彿")
+ private String partyABankAccount;
+
+ @Schema(description = "涔欐柟寮�鎴疯")
+ private String partyBOpenBank;
+
+ @Schema(description = "涔欐柟閾惰璐﹀彿")
+ private String partyBBankAccount;
+
+ @Schema(description = "寮�绁ㄩ噾棰濓紙鍚◣锛�")
+ private BigDecimal totalPrice;
+
+ @Schema(description = "绋庨")
+ private BigDecimal totalTax;
+
+ @Schema(description = "澶у啓寮�绁ㄩ噾棰�")
+ private String priceWords;
+
+ private String vehicleData;
+
+ private String remarks;
+
+ private ContractInvoiceBipVo bipVo;
+
+ private List<ContractOutBoundInvoiceVo> outBoundInvoiceList;
+
+ private List<InvoiceItemVo> invoiceItemList;
+
+}
diff --git a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/BankStatement.java b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/BankStatement.java
index cc20152..7dd8e58 100644
--- a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/BankStatement.java
+++ b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/BankStatement.java
@@ -80,4 +80,8 @@
@Column(columnDefinition="VARCHAR(255) comment '浜ゆ槗璇存槑'")
private String remark;
+ @Schema(description = "鍊熻捶鏍囪瘑")
+ @Column(columnDefinition="char comment '鍊熻捶鏍囪瘑锛�1鍊燂紱2璐�'")
+ private String dcFlag;
+
}
diff --git a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/BankStatementItem.java b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/BankStatementItem.java
index 291abed..56c00a3 100644
--- a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/BankStatementItem.java
+++ b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/BankStatementItem.java
@@ -38,4 +38,7 @@
@Column(columnDefinition = "decimal(10,2) comment '鍚堝悓纭閲戦'")
private BigDecimal confirmAmount;
+ @Schema(description = "鎺ㄩ�佹爣璇�")
+ @Column(columnDefinition="char default '0' comment '鎺ㄩ�佹爣璇� 0/鏈帹 1/宸叉帹'")
+ private String pushFlag;
}
diff --git a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/BipDict.java b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/BipDict.java
new file mode 100644
index 0000000..4306f50
--- /dev/null
+++ b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/BipDict.java
@@ -0,0 +1,36 @@
+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;
+
+/**
+ * 2026骞�8鏈�7鏃� 16:04:22
+ * syt
+ */
+@Data
+@Entity//鍔犱簡鎵嶈兘鑷姩鐢熸垚琛�
+@Table(appliesTo="bip_dict",comment = "bip瀛楀吀")//缁欒〃鍔犳敞閲�
+@jakarta.persistence.Table(name = "bip_dict")//鏁版嵁搴撳垱寤虹殑琛ㄦ槑
+public class BipDict extends BaseModel<BipDict> {
+
+ @Schema(description = "瀛楀吀KEY")
+ @Column(columnDefinition="VARCHAR(128) comment '瀛楀吀KEY'")
+ private String dictKey;
+
+ @Schema(description = "缂栫爜")
+ @Column(columnDefinition="VARCHAR(128) comment '缂栫爜'")
+ private String dictCode;
+
+ @Schema(description = "鍚嶇О")
+ @Column(columnDefinition="VARCHAR(128) comment '鍚嶇О'")
+ private String dictName;
+
+ @Schema(description = "涓婄骇ID")
+ @Column(columnDefinition="bigint comment '涓婄骇ID'")
+ private Long parentId;
+
+}
diff --git a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/ContractSubjectMatterChange.java b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/ContractSubjectMatterChange.java
new file mode 100644
index 0000000..414310a
--- /dev/null
+++ b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/ContractSubjectMatterChange.java
@@ -0,0 +1,47 @@
+package com.by4cloud.platformx.business.entity;
+
+import com.by4cloud.platformx.common.data.mybatis.BaseModel;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 2026骞�9鏈�4鏃� 15:21:14
+ * syt
+ */
+@Data
+@Entity//鍔犱簡鎵嶈兘鑷姩鐢熸垚琛�
+@org.hibernate.annotations.Table(appliesTo="contract_subject_matter_change",comment = "鍚堝悓鏍囩殑鐗╁彉鏇�")//缁欒〃鍔犳敞閲�
+@jakarta.persistence.Table(name = "contract_subject_matter_change")//鏁版嵁搴撳垱寤虹殑琛ㄦ槑
+public class ContractSubjectMatterChange extends BaseModel<ContractSubjectMatterChange> {
+
+ @Schema(description = "鍏宠仈鍚堝悓ID")
+ @Column(columnDefinition = "bigint comment '鍏宠仈鍚堝悓ID'")
+ private Long contractId;
+
+ @Schema(description = "鍙樻洿鍓�")
+ @Column(columnDefinition = "text comment '鍙樻洿鍓�'")
+ private String beforeChange;
+
+ @Schema(description = "鍙樻洿鍚�")
+ @Column(columnDefinition = "text comment '鍙樻洿鍚�'")
+ private String afterChange;
+
+ @Schema(description = "鍙樻洿鍗曞湴鍧�")
+ @Column(columnDefinition = "varchar(255) comment '鍙樻洿鍗曞湴鍧�'")
+ private String attachmentUrl;
+
+ @Schema(description = "鍙樻洿鍗曞悕绉�")
+ @Column(columnDefinition = "varchar(255) comment '鍙樻洿鍗曞悕绉�'")
+ private String attachmentName;
+
+}
\ No newline at end of file
diff --git a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/ErpRequestRecord.java b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/ErpRequestRecord.java
index 52cc117..573d4e1 100644
--- a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/ErpRequestRecord.java
+++ b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/ErpRequestRecord.java
@@ -18,9 +18,13 @@
public class ErpRequestRecord extends BaseModel<ErpRequestRecord> {
@Schema(description = "erp鍏徃")
- @Column(columnDefinition="VARCHAR(128) comment '鎺ュ彛鍚嶇О'")
+ @Column(columnDefinition="VARCHAR(128) comment 'erp鍏徃'")
private String erpName;
+ @Schema(description = "鎺ュ彛鍚嶇О")
+ @Column(columnDefinition="VARCHAR(128) comment '鎺ュ彛鍚嶇О'")
+ private String mothedName;
+
@Schema(description = "鍏ュ弬")
@Column(columnDefinition="text comment '鍏ュ弬'")
private String requestParams;
diff --git a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/vo/ContractDetailVo.java b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/vo/ContractDetailVo.java
index e81e109..45dbc4b 100644
--- a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/vo/ContractDetailVo.java
+++ b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/vo/ContractDetailVo.java
@@ -251,6 +251,8 @@
private BigDecimal paidAmount;
+ private ContractInvoiceBipVo bipVo;
+
private List<ContractPaymentSchedule> contractPaymentSchedule;
private List<ContractSubjectMatter> contractSubjectMatter;
diff --git a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/vo/ContractInvoiceBipVo.java b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/vo/ContractInvoiceBipVo.java
new file mode 100644
index 0000000..56bbfc9
--- /dev/null
+++ b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/vo/ContractInvoiceBipVo.java
@@ -0,0 +1,39 @@
+package com.by4cloud.platformx.business.vo;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class ContractInvoiceBipVo {
+
+ private String djrq;
+
+ private String kpzz;
+
+ private String ywzz;
+
+ private String bm;
+
+ private String ywy;
+
+ private String djfx;
+ private String jylx;
+ private String wldxlx;
+
+ private String kh;
+ private String bz;
+
+ private String fjzs;
+ private String pzzdr;
+
+ private String sfzy;
+ private String hsdy;
+ private String sfnbwl;
+ private String sfjyjs;
+
+ private String zy;
+
+
+ private List<InvoiceItemVo> itemList;
+}
diff --git a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/vo/ContractPageVo.java b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/vo/ContractPageVo.java
index 84feb93..e5e8ba9 100644
--- a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/vo/ContractPageVo.java
+++ b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/vo/ContractPageVo.java
@@ -187,4 +187,8 @@
private Long warrantyScheduleId;
private String centerPushFlag;
+
+ private String beforeChange;
+
+ private String afterChange;
}
diff --git a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/vo/CustInfoVo.java b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/vo/CustInfoVo.java
index 22e53f2..8dce255 100644
--- a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/vo/CustInfoVo.java
+++ b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/vo/CustInfoVo.java
@@ -14,6 +14,10 @@
private String legalPerson;
private String registrationAddress;
+
+ private String country;
+
+ private String custclass;
}
diff --git a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/vo/GenInvoiceInfoVo.java b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/vo/GenInvoiceInfoVo.java
index c14a4d0..a7e25d2 100644
--- a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/vo/GenInvoiceInfoVo.java
+++ b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/vo/GenInvoiceInfoVo.java
@@ -9,11 +9,20 @@
@Data
public class GenInvoiceInfoVo {
+ @Schema(description = "鍚堝悓id")
+ private Long contractId;
+
@Schema(description = "鍚堝悓绫诲瀷")
private String contractCategory;
@Schema(description = "棰勫紑鍙戠エ")
private String advanceInvoice;
+
+ private String origin;
+
+ private String tonnage;
+
+ private String passengersLimited;
@Schema(description = "杞︽灦鍙�")
private String vehicleNo;
@@ -62,5 +71,11 @@
private String vehicleData;
+ private String remarks;
+
+ private List<ContractOutBoundInvoiceVo> outBoundInvoiceList;
+
+ private ContractInvoiceBipVo bipVo;
+
private List<InvoiceItemVo> invoiceItemList;
}
diff --git a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/vo/HomeInvoiceVo.java b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/vo/HomeInvoiceVo.java
index 14ad91f..f96e750 100644
--- a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/vo/HomeInvoiceVo.java
+++ b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/vo/HomeInvoiceVo.java
@@ -24,4 +24,10 @@
private Date invoiceTime;
private BigDecimal invoiceTotalPriceTax;
+
+ private String invoicePath;
+
+ private String bwRequestResult;
+
+ private String invoicePreview;
}
diff --git a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/vo/InvoiceItemVo.java b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/vo/InvoiceItemVo.java
index 3262c93..88e999e 100644
--- a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/vo/InvoiceItemVo.java
+++ b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/vo/InvoiceItemVo.java
@@ -38,4 +38,20 @@
@Schema(description = "绋庢敹鍒嗙被缂栫爜")
private String taxCode;
+
+ private String jjsx;
+
+ private String sfjs;
+
+ private String hsjylx;
+
+ private String kxmx;
+
+ private String cpwlfl;
+
+ private String hsdy;
+
+ private String zyys;
+
+ private String bkfl;
}
diff --git a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/vo/OrgInfoVo.java b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/vo/OrgInfoVo.java
new file mode 100644
index 0000000..729f194
--- /dev/null
+++ b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/vo/OrgInfoVo.java
@@ -0,0 +1,13 @@
+package com.by4cloud.platformx.business.vo;
+
+import lombok.Data;
+
+@Data
+public class OrgInfoVo {
+
+ private String orgCode;
+
+ private String orgName;
+
+ private String orgLevel;
+}
diff --git a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/vo/StatementContractVo.java b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/vo/StatementContractVo.java
index 4dd42ca..854a9f1 100644
--- a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/vo/StatementContractVo.java
+++ b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/vo/StatementContractVo.java
@@ -27,4 +27,6 @@
private String partyA;
private BigDecimal amount;
+
+ private String pushFlag;
}
diff --git a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/BankStatementController.java b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/BankStatementController.java
index afb7a11..7ea0713 100644
--- a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/BankStatementController.java
+++ b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/BankStatementController.java
@@ -176,4 +176,15 @@
return bankStatementService.backAll(id);
}
+
+ /**
+ * 閫氳繃id鎺ㄩ�乥ip
+ * @param itemId id
+ * @return R
+ */
+ @Operation(summary = "閫氳繃id鍒犻櫎閾惰娴佹按鍘嗗彶纭" , description = "閫氳繃id鍒犻櫎閾惰娴佹按鍘嗗彶纭" )
+ @GetMapping("/pushBip/{itemId}" )
+ public R pushBip(@PathVariable("itemId" ) Long itemId) {
+ return bankStatementService.pushBip(itemId);
+ }
}
\ No newline at end of file
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 50fcaa5..d14b96d 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
@@ -370,4 +370,29 @@
}
return contractService.importContractMultiSheet(file);
}
+
+ /**
+ * 鍚堝悓鏍囩殑鐗╁彉鏇�
+ * @param changeDTO 鍚堝悓绠＄悊
+ * @return R
+ */
+ @Operation(summary = "鍚堝悓鏍囩殑鐗╁彉鏇�" , description = "鍚堝悓鏍囩殑鐗╁彉鏇�" )
+ @SysLog("鍚堝悓鏍囩殑鐗╁彉鏇�" )
+ @PostMapping("/subjectChange")
+ @PreAuthorize("@pms.hasPermission('business_contract_subchange')" )
+ public R subjectChange(@RequestBody ContractSubjectChangeDTO changeDTO) {
+ return contractService.subjectChange(changeDTO);
+ }
+
+ /**
+ * 鍚堝悓鏍囩殑鐗╁彉鏇村垎椤�
+ * @param changeDTO 鍚堝悓绠＄悊
+ * @return R
+ */
+ @Operation(summary = "鍚堝悓鏍囩殑鐗╁彉鏇村垎椤�" , description = "鍚堝悓鏍囩殑鐗╁彉鏇村垎椤�" )
+ @SysLog("鍚堝悓鏍囩殑鐗╁彉鏇村垎椤�" )
+ @GetMapping("/subjectChangePage")
+ public R subjectChangePage(@ParameterObject Page page, @ParameterObject ContracQueryDTO queryDTO) {
+ return R.ok(contractService.subjectChangePage(page,queryDTO));
+ }
}
\ No newline at end of file
diff --git a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/ContractInvoiceController.java b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/ContractInvoiceController.java
index 0795cbf..60b0a37 100644
--- a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/ContractInvoiceController.java
+++ b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/ContractInvoiceController.java
@@ -4,10 +4,7 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.by4cloud.platformx.business.dto.ContractInvoiceQueryDTO;
-import com.by4cloud.platformx.business.dto.ContractQueryDTO;
-import com.by4cloud.platformx.business.dto.GenInvoiceInfoDTO;
-import com.by4cloud.platformx.business.dto.InvoiceQueryDTO;
+import com.by4cloud.platformx.business.dto.*;
import com.by4cloud.platformx.business.entity.Contract;
import com.by4cloud.platformx.business.entity.ContractInvoice;
import com.by4cloud.platformx.business.entity.ContractOutBound;
@@ -123,8 +120,8 @@
* @return
*/
@PostMapping("/toInvoice" )
- public R toInvoice(@RequestBody GenInvoiceInfoDTO genInvoiceInfoDTO) {
- return contractInvoiceService.toInvoice(genInvoiceInfoDTO);
+ public R toInvoice(@RequestBody ToInvoiceDTO toInvoiceDTO) {
+ return contractInvoiceService.toInvoice(toInvoiceDTO);
}
/**
@@ -174,6 +171,24 @@
}
/**
+ * 鎵嬪姩鎺ㄩ�乥ip
+ * @return
+ */
+ @GetMapping("/bipPushPdf/{invoiceId}")
+ public R bipPushPdf(@PathVariable("invoiceId")Long invoiceId) {
+ return contractInvoiceService.bipPushPdf(invoiceId);
+ }
+
+ /**
+ * 淇濆瓨骞舵帹閫�
+ * @return
+ */
+ @PostMapping("/saveAndPush")
+ public R saveAndPush(@RequestBody ContractInvoiceUpateDTO upateDTO) {
+ return contractInvoiceService.saveAndPush(upateDTO);
+ }
+
+ /**
* 绾㈢エ鏌ヨ
* @return
*/
@@ -192,4 +207,25 @@
public R queryInvoice(@ParameterObject Page page, @ParameterObject InvoiceQueryDTO queryDTO) {
return contractInvoiceService.queryInvoice(page, queryDTO);
}
+
+ /**
+ * 閫氳繃id鏌ヨ
+ * @return R
+ */
+ @Operation(summary = "閫氳繃id鏌ヨ" , description = "閫氳繃id鏌ヨ" )
+ @GetMapping("/{id}" )
+ public R getById(@PathVariable("id" ) Long id) {
+ return R.ok(contractInvoiceService.getById(id));
+ }
+
+
+ /**
+ * 閫氳繃key鏌ヨbip瀛楀吀
+ * @return R
+ */
+ @Operation(summary = "閫氳繃key鏌ヨbip瀛楀吀" , description = "閫氳繃key鏌ヨbip瀛楀吀" )
+ @GetMapping("/selectBipByKey/{dictKey}" )
+ public R selectBipByKey(@PathVariable("dictKey" ) String dictKey) {
+ return contractInvoiceService.selectBipByKey(dictKey);
+ }
}
diff --git a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/mapper/BipDictMapper.java b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/mapper/BipDictMapper.java
new file mode 100644
index 0000000..6191919
--- /dev/null
+++ b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/mapper/BipDictMapper.java
@@ -0,0 +1,11 @@
+package com.by4cloud.platformx.business.mapper;
+
+import com.by4cloud.platformx.common.data.datascope.PlatformxBaseMapper;
+import com.by4cloud.platformx.business.entity.BipDict;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface BipDictMapper extends PlatformxBaseMapper<BipDict> {
+
+
+}
\ No newline at end of file
diff --git a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/mapper/BipViewMapper.java b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/mapper/BipViewMapper.java
index fee92c6..4ab17c4 100644
--- a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/mapper/BipViewMapper.java
+++ b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/mapper/BipViewMapper.java
@@ -3,6 +3,7 @@
import com.baomidou.dynamic.datasource.annotation.DS;
import com.by4cloud.platformx.business.vo.CustBankVo;
import com.by4cloud.platformx.business.vo.CustInfoVo;
+import com.by4cloud.platformx.business.vo.OrgInfoVo;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Select;
@@ -12,9 +13,12 @@
@DS("druid_bip_view")
public interface BipViewMapper {
- @Select("select certificate_id, cust_name,legal_person,registration_address,cust_code from mdm_send.mdm_cust_base_info_tra_send WHERE is_deleted = '0' and cust_name = #{companyName}")
+ @Select("select certificate_id, cust_name,legal_person,registration_address,cust_code,country,custclass from mdm_send.mdm_cust_base_info_tra_send WHERE is_deleted = '0' and cust_name = #{companyName}")
CustInfoVo selectBaseInfoByCustName(String companyName);
@Select("SELECT mcbats.bank_account,mcbats.bank_name FROM mdm_send.mdm_cust_bank_account_tra_send AS mcbats WHERE is_deleted = '0' and holder_name = #{companyName}")
List<CustBankVo> selectBankByCustName(String companyName);
+
+ @Select("select org_code,org_name,org_level from mdm_send.mdp_organize_tra_send WHERE is_deleted = '0' and org_name = #{companyName} ")
+ List<OrgInfoVo> selectOrgByName(String partyA);
}
diff --git a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/mapper/ContractSubjectMatterChangeMapper.java b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/mapper/ContractSubjectMatterChangeMapper.java
new file mode 100644
index 0000000..aaedebb
--- /dev/null
+++ b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/mapper/ContractSubjectMatterChangeMapper.java
@@ -0,0 +1,17 @@
+package com.by4cloud.platformx.business.mapper;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.by4cloud.platformx.business.dto.ContracQueryDTO;
+import com.by4cloud.platformx.business.entity.ContractSubjectMatterChange;
+import com.by4cloud.platformx.business.vo.ContractPageVo;
+import com.by4cloud.platformx.common.data.datascope.DataScope;
+import com.by4cloud.platformx.common.data.datascope.PlatformxBaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+@Mapper
+public interface ContractSubjectMatterChangeMapper extends PlatformxBaseMapper<ContractSubjectMatterChange> {
+
+
+ Page<ContractPageVo> subjectChangePage(Page page, @Param("queryDTO") ContracQueryDTO queryDTO, DataScope comp_id);
+}
\ No newline at end of file
diff --git a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/BankStatementService.java b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/BankStatementService.java
index 32bf17c..1c60d9a 100644
--- a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/BankStatementService.java
+++ b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/BankStatementService.java
@@ -18,4 +18,6 @@
R backAll(Long id);
R backHis(Long id);
+
+ R pushBip(Long itemId);
}
\ No newline at end of file
diff --git a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/ContractInvoiceService.java b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/ContractInvoiceService.java
index 79040f5..ad6d35b 100644
--- a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/ContractInvoiceService.java
+++ b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/ContractInvoiceService.java
@@ -1,10 +1,7 @@
package com.by4cloud.platformx.business.service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.by4cloud.platformx.business.dto.ContractInvoiceQueryDTO;
-import com.by4cloud.platformx.business.dto.ContractQueryDTO;
-import com.by4cloud.platformx.business.dto.GenInvoiceInfoDTO;
-import com.by4cloud.platformx.business.dto.InvoiceQueryDTO;
+import com.by4cloud.platformx.business.dto.*;
import com.by4cloud.platformx.business.entity.ContractInvoice;
import com.by4cloud.platformx.common.core.util.R;
@@ -15,7 +12,7 @@
R genInvoiceInfo(GenInvoiceInfoDTO genInvoiceInfoDTO);
- R toInvoice(GenInvoiceInfoDTO genInvoiceInfoDTO);
+ R toInvoice(ToInvoiceDTO toInvoiceDTO);
R getContractInvoiceList(Long contractId);
@@ -42,4 +39,12 @@
R queryInvoice(Page page, InvoiceQueryDTO queryDTO);
R add(ContractInvoice contractInvoice);
+
+ ContractInvoice getById(Long id);
+
+ R bipPushPdf(Long invoiceId);
+
+ R selectBipByKey(String dictKey);
+
+ R saveAndPush(ContractInvoiceUpateDTO upateDTO);
}
diff --git a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/ContractPaymentScheduleProcessService.java b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/ContractPaymentScheduleProcessService.java
index 4595291..1b1e846 100644
--- a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/ContractPaymentScheduleProcessService.java
+++ b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/ContractPaymentScheduleProcessService.java
@@ -3,9 +3,12 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.by4cloud.platformx.business.dto.ContractPaymentScheduleProcessAddDTO;
import com.by4cloud.platformx.business.entity.Contract;
+import com.by4cloud.platformx.business.entity.ContractPaymentSchedule;
import com.by4cloud.platformx.business.entity.ContractPaymentScheduleProcess;
import com.by4cloud.platformx.business.entity.PaymentConfirm;
import com.by4cloud.platformx.common.core.util.R;
+
+import java.util.Date;
public interface ContractPaymentScheduleProcessService extends IService<ContractPaymentScheduleProcess> {
@@ -14,4 +17,6 @@
R selectScheduleProcess(Long id);
void handleBeforeRemain(PaymentConfirm currentConfim, Contract contract);
+
+ void saveScheduleProcess(Date date, ContractPaymentSchedule schedule);
}
\ No newline at end of file
diff --git a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/ContractService.java b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/ContractService.java
index 42c1bee..5bfe620 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
@@ -71,4 +71,8 @@
R pushCenter(Long id);
R importContractMultiSheet(MultipartFile file);
+
+ R subjectChange(ContractSubjectChangeDTO changeDTO);
+
+ Page subjectChangePage(Page page, ContracQueryDTO queryDTO);
}
diff --git a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/BankStatementServiceImpl.java b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/BankStatementServiceImpl.java
index ad2c82a..6e01709 100644
--- a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/BankStatementServiceImpl.java
+++ b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/BankStatementServiceImpl.java
@@ -6,7 +6,6 @@
import cn.hutool.core.util.ObjUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.http.HttpUtil;
-import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -16,12 +15,10 @@
import com.by4cloud.platformx.business.dto.BankStatementUpdateDTO;
import com.by4cloud.platformx.business.dto.PaymentConfirmAddDTO;
import com.by4cloud.platformx.business.entity.*;
-import com.by4cloud.platformx.business.mapper.BankStatementItemMapper;
-import com.by4cloud.platformx.business.mapper.BankStatementMapper;
-import com.by4cloud.platformx.business.mapper.BusinessCustomerMapper;
-import com.by4cloud.platformx.business.mapper.ContractMapper;
+import com.by4cloud.platformx.business.mapper.*;
import com.by4cloud.platformx.business.service.BankStatementService;
import com.by4cloud.platformx.business.service.PaymentConfirmService;
+import com.by4cloud.platformx.business.vo.CustInfoVo;
import com.by4cloud.platformx.business.vo.StatementContractVo;
import com.by4cloud.platformx.common.core.util.R;
import com.by4cloud.platformx.common.security.util.SecurityUtils;
@@ -33,6 +30,7 @@
import org.springframework.stereotype.Service;
import java.math.BigDecimal;
+import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
@@ -53,12 +51,20 @@
private final StringRedisTemplate redisTemplate;
private final RemoteDeptService remoteDeptService;
private final BankStatementItemMapper bankStatementItemMapper;
+ private final ErpRequestRecordMapper erpRequestRecordMapper;
+ private final BipViewMapper bipViewMapper;
@Value("${bip.url}")
private String url;
@Value("${bip.flag}")
private Boolean bipFlag;
+
+ @Value("${dept.sgb}")
+ private String sgb;
+
+ @Value("${erp.sgb}")
+ private String sgbErp;
@Override
public R edit(BankStatementUpdateDTO updateDTO) {
@@ -68,16 +74,8 @@
}
BigDecimal toPaidTotal = updateDTO.getContractCollectionList().stream() .map(StatementContractDTO::getToPaidAmount)
.reduce(BigDecimal.ZERO, BigDecimal::add);
- if (toPaidTotal.compareTo(statement.getTranAmount().subtract(statement.getConfirmAmount()))>0){
- return R.failed("纭鏀舵鎬婚涓嶈兘瓒呰繃浜ゆ槗娴佹按閲戦");
- }
-
- //bip鎺ㄩ��
- if (bipFlag) {
- R r = pushSaveCollection(statement, updateDTO.getContractCollectionList());
- if (!r.isOk()){
- return r;
- }
+ if (toPaidTotal.compareTo(statement.getTranAmount().subtract(statement.getConfirmAmount()))!=0){
+ return R.failed("纭鏀舵鎬婚蹇呴』涓庝氦鏄撴祦姘撮噾棰濅竴鑷�");
}
statement.setConfirmAmount(statement.getConfirmAmount().add(toPaidTotal));
@@ -96,13 +94,86 @@
addDTO.setBusGuestId(statement.getBusGuestId()+"");
addDTO.setConfirmTime(statement.getTranDate());
addDTO.setContractNo(contract.getContractNo());
- addDTO.setInOrOut("1");
+ addDTO.setInOrOut(statement.getDcFlag());
addDTO.setTransationAmount(statementContractDTO.getToPaidAmount());
addDTO.setBankSeqNo(statement.getBankSeqNo());
paymentConfirmService.add(addDTO);
+
+
+ //鐭冲伐娉典富鍔ㄦ帹閫佺郴缁�
+ if ((StrUtil.equals(SecurityUtils.getUser().getCompId() + "", sgb)) && StrUtil.isNotEmpty(sgbErp)) {
+ BusinessCustomer customer = businessCustomerMapper.selectById(contract.getPartyAId());
+ if (ObjUtil.isNotNull(customer)) {
+ pushCollection(statement, contract,customer,item);
+ }
+ }
+
});
+ //鍒ゆ柇鏄惁鍐呴儴鍗曚綅
+ CustInfoVo custInfoVo = bipViewMapper.selectBaseInfoByCustName(statement.getPayBankAccName());
+ if (ObjUtil.isNull(custInfoVo)){
+ return R.ok();
+ }
+ //bip鎺ㄩ��
+ if (bipFlag&&custInfoVo.getCustCode().equals("01")) {
+ return pushSaveCollection(statement, updateDTO.getContractCollectionList());
+ }
+ log.info("鍐呴儴寰�鏉ユ敹娆惧崟锛屽鎴峰悕绉帮細{},瀹㈡埛绫诲瀷锛歿},涓嶇敤淇濆瓨鏀舵鍗�",custInfoVo.getCustName(),custInfoVo.getCustclass());
return R.ok();
+ }
+
+ private void pushCollection(BankStatement statement,Contract contract,BusinessCustomer customer,BankStatementItem item) {
+ new Thread(() -> {
+ JSONObject request = genErpParam(statement,contract,customer,item);
+ String resp = "";
+ String reqPath = "";
+ log.info("宸ヤ笟娉垫敹娆�/閫�娆撅細{},鍏ュ弬:{}",statement.getDcFlag(),request.toJSONString());
+ if (statement.getDcFlag().equals("1")){
+ reqPath = sgbErp + "/arpclose/create";
+ }
+ if (statement.getDcFlag().equals("2")){
+ reqPath = sgbErp+"/arpclose/create";
+ }
+ resp = HttpUtil.post(reqPath,request.toJSONString());
+ saveErpRequestRecord("sgb",reqPath,request.toJSONString(),resp);
+ log.info("宸ヤ笟娉垫敹娆�/閫�娆惧洖鍙傦細{}",resp);
+
+ try {
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }).start();
+ }
+
+ private void saveErpRequestRecord(String ymj,String medthodName, String toJSONString, String result) {
+ ErpRequestRecord record = new ErpRequestRecord();
+ record.setErpName(ymj);
+ record.setMothedName(medthodName);
+ record.setRequestParams(toJSONString);
+ record.setResponseParams(result);
+ erpRequestRecordMapper.insert(record);
+ }
+
+ private JSONObject genErpParam(BankStatement statement, Contract contract,BusinessCustomer customer,BankStatementItem item) {
+ JSONObject req = new JSONObject();
+ JSONObject djt = new JSONObject();
+ djt.put("iAmt",item.getConfirmAmount());
+ djt.put("iAmt_f",item.getConfirmAmount());
+ djt.put("cCusVen",customer.getErpCompanyCode());
+ djt.put("cexch_name","浜烘皯甯�");
+ djt.put("iAmount",item.getConfirmAmount());
+ req.put("鍗曟嵁澶�",djt);
+ JSONArray array = new JSONArray();
+ JSONObject djti = new JSONObject();
+ djti.put("cVouchID",statement.getBankSeqNo());
+ djti.put("dVouchDate",DateUtil.formatDate(statement.getTranDate()));
+ djti.put("cDwCode",customer.getErpCompanyCode());
+ djti.put("cexch_name","浜烘皯甯�");
+ djti.put("iAmount",item.getConfirmAmount());
+ array.add(djti);
+ req.put("鍗曟嵁澶�",array);
+ return req;
}
private R pushSaveCollection(BankStatement statement, List<StatementContractDTO> contractDTOList) {
@@ -118,11 +189,6 @@
}
String finalAccessToken = accessToken;
- BusinessCustomer customer = businessCustomerMapper.selectById(statement.getBusGuestId());
- if (ObjUtil.isNull(customer)||StrUtil.isEmpty(customer.getBipCode())){
- log.error("鏌ヨ瀹㈡埛淇℃伅寮傚父");
- return R.failed("鏌ヨ瀹㈡埛淇℃伅寮傚父");
- }
R<SysDept> r = remoteDeptService.getById(SecurityUtils.getUser().getCompId());
log.info("鏌ヨ鍗曚綅淇℃伅:{}",JSONObject.toJSONString(r.getData()));
if (!r.isOk()){
@@ -130,7 +196,7 @@
return R.failed("鏌ヨ鍗曚綅淇℃伅寮傚父");
}
SysDept dept = r.getData();
- JSONObject params = genRequestParam(statement,dept,customer,contractDTOList);
+ JSONObject params = genRequestParam(statement,dept,contractDTOList);
log.info("鏀舵鍗曢泦鎴� Request:{}", params.toJSONString());
String result = HttpUtil.post(url + "/yonbip/EFI/collection/saveandsubmit?access_token=" + finalAccessToken, params.toJSONString());
@@ -143,7 +209,9 @@
return R.ok();
}
- private JSONObject genRequestParam(BankStatement statement,SysDept dept,BusinessCustomer customer,List<StatementContractDTO> contractDTOList) {
+ private JSONObject genRequestParam(BankStatement statement,SysDept dept,List<StatementContractDTO> contractDTOList) {
+ Contract contract1 = contractMapper.selectById(contractDTOList.get(0).getId());
+ BusinessCustomer customer = businessCustomerMapper.selectById(contract1.getPartyAId());
JSONObject jsonObject = new JSONObject();
JSONObject data = new JSONObject();
data.put("billDate",DateUtil.format(statement.getTranDate(), DatePattern.NORM_DATETIME_FORMAT));
@@ -182,6 +250,7 @@
.select(Contract::getAmount)
.leftJoin(Contract.class,Contract::getId,BankStatementItem::getContractId)
.eq(BankStatementItem::getCompId,SecurityUtils.getUser().getCompId())
+ .eq(BankStatementItem::getStatetId,id)
.orderByDesc(BankStatementItem::getCreateTime);
return R.ok(bankStatementItemMapper.selectJoinList(StatementContractVo.class, wrapper));
}
@@ -468,4 +537,22 @@
jsonObject.put("data",data);
return jsonObject;
}
+
+ @Override
+ public R pushBip(Long itemId) {
+ BankStatementItem item = bankStatementItemMapper.selectById(itemId);
+ BankStatement statement = baseMapper.selectById(item.getStatetId());
+ List<StatementContractDTO> statementContractDTOList = new ArrayList<>();
+ StatementContractDTO contractDTO = new StatementContractDTO();
+ contractDTO.setId(item.getContractId());
+ contractDTO.setToPaidAmount(item.getConfirmAmount());
+ statementContractDTOList.add(contractDTO);
+ R r = pushSaveCollection(statement,statementContractDTOList);
+ if (r.isOk()){
+ item.setPushFlag("1");
+ bankStatementItemMapper.updateById(item);
+ return r;
+ }
+ return r;
+ }
}
\ No newline at end of file
diff --git a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/ContractInvoiceServiceImpl.java b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/ContractInvoiceServiceImpl.java
index f652c00..7724343 100644
--- a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/ContractInvoiceServiceImpl.java
+++ b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/ContractInvoiceServiceImpl.java
@@ -5,7 +5,9 @@
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.lang.tree.Tree;
+import cn.hutool.core.lang.tree.TreeNode;
+import cn.hutool.core.lang.tree.TreeUtil;
import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.ObjUtil;
import cn.hutool.core.util.StrUtil;
@@ -20,10 +22,7 @@
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.ContractInvoiceQueryDTO;
-import com.by4cloud.platformx.business.dto.ContractQueryDTO;
-import com.by4cloud.platformx.business.dto.GenInvoiceInfoDTO;
-import com.by4cloud.platformx.business.dto.InvoiceQueryDTO;
+import com.by4cloud.platformx.business.dto.*;
import com.by4cloud.platformx.business.entity.*;
import com.by4cloud.platformx.business.mapper.*;
import com.by4cloud.platformx.business.service.ContractInvoiceService;
@@ -36,6 +35,7 @@
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.data.redis.core.StringRedisTemplate;
import org.springframework.stereotype.Service;
@@ -68,6 +68,8 @@
private final RemoteFlowProcessService remoteFlowProcessService;
private final PaymentConfirmService paymentConfirmService;
private final StringRedisTemplate redisTemplate;
+ private final BipViewMapper bipViewMapper;
+ private final BipDictMapper bipDictMapper;
@Value("${BWInvoice.url}")
@@ -79,11 +81,26 @@
@Value("${bip.url}")
private String url;
- @Value("${bip.appKey}")
- private String appKey;
+ @Value("${dept.sgb}")
+ private String sgb;
- @Value("${bip.appSecret}")
- private String appSecret;
+ @Value("${dept.smj}")
+ private String smj;
+
+ @Value("${dept.smjzt}")
+ private String smjzt;
+
+ @Value("${dept.smjsc}")
+ private String smjsc;
+
+ @Value("${dept.tfgs}")
+ private String tfgs;
+
+ @Value("${dept.jxc}")
+ private String jxc;
+
+ @Value("${dept.ymj}")
+ private String ymj;
@Value("${file.path}")
private String localPath;
@@ -112,7 +129,7 @@
contractInvoiceOutBoundVo.setToInvoiceNum(contractInvoiceOutBoundVo.getInvoiceNum());
});
}
- return R.ok(invoiceOutBoundVoList);
+ return R.ok(invoiceOutBoundVoList.stream().filter(item->item.getUnitPrice().compareTo(new BigDecimal("0"))>0).collect(Collectors.toList()));
}
@Override
@@ -124,13 +141,13 @@
.selectAs(ContractSubjectMatter::getQuantity, "outBoundNum")
.eq(ContractSubjectMatter::getContractId, contractId);
List<ContractInvoiceOutBoundVo> invoiceOutBoundVoList = contractSubjectMatterMapper.selectJoinList(ContractInvoiceOutBoundVo.class, wrapper);
- if (ArrayUtil.isNotEmpty(invoiceOutBoundVoList)) {
+ if (CollUtil.isNotEmpty(invoiceOutBoundVoList)) {
invoiceOutBoundVoList.stream().forEach(contractInvoiceOutBoundVo -> {
contractInvoiceOutBoundVo.setInvoiceNum(contractInvoiceOutBoundVo.getOutBoundNum().subtract(contractInvoiceOutBoundVo.getAdvanceNum()));
contractInvoiceOutBoundVo.setToInvoiceNum(contractInvoiceOutBoundVo.getInvoiceNum());
});
}
- return R.ok(invoiceOutBoundVoList);
+ return R.ok(invoiceOutBoundVoList.stream().filter(item->item.getUnitPrice().compareTo(new BigDecimal("0"))>0).collect(Collectors.toList()));
}
@Override
@@ -171,6 +188,10 @@
return R.failed("鑾峰彇寮�绁ㄥ崟浣嶅紓甯�");
}
SysDept b = r.getData();
+ BusinessCustomer customer = businessCustomerMapper.selectById(contract.getPartyAId());
+ if (ObjUtil.isNull(customer)){
+ return R.failed("鑾峰彇璐柟鍗曚綅寮傚父");
+ }
BigDecimal advanceAmount = new BigDecimal("0");
for (ContractOutBoundInvoiceVo contractOutBoundInvoiceVo : genInvoiceInfoDTO.getOutBoundInvoiceList()) {
ContractSubjectMatter subjectMatter = contractSubjectMatterMapper.selectById(contractOutBoundInvoiceVo.getContractOutBoundId());
@@ -184,7 +205,7 @@
return R.failed("寮�绁ㄩ噾棰濊秴鍑哄悎鍚岀璁㈤樁娈靛簲鏀堕噾棰�:" + schedule.getPlannedAmount() + ",璇疯皟鏁村紑绁ㄦ暟閲�");
}
GenInvoiceInfoVo vo = genAdvanceInvoiceInfoVo(genInvoiceInfoDTO, contract, b);
-
+ vo = transBipVo(vo,b,customer);
return R.ok(vo);
}
@@ -205,6 +226,10 @@
return R.failed("鑾峰彇寮�绁ㄥ崟浣嶅紓甯�");
}
SysDept b = r.getData();
+ BusinessCustomer customer = businessCustomerMapper.selectById(contract.getPartyAId());
+ if (ObjUtil.isNull(customer)){
+ return R.failed("鑾峰彇璐柟鍗曚綅寮傚父");
+ }
//鏈哄姩杞﹀紑绁�
if (StrUtil.equals(genInvoiceInfoDTO.getInvoiceType(), "3") || StrUtil.equals(genInvoiceInfoDTO.getInvoiceType(), "4")) {
if (StrUtil.isBlank(genInvoiceInfoDTO.getVehicleNo())) {
@@ -220,19 +245,46 @@
return r1;
}
JSONObject request1 = genQueryVehDetailParam(genInvoiceInfoDTO.getVehicleNo(), b);
- R r2 = requestQueryVehicleDetail(request1);
+ R<JSONObject> r2 = requestQueryVehicleDetail(request1,genInvoiceInfoDTO);
if (!r2.isOk()) {
return r2;
}
+ r2.getData().put("contact",b.getOrgContact());
genInvoiceInfoDTO.setVehicleData(r2.getData().toString());
}
GenInvoiceInfoVo vo = genInvoiceInfoVo(genInvoiceInfoDTO, contract, b);
-
+ vo = transBipVo(vo,b,customer);
return R.ok(vo);
}
- private R requestQueryVehicleDetail(JSONObject request) {
+ private GenInvoiceInfoVo transBipVo(GenInvoiceInfoVo vo,SysDept comp,BusinessCustomer customer) {
+ ContractInvoiceBipVo bipVo = new ContractInvoiceBipVo();
+ bipVo.setDjrq(DateUtil.today());
+ bipVo.setKpzz(comp.getBipCode());
+ bipVo.setYwzz(comp.getBipCode());
+ R<SysDept> rDept = remoteDeptService.getById(SecurityUtils.getUser().getDeptId());
+ if (rDept.isOk()) {
+ bipVo.setBm(rDept.getData().getOrgCode());
+ bipVo.setHsdy(rDept.getData().getOrgCode());
+ }
+ bipVo.setYwy(SecurityUtils.getUser().getNickname());
+ bipVo.setPzzdr(SecurityUtils.getUser().getNickname());
+ bipVo.setJylx("ZBYXGLXT");
+ bipVo.setWldxlx("1");
+ bipVo.setKh(customer.getCreditCode());
+ bipVo.setBz("CNY");
+ bipVo.setFjzs("1");
+ bipVo.setSfzy("1");
+ bipVo.setSfnbwl("1");
+ bipVo.setSfjyjs("0");
+ bipVo.setDjfx("1");
+ bipVo.setItemList(vo.getInvoiceItemList());
+ vo.setBipVo(bipVo);
+ return vo;
+ }
+
+ private R requestQueryVehicleDetail(JSONObject request,GenInvoiceInfoDTO invoiceInfoDTO) {
String requestId = IdUtil.fastUUID();
log.info("鏈哄姩杞﹀悎鏍艰瘉鏌ヨ鎺ュ彛鍏ュ弬锛歿},", request.toJSONString());
@@ -247,6 +299,17 @@
JSONArray models = resultObj.getJSONArray("model");
if (CollUtil.isNotEmpty(models)) {
JSONObject model = (JSONObject) models.get(0);
+ if (StrUtil.isNotBlank(invoiceInfoDTO.getOrigin())) {
+ model.put("origin",invoiceInfoDTO.getOrigin());
+ }
+ if (StrUtil.isNotBlank(invoiceInfoDTO.getTonnage())) {
+ model.put("tonnage",invoiceInfoDTO.getTonnage());
+ }
+ if (StrUtil.isNotBlank(invoiceInfoDTO.getPassengersLimited())) {
+ model.put("passengersLimited",invoiceInfoDTO.getPassengersLimited());
+ }
+ model.put("origin",invoiceInfoDTO.getOrigin());
+ model.put("vehicleNo",invoiceInfoDTO.getVehicleNo());
return R.ok(model);
}
return R.failed("鏈哄姩杞﹀悎鏍艰瘉鏌ヨ寮傚父");
@@ -295,6 +358,7 @@
private GenInvoiceInfoVo genInvoiceInfoVo(GenInvoiceInfoDTO genInvoiceInfoDTO, Contract contract, SysDept b) {
GenInvoiceInfoVo vo = new GenInvoiceInfoVo();
BusinessCustomer a = businessCustomerMapper.selectById(contract.getPartyAId());
+ vo.setContractId(contract.getId());
vo.setPartyA(a.getCompanyName());
vo.setPartyAOrgCode(a.getCreditCode());
vo.setPartyAOpenBank(a.getBankName());
@@ -304,6 +368,8 @@
vo.setPartyBOpenBank(b.getOrgBank());
vo.setPartyBBankAccount(b.getOrgBankAccount());
vo.setInvoiceType(a.getInvoiceType());
+ vo.setRemarks(genInvoiceInfoDTO.getRemarks());
+ vo.setOutBoundInvoiceList(genInvoiceInfoDTO.getOutBoundInvoiceList());
if (StrUtil.isNotBlank(genInvoiceInfoDTO.getInvoiceType())) {
vo.setInvoiceVehicleType(genInvoiceInfoDTO.getInvoiceType());
}
@@ -335,8 +401,20 @@
mergeVo.setMaterialCode(contractOutBound.getSubjectMatterCode()+subjectMatter.getUnitPrice());
mergeVo.setMaterialInternalName(contractOutBound.getSubjectMatterName());
mergeVo.setQuantity(contractOutBoundInvoiceVo.getInvoiceNum());
- Product product = productMapper.selectOne(Wrappers.<Product>lambdaQuery().eq(Product::getErpCode, contractOutBound.getSubjectMatterCode())
- .eq(Product::getCompId, SecurityUtils.getUser().getCompId()).last("limit 1"));
+ Product product = new Product();
+ List<String> smjList = new ArrayList<>();
+ smjList.add(smj);
+ smjList.add(smjsc);
+ smjList.add(smjzt);
+ if ((""+SecurityUtils.getUser().getCompId()).equals(smj)||(""+SecurityUtils.getUser().getCompId()).equals(smjsc)||
+ (""+SecurityUtils.getUser().getCompId()).equals(smjzt)){
+ product = productMapper.selectOne(Wrappers.<Product>lambdaQuery().eq(Product::getErpCode, contractOutBound.getSubjectMatterCode())
+ .in(Product::getCompId, smjList).last("limit 1"));
+ }else {
+ product = productMapper.selectOne(Wrappers.<Product>lambdaQuery().eq(Product::getErpCode, contractOutBound.getSubjectMatterCode())
+ .eq(Product::getCompId, SecurityUtils.getUser().getCompId()).last("limit 1"));
+ }
+
if (ObjUtil.isNotNull(product)) {
mergeVo.setTaxClass(product.getTaxClass());
mergeVo.setSpecification(product.getProductType());
@@ -361,14 +439,15 @@
List<ContractOutBoundMergeVo> filteredList = mergeOutBounds.stream()
.filter(item -> item.getMaterialCode().equals(subjectMatter.getMaterialCode()+subjectMatter.getUnitPrice())) // 闃叉绌烘寚閽堬紝寤鸿甯搁噺鍦ㄥ墠
.collect(Collectors.toList());
- if (ArrayUtil.isNotEmpty(filteredList)) {
+ if (CollUtil.isNotEmpty(filteredList)) {
filteredList.get(0).setQuantity(filteredList.get(0).getQuantity().add(contractOutBound.getOutBoundNum()));
}
}
});
- if (ArrayUtil.isNotEmpty(mergeOutBounds)) {
+ if (CollUtil.isNotEmpty(mergeOutBounds)) {
invoiceItemVoList = BeanUtil.copyToList(mergeOutBounds, InvoiceItemVo.class);
- invoiceItemVoList.stream().forEach(invoiceItemVo -> {
+ invoiceItemVoList.stream().filter(invoiceItem->invoiceItem.getUnitPrice().compareTo(new BigDecimal("0"))>0)
+ .forEach(invoiceItemVo -> {
// for (InvoiceItemVo invoiceItemVo:invoiceItemVoList) {
BigDecimal itemPrice = invoiceItemVo.getUnitPrice().multiply(invoiceItemVo.getQuantity());
BigDecimal itemPriceTax = itemPrice.divide(new BigDecimal("100").add(invoiceItemVo.getTaxRate()), 2, RoundingMode.HALF_UP).multiply(invoiceItemVo.getTaxRate());
@@ -383,7 +462,7 @@
}
}
} else {
- if (ArrayUtil.isNotEmpty(genInvoiceInfoDTO.getOutBoundInvoiceList())) {
+ if (CollUtil.isNotEmpty(genInvoiceInfoDTO.getOutBoundInvoiceList())) {
genInvoiceInfoDTO.getOutBoundInvoiceList().stream().forEach(contractOutBoundInvoiceVo -> {
ContractPaymentSchedule schedule = contractPaymentScheduleMapper.selectById(contractOutBoundInvoiceVo.getContractOutBoundId());
@@ -424,14 +503,15 @@
} else {
List<ContractOutBoundMergeVo> filterMergeVo = mergeOutBounds.stream().filter(item -> item.getMaterialCode()
.equals(schedule.getSubjectMatterCode())).collect(Collectors.toList());
- if (ArrayUtil.isNotEmpty(filterMergeVo)) {
+ if (CollUtil.isNotEmpty(filterMergeVo)) {
filterMergeVo.get(0).setPriceAndTax(schedule.getPlannedAmount().add(filterMergeVo.get(0).getPriceAndTax()));
}
}
});
- if (ArrayUtil.isNotEmpty(mergeOutBounds)) {
+ if (CollUtil.isNotEmpty(mergeOutBounds)) {
invoiceItemVoList = BeanUtil.copyToList(mergeOutBounds, InvoiceItemVo.class);
- invoiceItemVoList.stream().forEach(invoiceItemVo -> {
+ invoiceItemVoList.stream().filter(invoiceItem->invoiceItem.getUnitPrice().compareTo(new BigDecimal("0"))>0)
+ .forEach(invoiceItemVo -> {
// for (InvoiceItemVo invoiceItemVo:invoiceItemVoList) {
BigDecimal itemPrice = invoiceItemVo.getPriceAndTax();
BigDecimal itemPriceTax = itemPrice.divide(new BigDecimal("100").add(invoiceItemVo.getTaxRate()), 2, RoundingMode.HALF_UP).multiply(invoiceItemVo.getTaxRate());
@@ -452,6 +532,7 @@
private GenInvoiceInfoVo genAdvanceInvoiceInfoVo(GenInvoiceInfoDTO genInvoiceInfoDTO, Contract contract, SysDept b) {
GenInvoiceInfoVo vo = new GenInvoiceInfoVo();
BusinessCustomer a = businessCustomerMapper.selectById(contract.getPartyAId());
+ vo.setContractId(contract.getId());
vo.setAdvanceInvoice("111");
vo.setPartyA(a.getCompanyName());
vo.setPartyAOrgCode(a.getCreditCode());
@@ -461,6 +542,8 @@
vo.setPartyBOrgCode(b.getOrgCode());
vo.setPartyBOpenBank(b.getOrgBank());
vo.setPartyBBankAccount(b.getOrgBankAccount());
+ vo.setRemarks(genInvoiceInfoDTO.getRemarks());
+ vo.setOutBoundInvoiceList(genInvoiceInfoDTO.getOutBoundInvoiceList());
List<InvoiceItemVo> invoiceItemVoList = new ArrayList<>();
List<String> erpCode = new ArrayList<>();
List<ContractOutBoundMergeVo> mergeOutBounds = new ArrayList<>();
@@ -504,9 +587,9 @@
}
});
- if (ArrayUtil.isNotEmpty(mergeOutBounds)) {
+ if (CollUtil.isNotEmpty(mergeOutBounds)) {
invoiceItemVoList = BeanUtil.copyToList(mergeOutBounds, InvoiceItemVo.class);
- invoiceItemVoList.stream().forEach(invoiceItemVo -> {
+ invoiceItemVoList.stream().filter(invoiceItem->invoiceItem.getUnitPrice().compareTo(new BigDecimal("0"))>0).forEach(invoiceItemVo -> {
// for (InvoiceItemVo invoiceItemVo:invoiceItemVoList) {
BigDecimal itemPrice = invoiceItemVo.getUnitPrice().multiply(invoiceItemVo.getQuantity());
BigDecimal itemPriceTax = itemPrice.divide(new BigDecimal("100").add(invoiceItemVo.getTaxRate()), 2, RoundingMode.HALF_UP).multiply(invoiceItemVo.getTaxRate());
@@ -525,36 +608,18 @@
}
@Override
- public R toInvoice(GenInvoiceInfoDTO genInvoiceInfoDTO) {
- if (CollUtil.isEmpty(genInvoiceInfoDTO.getOutBoundInvoiceList())) {
- return R.failed("璇烽�夋嫨寮�绁ㄥ嚭搴撳崟鍚庡啀鎿嶄綔");
+ public R toInvoice(ToInvoiceDTO toInvoiceDTO) {
+ Contract contract = contractMapper.selectById(toInvoiceDTO.getContractId());
+ if (ObjUtil.isNull(contract)) {
+ return R.failed("鍚堝悓淇℃伅寮傚父锛岃鑱旂郴鎶�鏈汉鍛�");
}
- genInvoiceInfoDTO.setOutBoundInvoiceList(genInvoiceInfoDTO.getOutBoundInvoiceList().stream().filter(item->
- item.getInvoiceNum().compareTo(new BigDecimal("0"))>0).collect(Collectors.toList()));
- if (CollUtil.isEmpty(genInvoiceInfoDTO.getOutBoundInvoiceList())) {
- return R.failed("璇烽�夋嫨寮�绁ㄥ嚭搴撳崟鍚庢垨璋冩暣寮�绁ㄦ暟閲忓啀鎿嶄綔");
- }
- if (StrUtil.equals(genInvoiceInfoDTO.getInvoiceType(), "3") || StrUtil.equals(genInvoiceInfoDTO.getInvoiceType(), "4")) {
- if (StrUtil.isBlank(genInvoiceInfoDTO.getVehicleNo())) {
- return R.failed("鏈哄姩杞﹀紑绁ㄨ杈撳叆杞︽灦鍙�");
- }
- BigDecimal invoiceNumSum = genInvoiceInfoDTO.getOutBoundInvoiceList().stream().map(item -> item.getInvoiceNum()).reduce(BigDecimal.ZERO, BigDecimal::add);
- if (invoiceNumSum.compareTo(new BigDecimal("1")) > 0) {
- return R.failed("鏈哄姩杞﹀紑绁ㄥ彧鑳�1娆″紑1杈�");
- }
- }
- Long contractId = null;
- if (StrUtil.isNotBlank(genInvoiceInfoDTO.getContractId())) {
+ if (StrUtil.isNotBlank(toInvoiceDTO.getAdvanceInvoice())) {
ContractPaymentSchedule schedule = contractPaymentScheduleMapper.selectOne(Wrappers.<ContractPaymentSchedule>lambdaQuery()
- .eq(ContractPaymentSchedule::getStageName, "鍚堝悓绛捐").eq(ContractPaymentSchedule::getContractId, genInvoiceInfoDTO.getContractId())
+ .eq(ContractPaymentSchedule::getStageName, "鍚堝悓绛捐").eq(ContractPaymentSchedule::getContractId, toInvoiceDTO.getContractId())
.last("limit 1"));
if (ObjUtil.isNull(schedule)) {
return R.failed("鍚堝悓棰勬敹娆鹃樁娈靛紓甯革紝璇疯仈绯绘妧鏈汉鍛�");
- }
- Contract contract = contractMapper.selectById(genInvoiceInfoDTO.getContractId());
- if (ObjUtil.isNull(contract)) {
- return R.failed("鍚堝悓淇℃伅寮傚父锛岃鑱旂郴鎶�鏈汉鍛�");
}
ContractInvoice lastInvoice = baseMapper.selectOne(Wrappers.<ContractInvoice>lambdaQuery().eq(ContractInvoice::getContractId, contract.getId())
.orderByDesc(ContractInvoice::getCreateTime).last("limit 1"));
@@ -567,7 +632,7 @@
}
SysDept b = r.getData();
BigDecimal advanceAmount = new BigDecimal("0");
- for (ContractOutBoundInvoiceVo contractOutBoundInvoiceVo : genInvoiceInfoDTO.getOutBoundInvoiceList()) {
+ for (ContractOutBoundInvoiceVo contractOutBoundInvoiceVo : toInvoiceDTO.getOutBoundInvoiceList()) {
ContractSubjectMatter subjectMatter = contractSubjectMatterMapper.selectById(contractOutBoundInvoiceVo.getContractOutBoundId());
if (ObjUtil.isNotNull(subjectMatter)) {
advanceAmount = advanceAmount.add(contractOutBoundInvoiceVo.getInvoiceNum().multiply(subjectMatter.getUnitPrice()));
@@ -577,9 +642,9 @@
if (advanceAmount.compareTo(schedule.getPlannedAmount()) > 0) {
return R.failed("寮�绁ㄩ噾棰濊秴鍑哄悎鍚岀璁㈤樁娈靛簲鏀堕噾棰�:" + schedule.getPlannedAmount() + ",璇疯皟鏁村紑绁ㄦ暟閲�");
}
- GenInvoiceInfoVo vo = genAdvanceInvoiceInfoVo(genInvoiceInfoDTO, contract, b);
+ GenInvoiceInfoVo vo = BeanUtil.copyProperties(toInvoiceDTO,GenInvoiceInfoVo.class);
//鍙戠エ淇濆瓨
- ContractInvoice invoice = saveContractInvoice(vo, contract, genInvoiceInfoDTO.getOutBoundInvoiceList(), DateUtil.current() + "", "1");
+ ContractInvoice invoice = saveContractInvoice(vo, contract, toInvoiceDTO.getOutBoundInvoiceList(), DateUtil.current() + "", "1");
//鍚姩娴佺▼
ProcessInstanceParamDto dto = new ProcessInstanceParamDto();
Map<String, Object> map = BeanUtil.beanToMap(invoice);
@@ -590,57 +655,20 @@
return R.failed("娴佺▼鍚姩澶辫触");
}
//鏇存柊鍚堝悓鍑哄簱鍗曠姸鎬�
- genInvoiceInfoDTO.getOutBoundInvoiceList().stream().forEach(contractOutBoundInvoiceVo -> {
+ toInvoiceDTO.getOutBoundInvoiceList().stream().forEach(contractOutBoundInvoiceVo -> {
ContractSubjectMatter subjectMatter = contractSubjectMatterMapper.selectById(contractOutBoundInvoiceVo.getContractOutBoundId());
subjectMatter.setAdvanceNum(subjectMatter.getAdvanceNum().add(contractOutBoundInvoiceVo.getInvoiceNum()));
contractSubjectMatterMapper.updateById(subjectMatter);
});
return R.ok();
}
- if (!StrUtil.equals(genInvoiceInfoDTO.getContractCategory(), "water_house")) {
- ContractOutBound outBound = contractOutBoundMapper.selectById(genInvoiceInfoDTO.getOutBoundInvoiceList().get(0).getContractOutBoundId());
- contractId = outBound.getContractId();
- } else {
- ContractPaymentSchedule schedule = contractPaymentScheduleMapper.selectById(genInvoiceInfoDTO.getOutBoundInvoiceList().get(0).getContractOutBoundId());
- contractId = schedule.getContractId();
- }
- Contract contract = contractMapper.selectById(contractId);
- if (ObjUtil.isNull(contract)) {
- return R.failed("鍚堝悓淇℃伅寮傚父锛岃鑱旂郴鎶�鏈汉鍛�");
- }
- R<SysDept> r = remoteDeptService.getById(contract.getPartyBId());
- if (!r.isOk()) {
- return R.failed("鑾峰彇寮�绁ㄥ崟浣嶅紓甯�");
- }
- SysDept b = r.getData();
- //鏈哄姩杞﹀紑绁�
- if (StrUtil.equals(genInvoiceInfoDTO.getInvoiceType(), "3") || StrUtil.equals(genInvoiceInfoDTO.getInvoiceType(), "4")) {
- if (StrUtil.isBlank(genInvoiceInfoDTO.getVehicleNo())) {
- return R.failed("鏈哄姩杞﹀紑绁ㄨ杈撳叆杞︽灦鍙�");
- }
- BigDecimal invoiceNumSum = genInvoiceInfoDTO.getOutBoundInvoiceList().stream().map(item -> item.getInvoiceNum()).reduce(BigDecimal.ZERO, BigDecimal::add);
- if (invoiceNumSum.compareTo(new BigDecimal("1")) > 0) {
- return R.failed("鏈哄姩杞﹀紑绁ㄥ彧鑳�1娆″紑1杈�");
- }
- JSONObject request = genQueryVinParam(genInvoiceInfoDTO.getVehicleNo(), b);
- R r1 = requestQueryVehicleNo(request);
- if (!r1.isOk()) {
- return r1;
- }
- JSONObject request1 = genQueryVehDetailParam(genInvoiceInfoDTO.getVehicleNo(), b);
- R r2 = requestQueryVehicleDetail(request1);
- if (!r2.isOk()) {
- return r2;
- }
- genInvoiceInfoDTO.setVehicleData(r2.getData().toString());
- }
- GenInvoiceInfoVo vo = genInvoiceInfoVo(genInvoiceInfoDTO, contract, b);
+ GenInvoiceInfoVo vo = BeanUtil.copyProperties(toInvoiceDTO,GenInvoiceInfoVo.class);
//鍙戠エ淇濆瓨
- ContractInvoice invoice = saveContractInvoice(vo, contract, genInvoiceInfoDTO.getOutBoundInvoiceList(), DateUtil.current() + "", "0");
+ ContractInvoice invoice = saveContractInvoice(vo, contract, toInvoiceDTO.getOutBoundInvoiceList(), DateUtil.current() + "", "0");
//鍚姩娴佺▼
ProcessInstanceParamDto dto = new ProcessInstanceParamDto();
Map<String, Object> map = BeanUtil.beanToMap(invoice);
- if (StrUtil.equals(genInvoiceInfoDTO.getContractCategory(), "water_house")) {
+ if (StrUtil.equals(toInvoiceDTO.getContractCategory(), "water_house")) {
map.put("contractCategory", "water_house");
}
dto.setParamMap(map);
@@ -651,7 +679,7 @@
}
if (!StrUtil.equals(contract.getContractCategory(), "water_house")) {
//鏇存柊鍚堝悓鍑哄簱鍗曠姸鎬�
- genInvoiceInfoDTO.getOutBoundInvoiceList().stream().forEach(contractOutBoundInvoiceVo -> {
+ toInvoiceDTO.getOutBoundInvoiceList().stream().forEach(contractOutBoundInvoiceVo -> {
ContractOutBound contractOutBound = contractOutBoundMapper.selectById(contractOutBoundInvoiceVo.getContractOutBoundId());
contractOutBound.setInvoiceStatus("1");
contractOutBound.setInvoiceNum(contractOutBound.getInvoiceNum().add(contractOutBoundInvoiceVo.getInvoiceNum()));
@@ -659,7 +687,7 @@
});
} else {
//鏇存柊鍚堝悓鎴跨 姘寸數 璐瑰紑绁ㄧ姸鎬�
- genInvoiceInfoDTO.getOutBoundInvoiceList().stream().forEach(contractOutBoundInvoiceVo -> {
+ toInvoiceDTO.getOutBoundInvoiceList().stream().forEach(contractOutBoundInvoiceVo -> {
ContractPaymentSchedule schedule = contractPaymentScheduleMapper.selectById(contractOutBoundInvoiceVo.getContractOutBoundId());
schedule.setInvoiceFlag("1");
contractPaymentScheduleMapper.updateById(schedule);
@@ -727,7 +755,7 @@
data.put("invoiceTotalPriceTax", vo.getTotalPrice());
data.put("buyerBankName", vo.getPartyAOpenBank());
data.put("buyerBankNumber", vo.getPartyABankAccount());
-
+ data.put("remarks",vo.getRemarks());
jsonObject.put("data", data);
return jsonObject;
}
@@ -768,7 +796,6 @@
@Override
public R toRedInvoice(Long invoiceId) {
-
ContractInvoice blueInvoice = baseMapper.selectById(invoiceId);
blueInvoice.setRedReversal("2");
baseMapper.updateById(blueInvoice);
@@ -782,10 +809,21 @@
invoice.setInvoiceTotalTax(blueInvoice.getInvoiceTotalTax());
invoice.setInvoiceTotalPrice(blueInvoice.getInvoiceTotalPrice());
invoice.setInvoiceTotalPriceTax(blueInvoice.getInvoiceTotalPriceTax());
- invoice.setInvoicePreview(blueInvoice.getInvoicePreview());
- invoice.setInvoiceTotalTax(blueInvoice.getInvoiceTotalTax());
- invoice.setInvoiceTotalPrice(blueInvoice.getInvoiceTotalPrice());
- invoice.setInvoiceTotalPriceTax(blueInvoice.getInvoiceTotalPriceTax());
+
+ ToInvoiceDTO toInvoiceDTO = BeanUtil.copyProperties(JSONObject.parseObject(blueInvoice.getInvoicePreview()),ToInvoiceDTO.class);
+ toInvoiceDTO.setTotalPrice(toInvoiceDTO.getTotalPrice().multiply(new BigDecimal(-1)));
+ toInvoiceDTO.setTotalTax(toInvoiceDTO.getTotalTax().multiply(new BigDecimal(-1)));
+ if (CollUtil.isNotEmpty(toInvoiceDTO.getInvoiceItemList())){
+ toInvoiceDTO.getInvoiceItemList().stream().forEach(item->{
+ item.setPriceTax(item.getPriceTax().multiply(new BigDecimal("-1")));
+ item.setPriceNoTax(item.getPriceNoTax().multiply(new BigDecimal("-1")));
+ item.setPriceAndTax(item.getPriceAndTax().multiply(new BigDecimal("-1")));
+ });
+ }
+ invoice.setInvoicePreview(JSONObject.toJSONString(toInvoiceDTO));
+ invoice.setInvoiceTotalTax(blueInvoice.getInvoiceTotalTax().multiply(new BigDecimal("-1")));
+ invoice.setInvoiceTotalPrice(blueInvoice.getInvoiceTotalPrice().multiply(new BigDecimal("-1")));
+ invoice.setInvoiceTotalPriceTax(blueInvoice.getInvoiceTotalPriceTax().multiply(new BigDecimal("-1")));
invoice.setOutBoundId(blueInvoice.getOutBoundId());
invoice.setInvoiceTime(new Date());
invoice.setInvoiceCategory("2");
@@ -814,26 +852,26 @@
return R.ok();
}
- private JSONObject genRedInvoice(Contract contract, ContractInvoice blueInvoice, String redConfirmSerialNo) {
+ private JSONObject genRedInvoice(Contract contract, ContractInvoice blueInvoice,ContractInvoice redInvoice, String redConfirmSerialNo) {
JSONObject jsonObject = new JSONObject();
- jsonObject.put("taxNo", blueInvoice.getTaxNo());
+ jsonObject.put("taxNo", redInvoice.getTaxNo());
jsonObject.put("redConfirmSerialNo", redConfirmSerialNo);
jsonObject.put("entryIdentity", "01");
- jsonObject.put("sellerTaxNo", blueInvoice.getTaxNo());
- jsonObject.put("sellerTaxName", blueInvoice.getSellerTaxName());
- jsonObject.put("buyerTaxName", blueInvoice.getBuyerTaxName());
- jsonObject.put("buyerTaxNo", blueInvoice.getBuyerTaxNo());
+ jsonObject.put("sellerTaxNo", redInvoice.getTaxNo());
+ jsonObject.put("sellerTaxName", redInvoice.getSellerTaxName());
+ jsonObject.put("buyerTaxName", redInvoice.getBuyerTaxName());
+ jsonObject.put("buyerTaxNo", redInvoice.getBuyerTaxNo());
jsonObject.put("originInvoiceDate", DateUtil.formatDateTime(blueInvoice.getInvoiceTime()));
- jsonObject.put("originInvoiceTotalPrice", blueInvoice.getInvoiceTotalPrice());
- jsonObject.put("originInvoiceTotalTax", blueInvoice.getInvoiceTotalTax());
- jsonObject.put("invoiceTotalPrice", blueInvoice.getInvoiceTotalPrice().multiply(new BigDecimal("-1")));
- jsonObject.put("invoiceTotalTax", blueInvoice.getInvoiceTotalTax().multiply(new BigDecimal("-1")));
+ jsonObject.put("originInvoiceTotalPrice", redInvoice.getInvoiceTotalPriceTax());
+ jsonObject.put("originInvoiceTotalTax", redInvoice.getInvoiceTotalTax());
+ jsonObject.put("invoiceTotalPrice", redInvoice.getInvoiceTotalPrice());
+ jsonObject.put("invoiceTotalTax", redInvoice.getInvoiceTotalTax());
jsonObject.put("originInvoiceIsPaper", "N");
jsonObject.put("originInvoiceType", "01");
jsonObject.put("redInvoiceLabel", "01");
jsonObject.put("invoiceSource", "2");
jsonObject.put("originalInvoiceNo", blueInvoice.getInvoiceNo());
- GenInvoiceInfoVo vo = BeanUtil.copyProperties(JSONObject.parseObject(blueInvoice.getInvoicePreview()), GenInvoiceInfoVo.class);
+ GenInvoiceInfoVo vo = BeanUtil.copyProperties(JSONObject.parseObject(redInvoice.getInvoicePreview()), GenInvoiceInfoVo.class);
JSONArray invoiceDetailsList = new JSONArray();
Integer lineNo = 1;
for (InvoiceItemVo invoiceItemVo : vo.getInvoiceItemList()) {
@@ -842,12 +880,15 @@
invoiceDetail.put("projectName", invoiceItemVo.getItemName());
invoiceDetail.put("goodsLineNo", lineNo);
invoiceDetail.put("goodsCode", invoiceItemVo.getTaxCode());
- invoiceDetail.put("goodsTaxRate", invoiceItemVo.getTaxRate().divide(new BigDecimal("100")));
+ invoiceDetail.put("goodsTaxRate", invoiceItemVo.getTaxRate());
invoiceDetail.put("goodsUnit", invoiceItemVo.getUnit());
invoiceDetail.put("goodsQuantity", invoiceItemVo.getQuantity());
// invoiceDetail.put("goodsPrice", invoiceItemVo.getUnitPrice());
- invoiceDetail.put("goodsTotalPrice", invoiceItemVo.getPriceNoTax().multiply(new BigDecimal("-1")));
- invoiceDetail.put("goodsTotalTax", invoiceItemVo.getPriceTax().multiply(new BigDecimal("-1")));
+ invoiceDetail.put("goodsTotalPrice", invoiceItemVo.getPriceNoTax());
+ invoiceDetail.put("goodsTotalTax", invoiceItemVo.getPriceTax());
+ if (vo.getInvoiceVehicleType().equals("3")||vo.getInvoiceVehicleType().equals("4")){
+ invoiceDetail.put("goodsSpecification", invoiceItemVo.getSpecification());
+ }
invoiceDetailsList.add(invoiceDetail);
lineNo++;
}
@@ -863,7 +904,7 @@
.eq(ContractInvoice::getApprovalStatus, "1")
.eq(ContractInvoice::getBwRequestResult, "1")
.isNull(ContractInvoice::getInvoicePath));
- if (ArrayUtil.isNotEmpty(contractInvoices)) {
+ if (CollUtil.isNotEmpty(contractInvoices)) {
contractInvoices.stream().forEach(contractInvoice -> {
JSONObject request = new JSONObject();
request.put("taxNo", contractInvoice.getTaxNo());
@@ -885,7 +926,7 @@
contractInvoice.setInvoiceStatus("2");
baseMapper.updateById(contractInvoice);
//浼犺緭闄勪欢
- pushBipInvoicePdf(contractInvoice);
+// pushBipInvoicePdf(contractInvoice);
}
});
}
@@ -893,7 +934,7 @@
return R.ok();
}
- private void pushBipInvoicePdf(ContractInvoice contractInvoice) {
+ private void pushBipInvoicePdf(ContractInvoice contractInvoice){
String accessToken = "";
if (redisTemplate.hasKey("BIP_TOKEN")) {
accessToken = (String) redisTemplate.opsForValue().get("BIP_TOKEN");
@@ -936,7 +977,7 @@
.execute();
log.info("搴旀敹鍙戠エ闄勪欢涓婁紶鍥炲弬:{}", response.body());
//淇濆瓨璇锋眰璁板綍
- paymentConfirmService.saveBipRequestRecord(request, "搴旀敹鍙戠エ闆嗘垚鎺ュ彛", response.body());
+ paymentConfirmService.saveBipRequestRecord(request, "搴旀敹鍙戠エ闄勪欢涓婁紶鎺ュ彛", response.body());
JSONObject resultJson = JSONObject.parseObject(response.body());
if (resultJson.containsKey("code") && resultJson.getString("code").equals("200")) {
JSONObject datas = resultJson.getJSONObject("data");
@@ -970,8 +1011,40 @@
// 2. 瑙ｇ爜 Base64 涓哄瓧鑺傛暟缁�
byte[] fileBytes = Base64.getDecoder().decode(base64Str);
+ File file = new File(targetPath);
+
+ // 1. 鑾峰彇鐖剁洰褰曞璞�
+ File parentDir = file.getParentFile();
+
+ // 2. 濡傛灉鐖剁洰褰曚笉涓虹┖涓斾笉瀛樺湪锛屽垯鍒涘缓鎵�鏈夊繀闇�鐨勭埗鐩綍
+ if (parentDir != null && !parentDir.exists()) {
+ // mkdirs() 浼氶�掑綊鍒涘缓鎵�鏈変笉瀛樺湪鐨勭埗鐩綍
+ // 蹇呴』妫�鏌ヨ繑鍥炲�硷紝鍥犱负鍙兘鍥犳潈闄愪笉瓒虫垨璺緞闈炴硶鑰屽け璐�
+ if (!parentDir.mkdirs()) {
+ // 濡傛灉 mkdirs 杩斿洖 false锛屽啀娆℃鏌ユ槸鍚﹀瓨鍦紙澶勭悊骞跺彂鎯呭喌锛�
+ if (!parentDir.exists()) {
+ log.error("鏃犳硶鍒涘缓鐖剁洰褰�: " + parentDir.getAbsolutePath());
+ }
+ }
+ }
+
+ // 3. 鍒涘缓鏂囦欢鏈韩
+ // createNewFile() 浠呭湪鏂囦欢涓嶅瓨鍦ㄦ椂鍒涘缓锛屽鏋滃凡瀛樺湪鍒欒繑鍥� false 浣嗕笉鎶ラ敊
+ if (!file.exists()) {
+ boolean created = false;
+ try {
+ created = file.createNewFile();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ if (!created) {
+ // 澶勭悊骞跺彂鍒涘缓澶辫触鎴栧叾浠栧紓甯�
+ log.error("鏃犳硶鍒涘缓鏂囦欢: " + file.getAbsolutePath());
+ }
+ }
+
// 3. 灏嗗瓧鑺傛暟缁勫啓鍏ユ枃浠�
- try (FileOutputStream fos = new FileOutputStream(new File(targetPath))) {
+ try (FileOutputStream fos = new FileOutputStream(file)) {
fos.write(fileBytes);
fos.flush();
System.out.println("鏂囦欢淇濆瓨鎴愬姛: " + targetPath);
@@ -1083,22 +1156,76 @@
data.put("bustypeCode", "ZBYXGLXT");//浜ゆ槗绫诲瀷缂栫爜 鏆備及榛樿ZGYSFP锛岄攢鍞粯璁BYXGLXT
data.put("contractNo", contract.getContractNo());
data.put("oriCurrencyCode", "CNY");//甯佺
+
data.put("_status", "Insert");
GenInvoiceInfoVo vo = BeanUtil.copyProperties(JSONObject.parseObject(contractInvoice.getInvoicePreview()), GenInvoiceInfoVo.class);
JSONArray bodyItem = new JSONArray();
- for (InvoiceItemVo invoiceItemVo : vo.getInvoiceItemList()) {
+ for (InvoiceItemVo invoiceItemVo : vo.getBipVo().getItemList()) {
JSONObject item = new JSONObject();
+ item.put("expenseItemCode",invoiceItemVo.getJjsx());//缁忔祹浜嬮」
item.put("invoiceNo", contractInvoice.getInvoiceNo());
item.put("taxRate", invoiceItemVo.getTaxRate());
item.put("oriTaxAmount", invoiceItemVo.getPriceTax());
item.put("oriTaxIncludedAmount", invoiceItemVo.getPriceAndTax());
item.put("_status", "Insert");
-
+ JSONObject freeChId = new JSONObject();
+ freeChId.put("GX08",invoiceItemVo.getHsdy());//鏍哥畻鍗曞厓
+ freeChId.put("YSYF31",invoiceItemVo.getSfjs());//鏄惁璁＄◣
+ freeChId.put("JT04",invoiceItemVo.getHsjylx());//鏍哥畻浜ゆ槗绫诲瀷 0101 闆嗗洟澶栭儴 01020301 涓夌骇鍒嗗瓙鍏徃闂� 01020302 涓夌骇鍒嗗叕鍙镐笌瀛愬瓙鍏徃涔嬮棿
+ freeChId.put("JT06",invoiceItemVo.getKxmx());//娆鹃」鏄庣粏
+ freeChId.put("JT32",invoiceItemVo.getZyys());//浣滀笟瑕佺礌
+ freeChId.put("zzbkfl",invoiceItemVo.getBkfl());//鏉垮潡鍒嗙被
+ freeChId.put("JT12",invoiceItemVo.getCpwlfl());//浜у搧鐗╂枡鍒嗙被
+ item.put("freeChId",freeChId);
bodyItem.add(item);
}
data.put("bodyItem", bodyItem);
+ JSONObject freeChId = new JSONObject();
+ freeChId.put("YSYF_SFZY",vo.getBipVo().getSfzy());//鏄惁涓昏惀
+ freeChId.put("fk_038",vo.getBipVo().getPzzdr());//鍑瘉鍒跺崟浜�
+ freeChId.put("YSYF_08",vo.getBipVo().getSfnbwl());//鏄惁鍐呴儴寰�鏉�
+ freeChId.put("YSYF24",vo.getBipVo().getSfjyjs());//鏄惁绠�鏄撹绋�
+ freeChId.put("fk_002",vo.getBipVo().getFjzs());//闄勪欢1
+ freeChId.put("GX08",vo.getBipVo().getHsdy());//鏍哥畻鍗曞厓
+ freeChId.put("TzMY042",contract.getExpirationDate());//棰勮鍥炴鏃ユ湡
+ data.put("freeChId", freeChId);
+ data.put("remarks",vo.getBipVo().getZy());//鎽樿
jsonObject.put("data", data);
return jsonObject;
+ }
+
+ private String transEconomic(String economicMatters) {
+ if (economicMatters.equals("1")){
+ return "09001006";
+ }
+ if (economicMatters.equals("2")){
+ return "09004003";
+ }
+ if (economicMatters.equals("3")){
+ return "09003005";
+ }
+ if (economicMatters.equals("4")){
+ return "09002042";
+ }
+ if (economicMatters.equals("5")){
+ return "09002002";
+ }
+ if (economicMatters.equals("6")){
+ return "09004001";
+ }
+ if (economicMatters.equals("7")){
+ return "09003002001";
+ }
+ if (economicMatters.equals("8")){
+ return "09003002002";
+ }
+ if (economicMatters.equals("9")){
+ return "09003002003";
+ }
+ if (economicMatters.equals("10")){
+ return "09003003";
+ }
+ return "";
}
@Override
@@ -1106,7 +1233,7 @@
if (bwFlag) {
List<ContractInvoice> contractInvoices = baseMapper.selectList(Wrappers.<ContractInvoice>lambdaQuery()
.eq(ContractInvoice::getInvoiceCategory, "2").eq(ContractInvoice::getInvoiceStatus, "3"));
- if (ArrayUtil.isNotEmpty(contractInvoices)) {
+ if (CollUtil.isNotEmpty(contractInvoices)) {
contractInvoices.stream().forEach(contractInvoice -> {
JSONObject request = new JSONObject();
request.put("taxNo", contractInvoice.getTaxNo());
@@ -1126,7 +1253,7 @@
return;
}
JSONArray models = resultObj.getJSONArray("model");
- if (ArrayUtil.isNotEmpty(models)) {
+ if (CollUtil.isNotEmpty(models)) {
JSONObject model = (JSONObject) models.get(0);
if (StrUtil.isEmpty(model.getString("confirmBillingMark")) || StrUtil.equals(model.getString("confirmBillingMark"), "N")) {
@@ -1137,7 +1264,7 @@
contractInvoice.setInvoiceNo(model.getString("redInvoiceNo"));
contractInvoice.setRedReversal("1");
//鎺ㄩ�丅IP
- pushBipInvoice(contractInvoice);
+// pushBipInvoice(contractInvoice);
}
}
});
@@ -1164,15 +1291,15 @@
//钃濈エ
if (invoice.getInvoiceCategory().equals("1")) {
- // TODO 寮�钃濈エ鎺ュ彛鏈哄姩杞�
- if (StrUtil.equals(vo.getInvoiceVehicleType(), "3")) {
+ // TODO 寮�钃濈エ鎺ュ彛鏈哄姩杞﹂攢鍞�
+ if (StrUtil.equals(vo.getInvoiceVehicleType(), "4")) {
JSONObject request = genBlueInvoiceVehicle(vo, invoice.getSerialNo(), dept);
String requestId = IdUtil.fastUUID();
invoice.setBwRequestId(requestId);
invoice.setBwRequestParam(request.toJSONString());
- log.info("鏈哄姩杞﹀彂绁ㄥ紑鍏疯姹傛帴鍙ｅ叆鍙�:{}", request.toJSONString());
+ log.info("鏈哄姩杞﹂攢鍞粺涓�鍙戠エ寮�鍏疯姹傛帴鍙ｅ叆鍙�:{}", request.toJSONString());
String result = HttpUtil.post(bwUrl + "method=baiwang.output.invoice.vehicleissue&version=1.0&requestId=" + requestId, request.toJSONString());
- log.info("鏈哄姩杞﹀彂绁ㄥ紑鍏疯姹傛帴鍙ｅ洖鍙�:{}", result);
+ log.info("鏈哄姩杞﹂攢鍞粺涓�鍙戠エ寮�鍏疯姹傛帴鍙ｅ洖鍙�:{}", result);
saveBwRequestRecord("baiwang.output.invoice.vehicleissue", requestId, request.toJSONString(), result);
JSONObject resultObj = JSONObject.parseObject(result);
if (resultObj.containsKey("requestId") && StrUtil.equals(resultObj.getString("requestId"), requestId) &&
@@ -1186,13 +1313,39 @@
invoice.setInvoiceTime(invoiceDate);
invoice.setInvoiceNo(modelJson.getString("invoiceNo"));
//鎺ㄩ�丅IP
- pushBipInvoice(invoice);
+// pushBipInvoice(invoice);
+ }
+ }
+
+ // TODO 寮�钃濈エ鎺ュ彛鏈哄姩杞︿笓鐢�
+ if (StrUtil.equals(vo.getInvoiceVehicleType(), "3")) {
+ JSONObject request = genBlueInvoiceVehiclePre(vo, invoice.getSerialNo(), dept);
+ String requestId = IdUtil.fastUUID();
+ invoice.setBwRequestId(requestId);
+ invoice.setBwRequestParam(request.toJSONString());
+ log.info("鏈哄姩杞︿笓鐢ㄥ彂绁ㄥ紑鍏疯姹傛帴鍙ｅ叆鍙�:{}", request.toJSONString());
+ String result = HttpUtil.post(bwUrl + "method=baiwang.output.invoice.issue&version=1.0&requestId=" + requestId, request.toJSONString());
+ log.info("鏈哄姩杞︿笓鐢ㄥ彂绁ㄥ紑鍏疯姹傛帴鍙ｅ洖鍙�:{}", result);
+ saveBwRequestRecord("baiwang.output.invoice.issue", requestId, request.toJSONString(), result);
+ JSONObject resultObj = JSONObject.parseObject(result);
+ if (resultObj.containsKey("requestId") && StrUtil.equals(resultObj.getString("requestId"), requestId) &&
+ resultObj.getBoolean("success")) {
+ log.info("寮�绁ㄦ垚鍔燂紒锛侊紒");
+ invoice.setBwRequestResult("1");
+ }
+ JSONObject modelJson = resultObj.getJSONObject("model");
+ if (ObjUtil.isNotNull(modelJson)) {
+ Date invoiceDate = DateUtil.parse(modelJson.getString("invoiceDate"), DatePattern.PURE_DATETIME_PATTERN);
+ invoice.setInvoiceTime(invoiceDate);
+ invoice.setInvoiceNo(modelJson.getString("invoiceNo"));
+ //鎺ㄩ�丅IP
+// pushBipInvoice(invoice);
}
}
// TODO 寮�钃濈エ鎺ュ彛 闈炴満鍔ㄨ溅
- JSONObject request = genBlueInvoice(vo, invoice.getSerialNo(), dept);
- if (bwFlag) {
+ if (!StrUtil.equals(vo.getInvoiceVehicleType(), "3")&&!StrUtil.equals(vo.getInvoiceVehicleType(), "4")) {
+ JSONObject request = genBlueInvoice(vo, invoice.getSerialNo(), dept);
String requestId = IdUtil.fastUUID();
invoice.setBwRequestId(requestId);
invoice.setBwRequestParam(request.toJSONString());
@@ -1215,7 +1368,7 @@
invoice.setInvoiceTime(invoiceDate);
invoice.setInvoiceNo(model.getString("invoiceNo"));
//鎺ㄩ�丅IP
- pushBipInvoice(invoice);
+// pushBipInvoice(invoice);
}
}
}
@@ -1258,7 +1411,7 @@
//鍒ゆ柇鏄惁鏈夊彲寮�绁ㄨ褰�
List<ContractPaymentSchedule> scheduleList = contractPaymentScheduleMapper.selectList(Wrappers.<ContractPaymentSchedule>lambdaQuery()
.eq(ContractPaymentSchedule::getContractId, contract.getId()).eq(ContractPaymentSchedule::getInvoiceFlag, "0"));
- if (ArrayUtil.isEmpty(scheduleList)) {
+ if (CollUtil.isEmpty(scheduleList)) {
contract.setBillingStatus("3");
} else {
contract.setBillingStatus("2");
@@ -1280,7 +1433,7 @@
//鍒ゆ柇鏄惁鏈夊彲寮�绁ㄨ褰�
List<ContractPaymentSchedule> scheduleList = contractPaymentScheduleMapper.selectList(Wrappers.<ContractPaymentSchedule>lambdaQuery()
.eq(ContractPaymentSchedule::getContractId, contract.getId()));
- if (ArrayUtil.isEmpty(scheduleList)) {
+ if (CollUtil.isEmpty(scheduleList)) {
contract.setBillingStatus("1");
} else {
contract.setBillingStatus("2");
@@ -1295,7 +1448,7 @@
if (invoice.getInvoiceCategory().equals("2")) {
// TODO 寮�绾㈢エ鎺ュ彛
ContractInvoice blueInvoice = baseMapper.selectById(invoice.getBlueInvoiceId());
- JSONObject request = genRedInvoice(contract, blueInvoice, invoice.getSerialNo());
+ JSONObject request = genRedInvoice(contract,blueInvoice, invoice, invoice.getSerialNo());
String requestId = IdUtil.fastUUID();
invoice.setBwRequestId(requestId);
invoice.setBwRequestParam(request.toJSONString());
@@ -1323,12 +1476,12 @@
invoice.setInvoiceNo(model.getString("redInvoiceNo"));
invoice.setRedReversal("1");
//鎺ㄩ�丅IP
- pushBipInvoice(invoice);
+// pushBipInvoice(invoice);
}
}
}
baseMapper.updateById(invoice);
- contract.setBillingAmout(contract.getBillingAmout().subtract(invoice.getInvoiceTotalPriceTax()));
+ contract.setBillingAmout(contract.getBillingAmout().add(invoice.getInvoiceTotalPriceTax()));
//闃叉閲嶅瀹″紑绁ㄥ鏍搁�氳繃鍚� 寮�绁ㄩ噾棰濅负璐�
if (contract.getBillingAmout().compareTo(new BigDecimal("0")) < 0) {
contract.setBillingAmout(new BigDecimal("0"));
@@ -1339,7 +1492,7 @@
if (StrUtil.isNotBlank(vo.getAdvanceInvoice())) {
//杩樺師棰勫紑鏁伴噺
List<ContractOutBoundInvoiceVo> outBoundInvoiceVoList = BeanUtil.copyToList(JSONArray.parseArray(blueInvoice.getInvoicePreviewParam()), ContractOutBoundInvoiceVo.class);
- if (ArrayUtil.isNotEmpty(outBoundInvoiceVoList)) {
+ if (CollUtil.isNotEmpty(outBoundInvoiceVoList)) {
outBoundInvoiceVoList.stream().forEach(contractOutBoundInvoiceVo -> {
ContractSubjectMatter subjectMatter = contractSubjectMatterMapper.selectById(contractOutBoundInvoiceVo.getContractOutBoundId());
if (ObjUtil.isNotNull(subjectMatter)) {
@@ -1359,7 +1512,7 @@
if (!StrUtil.equals(contract.getContractCategory(), "water_house")) {
//鏇存柊鍚堝悓鍑哄簱鍗曠姸鎬�
List<ContractOutBoundInvoiceVo> outBoundInvoiceVoList = BeanUtil.copyToList(JSONArray.parseArray(blueInvoice.getInvoicePreviewParam()), ContractOutBoundInvoiceVo.class);
- if (ArrayUtil.isNotEmpty(outBoundInvoiceVoList)) {
+ if (CollUtil.isNotEmpty(outBoundInvoiceVoList)) {
outBoundInvoiceVoList.stream().forEach(contractOutBoundInvoiceVo -> {
ContractOutBound contractOutBound = contractOutBoundMapper.selectById(contractOutBoundInvoiceVo.getContractOutBoundId());
contractOutBound.setInvoiceNum(contractOutBound.getInvoiceNum().subtract(contractOutBoundInvoiceVo.getInvoiceNum()));
@@ -1369,7 +1522,7 @@
} else {
//鏇存柊鍚堝悓鎴跨 姘寸數 璐瑰紑绁ㄧ姸鎬�
List<ContractOutBoundInvoiceVo> outBoundInvoiceVoList = BeanUtil.copyToList(JSONArray.parseArray(blueInvoice.getInvoicePreviewParam()), ContractOutBoundInvoiceVo.class);
- if (ArrayUtil.isNotEmpty(outBoundInvoiceVoList)) {
+ if (CollUtil.isNotEmpty(outBoundInvoiceVoList)) {
outBoundInvoiceVoList.stream().forEach(contractOutBoundInvoiceVo -> {
ContractPaymentSchedule schedule = contractPaymentScheduleMapper.selectById(contractOutBoundInvoiceVo.getContractOutBoundId());
schedule.setInvoiceFlag("0");
@@ -1379,6 +1532,60 @@
}
}
+ }
+
+ private JSONObject genBlueInvoiceVehiclePre(GenInvoiceInfoVo vo, String serialNo, SysDept dept) {
+ JSONObject vechicleData = JSONObject.parseObject(vo.getVehicleData());
+ JSONObject jsonObject = new JSONObject();
+ //閿�鏂�
+ jsonObject.put("taxNo", vo.getPartyBOrgCode());//绋庡彿
+ jsonObject.put("taxUserName", SecurityUtils.getUser().getPhone());//鏁扮數璐﹀彿
+
+ jsonObject.put("formatGenerate", false);//鏄惁闇�瑕佺敓鎴愮増寮忚繑鍥炵増寮忛摼鎺�(true / false)
+ jsonObject.put("formatPushType", false);//鐗堝紡鐢熸垚鏄惁鎺ㄩ��(true / false)
+ jsonObject.put("taxUserName", dept.getInvoiceContact());
+ //data
+ JSONObject data = new JSONObject();
+ data.put("invoiceTypeCode", "01");
+ data.put("invoiceType", "0");
+ data.put("serialNo", serialNo);
+ data.put("invoiceSpecialMark","14");//鐗瑰畾涓氬姟鏍囪瘑 14-鏈哄姩杞�
+// data.put("taxationMethod","2");
+// data.put("taxationLabel","02");//鍙戠エ绫诲瀷浠ｇ爜涓衡��01-鏁扮數鍙戠エ锛堝鍊肩◣涓撶敤鍙戠エ锛夈��02-鏁扮數鍙戠エ锛堟櫘閫氬彂绁級鈥濇椂涓斿緛绋庢柟寮忎负鈥�2-宸寰佺◣鈥濇椂蹇呭～
+ List<JSONObject> invoiceDetailsList = new ArrayList<>();
+ Integer lineNo = 1;
+ //data.invoiceDetailsList
+ for (InvoiceItemVo invoiceItemVo : vo.getInvoiceItemList()) {
+ JSONObject invoiceDetail = new JSONObject();
+
+ invoiceDetail.put("goodsLineNo", lineNo);
+ invoiceDetail.put("goodsName", invoiceItemVo.getItemName());
+ invoiceDetail.put("projectName", invoiceItemVo.getItemName());
+ invoiceDetail.put("goodsCode", invoiceItemVo.getTaxCode());
+ invoiceDetail.put("goodsTaxRate", invoiceItemVo.getTaxRate().divide(new BigDecimal("100")));
+ invoiceDetail.put("goodsUnit", "杈�");
+ invoiceDetail.put("goodsQuantity", invoiceItemVo.getQuantity());
+// invoiceDetail.put("goodsPrice", invoiceItemVo.getUnitPrice());
+ invoiceDetail.put("goodsSpecification", vo.getVehicleNo());
+ invoiceDetail.put("goodsTotalPrice", invoiceItemVo.getPriceNoTax());
+ invoiceDetail.put("goodsTotalTax", invoiceItemVo.getPriceTax());
+
+ invoiceDetailsList.add(invoiceDetail);
+ lineNo++;
+ }
+ data.put("invoiceDetailsList", invoiceDetailsList);
+ //璐柟
+ data.put("buyerTaxNo", vo.getPartyAOrgCode());
+ data.put("buyerName", vo.getPartyA());
+ data.put("sellerTaxNo", vo.getPartyBOrgCode());// TODO 绋庡姟鎬诲眬绯荤粺鐧婚檰浜烘墜鏈哄彿
+ data.put("invoiceTotalPrice", vo.getTotalPrice().subtract(vo.getTotalTax()));
+ data.put("invoiceTotalPriceTax", vo.getTotalPrice());
+ data.put("invoiceTotalTax", vo.getTotalTax());
+ data.put("buyerBankName", vo.getPartyAOpenBank());
+ data.put("buyerBankNumber", vo.getPartyABankAccount());
+
+ jsonObject.put("data", data);
+ return jsonObject;
}
private JSONObject genBlueInvoiceVehicle(GenInvoiceInfoVo vo, String serialNo, SysDept dept) {
@@ -1442,7 +1649,7 @@
if (!StrUtil.equals(contract.getContractCategory(), "water_house")) {
//鏇存柊鍚堝悓鍑哄簱鍗曠姸鎬�
List<ContractOutBoundInvoiceVo> outBoundInvoiceVoList = BeanUtil.copyToList(JSONArray.parseArray(invoice.getInvoicePreviewParam()), ContractOutBoundInvoiceVo.class);
- if (ArrayUtil.isNotEmpty(outBoundInvoiceVoList)) {
+ if (CollUtil.isNotEmpty(outBoundInvoiceVoList)) {
outBoundInvoiceVoList.stream().forEach(contractOutBoundInvoiceVo -> {
ContractOutBound contractOutBound = contractOutBoundMapper.selectById(contractOutBoundInvoiceVo.getContractOutBoundId());
contractOutBound.setInvoiceNum(contractOutBound.getInvoiceNum().subtract(contractOutBoundInvoiceVo.getInvoiceNum()));
@@ -1452,7 +1659,7 @@
} else {
//鏇存柊鍚堝悓鎴跨 姘寸數 璐瑰紑绁ㄧ姸鎬�
List<ContractOutBoundInvoiceVo> outBoundInvoiceVoList = BeanUtil.copyToList(JSONArray.parseArray(invoice.getInvoicePreviewParam()), ContractOutBoundInvoiceVo.class);
- if (ArrayUtil.isNotEmpty(outBoundInvoiceVoList)) {
+ if (CollUtil.isNotEmpty(outBoundInvoiceVoList)) {
outBoundInvoiceVoList.stream().forEach(contractOutBoundInvoiceVo -> {
ContractPaymentSchedule schedule = contractPaymentScheduleMapper.selectById(contractOutBoundInvoiceVo.getContractOutBoundId());
schedule.setInvoiceFlag("0");
@@ -1511,7 +1718,7 @@
invoice.setInvoiceTime(invoiceDate);
invoice.setInvoiceNo(model.getString("invoiceNo"));
//鎺ㄩ�丅IP
- pushBipInvoice(invoice);
+// pushBipInvoice(invoice);
}
}
}
@@ -1535,7 +1742,7 @@
}
invoice.setBwRequestResult("1");
JSONArray models = resultObj.getJSONArray("model");
- if (ArrayUtil.isNotEmpty(models)) {
+ if (CollUtil.isNotEmpty(models)) {
JSONObject model = (JSONObject) models.get(0);
if (StrUtil.isEmpty(model.getString("confirmBillingMark")) || StrUtil.equals(model.getString("confirmBillingMark"), "N")) {
//绛夊緟纭
@@ -1545,7 +1752,7 @@
invoice.setInvoiceNo(model.getString("redInvoiceNo"));
invoice.setRedReversal("1");
//鎺ㄩ�丅IP
- pushBipInvoice(invoice);
+// pushBipInvoice(invoice);
}
}
}
@@ -1716,6 +1923,51 @@
return R.ok();
}
+ @Override
+ public ContractInvoice getById(Long id) {
+ return baseMapper.selectById(id);
+ }
+
+ @Override
+ public R bipPushPdf(Long invoiceId) {
+ ContractInvoice invoice = baseMapper.selectById(invoiceId);
+ pushBipInvoicePdf(invoice);
+ return R.ok();
+ }
+
+ @Override
+ public R selectBipByKey(String dictKey) {
+ List<BipDict> bipDictList = bipDictMapper.selectList(Wrappers.<BipDict>lambdaQuery().eq(BipDict::getDictKey,dictKey));
+ if (CollUtil.isNotEmpty(bipDictList)){
+ // 鏉冮檺鍐呴儴闂�
+ List<TreeNode<Long>> collect = bipDictList.stream()
+ .map(dict -> {
+ TreeNode<Long> treeNode = new TreeNode<>();
+ treeNode.setId(dict.getId());
+ treeNode.setParentId(dict.getParentId());
+ treeNode.setName(dict.getDictName());
+ treeNode.setWeight(dict.getDictCode());
+ return treeNode;
+ })
+ .collect(Collectors.toList());
+
+ return R.ok(TreeUtil.build(collect,0L));
+ }
+ return R.failed("瀛楀吀鑾峰彇澶辫触");
+ }
+
+ @Override
+ public R saveAndPush(ContractInvoiceUpateDTO upateDTO) {
+ ContractInvoice invoice = baseMapper.selectById(upateDTO.getId());
+ invoice.setInvoicePreview(upateDTO.getInvoicePreview());
+ baseMapper.updateById(invoice);
+ R r = bipPush(invoice.getId());
+ if (!r.isOk()){
+ return r;
+ }
+ return bipPushPdf(invoice.getId());
+ }
+
public static void main(String[] args) {
File file = new File("d://tmp//" + IdUtil.fastUUID() + ".pdf");
HttpUtil.downloadFile("http://fp.baiwang.com/format/d?d=BB99645F8ED2AE7D2055E7D29330D366B7CAE92C278C6BB84D222610CEC2118D", 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 2e83a50..13a4196 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
@@ -54,13 +54,14 @@
}
- private void saveScheduleProcess(ContractPaymentScheduleProcessAddDTO addDTO, ContractPaymentSchedule schedule) {
- //灞ョ害
- ContractPaymentScheduleProcess contractPaymentScheduleProcess = BeanUtil.copyProperties(addDTO, ContractPaymentScheduleProcess.class);
+ public void saveScheduleProcess(Date date, ContractPaymentSchedule schedule) {
+ //鏇存柊灞ョ害
+ ContractPaymentScheduleProcess contractPaymentScheduleProcess = new ContractPaymentScheduleProcess();
contractPaymentScheduleProcess.setContractId(schedule.getContractId());
contractPaymentScheduleProcess.setContractName(schedule.getContractName());
contractPaymentScheduleProcess.setScheduleId(schedule.getId());
contractPaymentScheduleProcess.setScheduleName(schedule.getStageName());
+ contractPaymentScheduleProcess.setProcessDate(date);
ContractPaymentScheduleProcess lastProcess = baseMapper.selectOne(Wrappers.<ContractPaymentScheduleProcess>lambdaQuery().eq(ContractPaymentScheduleProcess::getContractId, schedule.getContractId())
.eq(ContractPaymentScheduleProcess::getScheduleId, schedule.getId()).last("limit 1"));
if (ObjUtil.isNull(lastProcess)) {
@@ -89,7 +90,7 @@
updateCurrentSchedule(addDTO.getProcessDate(), schedule, contract);
//淇濆瓨灞ョ害璁板綍
- saveScheduleProcess(addDTO, schedule);
+ saveScheduleProcess(addDTO.getProcessDate(), schedule);
return R.ok();
}
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 9f3abfb..e348f89 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
@@ -92,6 +92,7 @@
private final ContractOutBoundMapper contractOutBoundMapper;
private final RemoteDictService remoteDictService;
private final ContractPaymentScheduleProcessService processService;
+ private final ContractSubjectMatterChangeMapper changeMapper;
@Value("${erp.ymj}")
private String ymjErp;
@@ -435,9 +436,35 @@
detailVo.setPaymentSlip(slipList);
}
BusinessCustomer customer = businessCustomerMapper.selectById(contract.getPartyAId());
+
+ ContractInvoiceBipVo bipVo = new ContractInvoiceBipVo();
+ bipVo.setDjrq(DateUtil.today());
+ R<SysDept> r = remoteDeptService.getById(contract.getPartyBId());
+ if (r.isOk()) {
+ bipVo.setKpzz(r.getData().getBipCode());
+ }
+
if (ObjUtil.isNotNull(customer)) {
detailVo.setInvoiceType(customer.getInvoiceType());
+ bipVo.setYwzz(r.getData().getBipCode());
}
+ R<SysDept> rDept = remoteDeptService.getById(SecurityUtils.getUser().getDeptId());
+ if (rDept.isOk()) {
+ bipVo.setBm(rDept.getData().getOrgCode());
+ bipVo.setHsdy(rDept.getData().getOrgCode());
+ }
+ bipVo.setYwy(SecurityUtils.getUser().getNickname());
+ bipVo.setPzzdr(SecurityUtils.getUser().getNickname());
+ bipVo.setJylx("ZBYXGLXT");
+ bipVo.setWldxlx("1");
+ bipVo.setKh(customer.getCreditCode());
+ bipVo.setBz("浜烘皯甯�");
+ bipVo.setFjzs("1");
+ bipVo.setSfzy("鏄�");
+ bipVo.setSfnbwl("鏄�");
+ bipVo.setSfjyjs("鍚�");
+ bipVo.setDjfx("1");
+ detailVo.setBipVo(bipVo);
return detailVo;
}
@@ -569,7 +596,7 @@
request.put("moneySum", contract.getAmount());
request.put("signManner", "闈㈢");
request.put("salesman", "");
- if (ArrayUtil.isNotEmpty(subjectMatterList)) {
+ if (CollUtil.isNotEmpty(subjectMatterList)) {
JSONArray subjectMatter = new JSONArray();
subjectMatterList.stream().forEach(contractSubjectMatter -> {
JSONObject subjectMatterItem = new JSONObject();
@@ -623,7 +650,7 @@
request.put("moneySum", contract.getAmount());
request.put("signManner", "闈㈢");
request.put("salesman", "");
- if (ArrayUtil.isNotEmpty(subjectMatterList)) {
+ if (CollUtil.isNotEmpty(subjectMatterList)) {
JSONArray subjectMatter = new JSONArray();
subjectMatterList.stream().forEach(contractSubjectMatter -> {
JSONObject subjectMatterItem = new JSONObject();
@@ -865,7 +892,7 @@
.lt(ContractPaymentSchedule::getEffectiveEndDate, DateUtil.today())
.ne(ContractPaymentSchedule::getPaymentStatus, "2")
.ne(ContractPaymentSchedule::getPaymentStatus, 3));
- if (ArrayUtil.isNotEmpty(scheduleList)) {
+ if (CollUtil.isNotEmpty(scheduleList)) {
scheduleList.stream().forEach(contractPaymentSchedule -> {
Contract contract = baseMapper.selectById(contractPaymentSchedule.getContractId());
if (ObjUtil.isNotNull(contract)) {
@@ -1073,7 +1100,7 @@
public R genCycleReceiced() {
List<ContractExecDate> execDateList = contractExecDateMapper.selectList(Wrappers.<ContractExecDate>lambdaQuery()
.le(ContractExecDate::getExecDate, DateUtil.today()).eq(ContractExecDate::getGenFlag, "0"));
- if (ArrayUtil.isNotEmpty(execDateList)) {
+ if (CollUtil.isNotEmpty(execDateList)) {
execDateList.stream().forEach(contractExecDate -> {
Contract contract = baseMapper.selectById(contractExecDate.getContractId());
ContractSubjectMatter subjectMatter = contractSubjectMatterMapper.selectOne(Wrappers.<ContractSubjectMatter>lambdaQuery()
@@ -1585,10 +1612,10 @@
@Override
public R addContractSgb(ContractAddDTO addDTO) {
- if (ArrayUtil.isEmpty(addDTO.getContractSubjectMatter())) {
+ if (CollUtil.isEmpty(addDTO.getContractSubjectMatter())) {
return R.failed("璇锋坊鍔犳爣鐨勭墿");
}
- if (ArrayUtil.isEmpty(addDTO.getContractPaymentSchedule())) {
+ if (CollUtil.isEmpty(addDTO.getContractPaymentSchedule())) {
return R.failed("璇锋坊鍔犱粯娆鹃樁娈垫垨浠樻闃舵缂哄皯");
}
if (!isValidPaymentStages(addDTO.getContractPaymentSchedule())) {
@@ -1637,7 +1664,7 @@
}
baseMapper.insert(contract);
- if (ArrayUtil.isNotEmpty(addDTO.getContractSubjectMatter())) {
+ if (CollUtil.isNotEmpty(addDTO.getContractSubjectMatter())) {
addDTO.getContractSubjectMatter().stream().forEach(contractSubjectMatterAddDTO -> {
ContractSubjectMatter subjectMatter = BeanUtil.copyProperties(contractSubjectMatterAddDTO, ContractSubjectMatter.class);
subjectMatter.setContractId(contract.getId());
@@ -1668,7 +1695,7 @@
}
- if (ArrayUtil.isNotEmpty(addDTO.getContractPaymentSchedule())) {
+ if (CollUtil.isNotEmpty(addDTO.getContractPaymentSchedule())) {
AtomicInteger index = new AtomicInteger(1);
addDTO.getContractPaymentSchedule().stream().forEach(contractPaymentScheduleAddDTO -> {
int currentIndex = index.getAndIncrement();
@@ -1711,10 +1738,10 @@
@Override
public R updateContractSgb(ContractUpdateDTO updateDTO) {
- if (ArrayUtil.isEmpty(updateDTO.getContractSubjectMatter())) {
+ if (CollUtil.isEmpty(updateDTO.getContractSubjectMatter())) {
return R.failed("璇锋坊鍔犳爣鐨勭墿");
}
- if (ArrayUtil.isEmpty(updateDTO.getContractPaymentSchedule())) {
+ if (CollUtil.isEmpty(updateDTO.getContractPaymentSchedule())) {
return R.failed("璇锋坊鍔犱粯娆鹃樁娈垫垨浠樻闃舵缂哄皯");
}
if (!isValidPaymentStages(updateDTO.getContractPaymentSchedule())) {
@@ -1747,7 +1774,7 @@
}
baseMapper.updateById(contract);
- if (ArrayUtil.isNotEmpty(updateDTO.getContractSubjectMatter())) {
+ if (CollUtil.isNotEmpty(updateDTO.getContractSubjectMatter())) {
contractSubjectMatterMapper.delete(Wrappers.<ContractSubjectMatter>lambdaQuery().eq(ContractSubjectMatter::getContractId, contract.getId()));
updateDTO.getContractSubjectMatter().stream().forEach(contractSubjectMatterAddDTO -> {
@@ -1773,7 +1800,7 @@
});
}
- if (ArrayUtil.isNotEmpty(updateDTO.getContractPaymentSchedule())) {
+ if (CollUtil.isNotEmpty(updateDTO.getContractPaymentSchedule())) {
contractPaymentScheduleMapper.delete(Wrappers.<ContractPaymentSchedule>lambdaQuery().eq(ContractPaymentSchedule::getContractId, contract.getId()));
AtomicInteger index = new AtomicInteger(1);
@@ -1966,21 +1993,21 @@
@Override
public Page fourAssociation(Page page, ContractQueryDTO queryDTO) {
Page<FourAssociationPageVo> page1 = baseMapper.fourAssociation(page, queryDTO, DataScope.of("comp_id"));
- if (ArrayUtil.isNotEmpty(page1.getRecords())) {
+ if (CollUtil.isNotEmpty(page1.getRecords())) {
page1.getRecords().stream().forEach(fourAssociationPageVo -> {
List<PaymentSlip> slips = paymentSlipMapper.selectList(Wrappers.<PaymentSlip>lambdaQuery().eq(PaymentSlip::getContractId, fourAssociationPageVo.getId())
.orderByAsc(PaymentSlip::getPaymentTime));
- if (ArrayUtil.isNotEmpty(slips)) {
+ if (CollUtil.isNotEmpty(slips)) {
fourAssociationPageVo.setSlipVoList(BeanUtil.copyToList(slips, ContractSlipVo.class));
}
List<ContractInvoice> invoices = contractInvoiceMapper.selectList(Wrappers.<ContractInvoice>lambdaQuery().eq(ContractInvoice::getContractId, fourAssociationPageVo.getId())
.orderByAsc(ContractInvoice::getInvoiceTime));
- if (ArrayUtil.isNotEmpty(invoices)) {
+ if (CollUtil.isNotEmpty(invoices)) {
fourAssociationPageVo.setInvoiceVoList(BeanUtil.copyToList(invoices, ContractInvoiceVo.class));
}
if (fourAssociationPageVo.getAmount().compareTo(fourAssociationPageVo.getPaidAmount()) == 0 &&
fourAssociationPageVo.getAmount().compareTo(fourAssociationPageVo.getBillingAmout()) == 0 &&
- ArrayUtil.isNotEmpty(slips) && ArrayUtil.isNotEmpty(invoices)
+ CollUtil.isNotEmpty(slips) && CollUtil.isNotEmpty(invoices)
) {
fourAssociationPageVo.setAssociation("宸插畬鎴�");
}
@@ -2535,4 +2562,48 @@
}
return R.ok();
}
+
+
+ @Override
+ public R subjectChange(ContractSubjectChangeDTO changeDTO) {
+ Contract contract = baseMapper.selectById(changeDTO.getId());
+ if (ObjUtil.isNull(contract)){
+ return R.failed("鍚堝悓鐘舵�佸紓甯�");
+ }
+ if (contract.getBillingAmout().compareTo(new BigDecimal("0"))>0){
+ return R.failed("鍚堝悓宸插紑绁紝涓嶈兘杩涜鍙樻洿");
+ }
+ if (ObjUtil.isNotNull(contract.getOutBoundAmout())&&contract.getOutBoundAmout().compareTo(new BigDecimal("0"))>0){
+ return R.failed("鍚堝悓鏍囩殑鐗╁凡鍑哄簱锛屼笉鑳借繘琛屽彉鏇�");
+ }
+ if (CollUtil.isEmpty(changeDTO.getContractSubjectMatter())){
+ return R.failed("鍚堝悓鍙樻洿鍚庢爣鐨勭墿涓嶈兘涓虹┖");
+ }
+ BigDecimal changeAmount = changeDTO.getContractSubjectMatter().stream().map(subject->subject.getUnitPrice().multiply(subject.getQuantity())).reduce(BigDecimal.ZERO,BigDecimal::add);
+ if (contract.getAmount().compareTo(changeAmount)!=0){
+ return R.failed("鍚堝悓鍙樻洿鍚庢爣鐨勭墿鎬讳环蹇呴』涓庡悎鍚屾�讳环涓�鑷�");
+ }
+ List<ContractSubjectMatter> beforeList = contractSubjectMatterMapper.selectList(Wrappers.<ContractSubjectMatter>lambdaQuery().eq(ContractSubjectMatter::getContractId,changeDTO.getId()));
+ ContractSubjectMatterChange change = new ContractSubjectMatterChange();
+ change.setContractId(contract.getId());
+ change.setBeforeChange(JSONObject.toJSONString(beforeList));
+ change.setAfterChange(JSONObject.toJSONString(changeDTO.getContractSubjectMatter()));
+ changeMapper.insert(change);
+ contractSubjectMatterMapper.delete(Wrappers.<ContractSubjectMatter>lambdaQuery().eq(ContractSubjectMatter::getContractId,changeDTO.getId()));
+ changeDTO.getContractSubjectMatter().stream().forEach(contractSubjectMatterAddDTO -> {
+ ContractSubjectMatter subjectMatter = BeanUtil.copyProperties(contractSubjectMatterAddDTO, ContractSubjectMatter.class);
+ subjectMatter.setContractId(contract.getId());
+ subjectMatter.setLineNo(ItemGeneratorUtil.nextId());
+ subjectMatter.setDeliveredQuantity(new BigDecimal("0"));
+ subjectMatter.setDeliveryStatus(0);
+ subjectMatter.setTotalAmount(contractSubjectMatterAddDTO.getQuantity().multiply(contractSubjectMatterAddDTO.getUnitPrice()));
+ contractSubjectMatterMapper.insert(subjectMatter);
+ });
+ return R.ok();
+ }
+
+ @Override
+ public Page subjectChangePage(Page page, ContracQueryDTO queryDTO) {
+ return changeMapper.subjectChangePage(page,queryDTO,DataScope.of("comp_id"));
+ }
}
diff --git a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/MeterReadRecordServiceImpl.java b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/MeterReadRecordServiceImpl.java
index baa79ff..3b29a55 100644
--- a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/MeterReadRecordServiceImpl.java
+++ b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/MeterReadRecordServiceImpl.java
@@ -1,7 +1,7 @@
package com.by4cloud.platformx.business.service.impl;
+import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.util.ArrayUtil;
import cn.hutool.core.util.ObjUtil;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -143,7 +143,7 @@
List<MeterReadRecord> recordList = baseMapper.selectList(Wrappers.<MeterReadRecord>lambdaQuery()
.eq(MeterReadRecord::getContractId,contract.getId())
.isNull(MeterReadRecord::getMeterReadNum));
- if (ArrayUtil.isEmpty(execDateList)&&ArrayUtil.isEmpty(recordList)){
+ if (CollUtil.isEmpty(execDateList)&& CollUtil.isEmpty(recordList)){
List<PaymentConfirm> confirmList = paymentConfirmMapper.selectList(Wrappers.<PaymentConfirm>lambdaQuery()
.eq(PaymentConfirm::getContractId, contract.getId())
.and(wrapper -> wrapper
@@ -153,7 +153,7 @@
.or()
.eq(PaymentConfirm::getBusinessType, "涓嶅緛绋庤嚜鏉ユ按搴旀敹")
));
- if (ArrayUtil.isNotEmpty(confirmList)){
+ if (CollUtil.isNotEmpty(confirmList)){
BigDecimal total = confirmList.stream().map(PaymentConfirm::getTransationAmount).filter(amount -> amount != null).reduce(BigDecimal.ZERO, BigDecimal::add);
contract.setAmount(total);
contractMapper.updateById(contract);
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 7443d48..57f2256 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
@@ -337,18 +337,6 @@
// beforeSchedule.setEffectiveEndDate(schedule.getEffectiveDate());
// scheduleMapper.updateById(beforeSchedule);
// }
- //鏇存柊灞ョ害
- ContractPaymentScheduleProcess contractPaymentScheduleProcess = new ContractPaymentScheduleProcess();
- contractPaymentScheduleProcess.setContractId(schedule.getContractId());
- contractPaymentScheduleProcess.setContractName(schedule.getContractName());
- contractPaymentScheduleProcess.setScheduleId(schedule.getId());
- contractPaymentScheduleProcess.setScheduleName(schedule.getStageName());
- contractPaymentScheduleProcess.setProcessDate(addDTO.getOutBoundTime());
- ContractPaymentScheduleProcess lastProcess = scheduleProcessMapper.selectOne(Wrappers.<ContractPaymentScheduleProcess>lambdaQuery().eq(ContractPaymentScheduleProcess::getContractId, schedule.getContractId())
- .eq(ContractPaymentScheduleProcess::getScheduleId, schedule.getId()).last("limit 1"));
- if (ObjUtil.isNull(lastProcess)) {
- scheduleProcessMapper.insert(contractPaymentScheduleProcess);
- }
}
//鏌ヨ鏄惁鏈夊悗缁樁娈�
@@ -473,14 +461,15 @@
public R addContractOut(OutBoundAddDTO addDTO) {
//鏍￠獙鍙傛暟
R<Contract> r = vailParam(addDTO);
- if (!r.isOk()){
+ if (!r.isOk()) {
return r;
}
Contract contract = r.getData();
//鍑哄簱
- handleOutBound(contract,addDTO);
+ handleOutBound(contract, addDTO);
+
//淇濆瓨璧勯噾鏄庣粏
- BigDecimal outBoundAmount = savePaymentConfirm(contract,addDTO);
+ BigDecimal outBoundAmount = savePaymentConfirm(contract, addDTO);
//鏇存柊鍚堝悓鐘舵�佸強闃舵
contract.setOutBoundAmout(outBoundAmount);
updateContractSchedule(contract);
@@ -492,35 +481,37 @@
List<ContractSubjectMatter> unComOutList = contractSubjectMatterMapper.selectList(Wrappers.<ContractSubjectMatter>lambdaQuery()
.eq(ContractSubjectMatter::getContractId, contract.getId())
.ne(ContractSubjectMatter::getDeliveryStatus, 2));
- if (CollUtil.isEmpty(unComOutList)){
+ if (CollUtil.isEmpty(unComOutList)) {
contract.setNextScheduleName("璐у埌绛炬敹");
}
contract.setBillingStatus("2");
contractMapper.updateById(contract);
}
- private BigDecimal savePaymentConfirm(Contract contract,OutBoundAddDTO addDTO) {
+ private BigDecimal savePaymentConfirm(Contract contract, OutBoundAddDTO addDTO) {
//鏌ヨ鍚堝悓鏄惁鏈夊嚭搴撻樁娈�
ContractPaymentSchedule schedule = scheduleMapper.selectOne(Wrappers.<ContractPaymentSchedule>lambdaQuery().eq(ContractPaymentSchedule::getContractId, contract.getId())
- .eq(ContractPaymentSchedule::getStageName, "鍙戣揣鍓�").gt(ContractPaymentSchedule::getPaymentRatio,0).last("limit 1"));
- if (ObjUtil.isNull(schedule.getEffectiveDate())&&ObjUtil.isNull(schedule.getEffectiveEndDate())){
+ .eq(ContractPaymentSchedule::getStageName, "鍙戣揣鍓�").last("limit 1"));
+ if (ObjUtil.isNull(schedule.getEffectiveDate()) && ObjUtil.isNull(schedule.getEffectiveEndDate())) {
schedule.setEffectiveDate(addDTO.getOutBoundTime());
- schedule.setEffectiveEndDate(DateUtil.offsetDay(addDTO.getOutBoundTime(),schedule.getAgreedDays()));
+ schedule.setEffectiveEndDate(DateUtil.offsetDay(addDTO.getOutBoundTime(), schedule.getAgreedDays()));
scheduleMapper.updateById(schedule);
}
+ //灞ョ害鍑犵巼
+ processService.saveScheduleProcess(addDTO.getOutBoundTime(),schedule);
- BigDecimal outAmount = new BigDecimal("0");
//璁＄畻鍑哄簱浠锋牸
+ BigDecimal outAmount = new BigDecimal("0");
for (OutSubjectMatterAddDTO outSubjectMatterAddDTO : addDTO.getSubjectMatterList()) {
ContractSubjectMatter subjectMatter = contractSubjectMatterMapper.selectOne(Wrappers.<ContractSubjectMatter>lambdaQuery()
.eq(ContractSubjectMatter::getContractId, contract.getId())
.eq(ContractSubjectMatter::getMaterialCode, outSubjectMatterAddDTO.getSubjectMatterCode())
- .eq(StrUtil.isNotBlank(outSubjectMatterAddDTO.getLineNo()),ContractSubjectMatter::getLineNo, outSubjectMatterAddDTO.getLineNo())
+ .eq(StrUtil.isNotBlank(outSubjectMatterAddDTO.getLineNo()), ContractSubjectMatter::getLineNo, outSubjectMatterAddDTO.getLineNo())
.last("limit 1"));
outAmount = outAmount.add(outSubjectMatterAddDTO.getOutBoundNum().multiply(subjectMatter.getUnitPrice()));
}
//瀛樺湪鍙戣揣鍓嶆敹娆鹃樁娈�
- if (ObjUtil.isNotNull(schedule)) {
+ if (schedule.getPaymentRatio().compareTo(new BigDecimal("0")) > 0) {
//鏂板褰撳墠闃舵搴旀敹
PaymentConfirm currentConfim = new PaymentConfirm();
currentConfim.setBusinessType(schedule.getStageName() + "搴旀敹");
@@ -533,7 +524,7 @@
currentConfim.setScheduleName(schedule.getStageName());
currentConfim.setConfirmTime(addDTO.getOutBoundTime());
//鎸夊嚭搴撴瘮渚嬭绠楀簲鏀�
- currentConfim.setTransationAmount(schedule.getPlannedAmount().multiply(outAmount.divide(contract.getAmount(),2,RoundingMode.HALF_UP)));
+ currentConfim.setTransationAmount(schedule.getPlannedAmount().multiply(outAmount.divide(contract.getAmount(), 2, RoundingMode.HALF_UP)));
currentConfim.setReceivableAmount(currentConfim.getTransationAmount());
PaymentConfirm lastConfirm = paymentConfirmMapper.selectOne(Wrappers.<PaymentConfirm>lambdaQuery().eq(PaymentConfirm::getContractId, contract.getId())
.orderByDesc(PaymentConfirm::getCreateTime).last("limit 1"));
@@ -547,7 +538,7 @@
currentConfim.setTotalAmount(currentConfim.getTransationAmount().multiply(new BigDecimal("-1")));
paymentConfirmMapper.insert(currentConfim);
//鍘嗗彶璧勯噾浣欓
- processService.handleBeforeRemain(currentConfim,contract);
+ processService.handleBeforeRemain(currentConfim, contract);
}
return outAmount;
}
@@ -581,7 +572,7 @@
contractSubjectMatterMapper.updateById(subjectMatter);
//淇濆瓨erp鍑哄簱
String batchNumber = genBatchNumber();
- Long outBoundId = saveErpOutBound(contract,addDTO,outSubjectMatterAddDTO,batchNumber);
+ Long outBoundId = saveErpOutBound(contract, addDTO, outSubjectMatterAddDTO, batchNumber);
//淇濆瓨鍚堝悓鍑哄簱璁板綍
saveContractOutBound(contract, addDTO, subjectMatter, outBoundId);
});
@@ -607,7 +598,7 @@
return "";
}
- private Long saveErpOutBound(Contract contract, OutBoundAddDTO addDTO,OutSubjectMatterAddDTO outSubjectMatterAddDTO,String batchNumber) {
+ private Long saveErpOutBound(Contract contract, OutBoundAddDTO addDTO, OutSubjectMatterAddDTO outSubjectMatterAddDTO, String batchNumber) {
OutBound outBound = new OutBound();
outBound.setBatchNumber(batchNumber);
outBound.setOutBoundNum(outSubjectMatterAddDTO.getOutBoundNum());
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 f15f836..9ddc4f3 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
@@ -3,7 +3,6 @@
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollUtil;
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;
@@ -94,114 +93,76 @@
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")) {
+ //淇濆瓨鏀舵鍗�
+ savePaymentSlip(addDTO,customer,contract);
+ //淇濆瓨鏀舵鍗�
+ savePaymentConfirm(addDTO,contract,customer);
+ //澶勭悊鏀舵
+ handleSlipToSchedule(addDTO,contract);
+ //鏇存柊鐘舵��
+ updateContractStatus(addDTO,contract);
+ }
+ //杞嚭
+ if (StrUtil.equals(addDTO.getInOrOut(), "2")) {
+ return handleBackSlip(addDTO,contract,customer);
+ }
+ }
- //鏂板浠樻鍗�
- PaymentSlip slip = new PaymentSlip();
- slip.setBusGuestId(customer.getId());
- slip.setBusGuestName(customer.getCompanyName());
- slip.setPayeeCompId(SecurityUtils.getUser().getCompId());
- slip.setPaymentTime(addDTO.getConfirmTime());
- slip.setPaymentAmount(addDTO.getTransationAmount());
- slip.setPayType(addDTO.getPayType());
- slip.setContractId(contract.getId());
- paymentSlipMapper.insert(slip);
+ return R.ok();
+ }
- 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);
- }
+ private R handleBackSlip(PaymentConfirmAddDTO addDTO,Contract contract,BusinessCustomer customer) {
+ PaymentConfirm lastConfirm = baseMapper.selectOne(Wrappers.<PaymentConfirm>lambdaQuery().eq(PaymentConfirm::getContractId, contract.getId())
+ .orderByDesc(PaymentConfirm::getCreateTime).last("limit 1"));
+ PaymentConfirm entity = new PaymentConfirm();
+ entity.setContractId(contract.getId());
+ entity.setContractName(contract.getContractName());
+ entity.setContractNo(contract.getContractNo());
- //鏇存柊浠樻闃舵浠樻
- List<ContractPaymentSchedule> scheduleList = contractPaymentScheduleMapper.selectList(Wrappers.<ContractPaymentSchedule>lambdaQuery()
- .eq(ContractPaymentSchedule::getContractId, contract.getId()).ne(ContractPaymentSchedule::getPaymentStatus, 2).ne(ContractPaymentSchedule::getPaymentStatus, 3)
- .orderByAsc(ContractPaymentSchedule::getCreateTime));
- if (CollUtil.isNotEmpty(scheduleList)) {
- 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);
- //鏇存柊褰撳墠閫炬湡
- currentOverdue.setReceivableAmount(schedule.getPlannedAmount().subtract(schedule.getActualAmount()));
- currentOverdueMapper.updateById(currentOverdue);
- }
- break;
- }
- }
- }
- }
- //闈炴埧灞嬬璧� 姘寸數
- if (!StrUtil.equals(contract.getContractCategory(), "water_house")) {
+ 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);
+ contract.setPaidAmount(contract.getPaidAmount().subtract(addDTO.getTransationAmount()));
+ contract.setContractStatus(2);
+ contractService.updateById(contract);
+ return R.ok();
+ }
+
+ private void updateContractStatus(PaymentConfirmAddDTO addDTO,Contract contract) {
+
+ //闈炴埧灞嬬璧� 姘寸數
+ if (!StrUtil.equals(contract.getContractCategory(), "water_house")) {
+ //鏇存柊鍚堝悓宸蹭粯娆�
+ 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().subtract(contract.getDropAmount())) >= 0&&contract.getBillingAmout().compareTo(contract.getAmount())==0) {
+ contract.setContractStatus(3);
+ contract.setPaidAmount(contract.getAmount().subtract(contract.getDropAmount()));
+ }
+ contractService.updateById(contract);
+ }else {
+ List<ContractExecDate> execDateList = contractExecDateMapper.selectList(Wrappers.<ContractExecDate>lambdaQuery().eq(ContractExecDate::getContractId,contract.getId())
+ .eq(ContractExecDate::getGenFlag,"0"));
+ if (CollUtil.isEmpty(execDateList)){
//鏇存柊鍚堝悓宸蹭粯娆�
BigDecimal paid = new BigDecimal("0");
if (ObjUtil.isNotNull(contract.getPaidAmount())) {
@@ -209,275 +170,120 @@
}
paid = paid.add(addDTO.getTransationAmount());
contract.setPaidAmount(paid);
- if (paid.compareTo(contract.getAmount().subtract(contract.getDropAmount())) >= 0&&contract.getBillingAmout().compareTo(contract.getAmount())==0) {
+ if (contract.getBillingAmout().compareTo(contract.getAmount())==0&&paid.compareTo(contract.getAmount().subtract(contract.getDropAmount())) >= 0) {
contract.setContractStatus(3);
- contract.setPaidAmount(contract.getAmount().subtract(contract.getDropAmount()));
+ contract.setPaidAmount(contract.getAmount());
}
contractService.updateById(contract);
- }else {
- List<ContractExecDate> execDateList = contractExecDateMapper.selectList(Wrappers.<ContractExecDate>lambdaQuery().eq(ContractExecDate::getContractId,contract.getId())
- .eq(ContractExecDate::getGenFlag,"0"));
- if (CollUtil.isEmpty(execDateList)){
- //鏇存柊鍚堝悓宸蹭粯娆�
- BigDecimal paid = new BigDecimal("0");
- if (ObjUtil.isNotNull(contract.getPaidAmount())) {
- paid = contract.getPaidAmount();
- }
- paid = paid.add(addDTO.getTransationAmount());
- contract.setPaidAmount(paid);
- if (contract.getBillingAmout().compareTo(contract.getAmount())==0&&paid.compareTo(contract.getAmount().subtract(contract.getDropAmount())) >= 0) {
- contract.setContractStatus(3);
- 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);
- }
-
}
-// else {
-//
-// List<Contract> customerContractList = contractService.list(Wrappers.<Contract>lambdaQuery().eq(Contract::getPartyAId, addDTO.getBusGuestId())
-// .eq(Contract::getPartyBId, SecurityUtils.getUser().getCompId()).orderByAsc(Contract::getCreateTime)
-// .apply(" ((contract_category != 'water_house' and amount != paid_amount) or contract_category = 'water_house')"));
-// if (ArrayUtil.isEmpty(customerContractList)) {
-// return R.failed("涓烘煡璇㈠埌鏈粯娆惧悎鍚�");
-// }
-// BusinessCustomer customer = businessCustomerService.getOne(Wrappers.<BusinessCustomer>lambdaQuery()
-// .eq(StrUtil.isNotBlank(addDTO.getBusGuestName()), BusinessCustomer::getRegisterName, addDTO.getBusGuestName())
-// .eq(ObjUtil.isNotNull(addDTO.getBusGuestId()), BusinessCustomer::getId, addDTO.getBusGuestId())
-// .last("limit 1"));
-// if (ObjUtil.isNull(customer)) {
-// return R.failed("瀹㈠晢鏌ヨ澶辫触");
-// }
-// //鏂板浠樻鍗�
-// PaymentSlip slip = new PaymentSlip();
-// slip.setBusGuestId(customer.getId());
-// slip.setBusGuestName(customer.getRegisterName());
-// slip.setPayeeCompId(SecurityUtils.getUser().getCompId());
-// slip.setPaymentTime(addDTO.getConfirmTime());
-// slip.setPaymentAmount(addDTO.getTransationAmount());
-// slip.setPayType(addDTO.getPayType());
-// paymentSlipMapper.insert(slip);
-//
-// 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();
-// Iterator<Contract> iterator = customerContractList.iterator();
-// while (iterator.hasNext()) {
-// Contract contract = iterator.next();
-// 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();
-// } else {
-//
-// }
-//
-// //鍚堝悓鏈�杩戞槑缁嗘�婚涓�0 鎴� > 0 鎯呭喌涓�
-// if (lastTotal.compareTo(new BigDecimal("0")) >= 0) {
-// log.info("褰撳墠鍚堝悓鍙凤細{},鏄庣粏鎬婚鏃犲簲鏀舵", contract.getContractNo());
-// advanceContractList.add(contract);
-// if (iterator.hasNext()) {
-// 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.getRegisterName());
-// entity.setBusinessType("瀹㈡埛浠樻");
-// if (transtionRemainAmount.compareTo(new BigDecimal("0")) > 0) {
-// entity.setConfirmTime(payDate);
-// // 鍒ゆ柇鏄惁鏄渶鍚庝竴涓�
-// if (!iterator.hasNext()) {
-// entity.setTransationAmount(transtionRemainAmount.subtract(lastTotal));
-// entity.setAdvanceAmount(transtionRemainAmount);
-// entity.setTotalAmount(transtionRemainAmount);
-// } else {
-// entity.setTransationAmount(lastTotal.multiply(new BigDecimal("-1")));
-// entity.setTotalAmount(new BigDecimal("0"));
-// }
-// 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.setReceivableAmount(transtionRemainAmount.multiply(new BigDecimal("-1")));
-// entity.setTotalAmount(transtionRemainAmount);
-// 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)
-// .ne(ContractPaymentSchedule::getPaymentStatus, 3)
-// .orderByAsc(ContractPaymentSchedule::getCreateTime));
-// if (ArrayUtil.isNotEmpty(scheduleList)) {
-// 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)
-// .ne(ContractPaymentSchedule::getPaymentStatus, 3));
-// if (ArrayUtil.isNotEmpty(payComScheduleList)) {
-// BigDecimal payTotal = payComScheduleList.stream().map(item -> StrUtil.equals(item.getPaymentStatus() + "", "2") ? 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);
-//// }
-// if (contract.getAmount().compareTo(contract.getPaidAmount()) == 0) {
-//
-// contract.setContractStatus(3);
-// payCompleteContractList.add(contract);
-// }
-// //浠樻 涓� 浠樻鏈叏浠�
-// if (contract.getAmount().compareTo(contract.getPaidAmount()) > 0) {
-// payNoCompleteContractList.add(contract);
-// }
-// if (StrUtil.isNotEmpty(contract.getContractCategory()) && StrUtil.equals(contract.getContractCategory(), "water_house")) {
-// List<ContractExecDate> execDateList = contractExecDateMapper.selectList(Wrappers.<ContractExecDate>lambdaQuery()
-// .eq(ContractExecDate::getContractId, contract.getId()).eq(ContractExecDate::getGenFlag, "0"));
-// if (ArrayUtil.isEmpty(execDateList)) {
-// List<ContractPaymentSchedule> contractPaymentScheduleList = contractPaymentScheduleMapper.selectList(Wrappers.<ContractPaymentSchedule>lambdaQuery()
-// .eq(ContractPaymentSchedule::getContractId, contract.getId()));
-// if (ArrayUtil.isNotEmpty(contractPaymentScheduleList) && contractPaymentScheduleList.stream().allMatch(item -> Objects.equals(item.getPaymentStatus(), 2))) {
-// contract.setContractStatus(3);
-// contractService.updateById(contract);
-// }
-// }
-// } else {
-// contractService.updateById(contract);
-// }
-//
-// }
-// });
+ }
- //瀹㈡埛棰勪粯鏈夊墿浣� 涓� 鏈夐浠樻鐨勫悎鍚�
-// if (transtionRemainAmount.compareTo(new BigDecimal("0")) > 0) {
-// if (ArrayUtil.isNotEmpty(payNoCompleteContractList)){
-// //浣欓 鏀惧埌浠樻鏈畬鎴愬悎鍚� 棰勬敹
-// Contract lastContract = payNoCompleteContractList.get(0);
-// //淇濆瓨鏄庣粏
-// saveNewPaymentConfirm(customer,null,lastContract,transtionRemainAmount,payDate);
-// }
-// if (ArrayUtil.isEmpty(payNoCompleteContractList)&&ArrayUtil.isNotEmpty(advanceContractList)){
-// //瀹㈡埛棰勪粯鏈夊墿浣� 娌℃湁棰勪粯娆剧殑鍚堝悓
-// Contract lastContract = advanceContractList.get(0);
-// //淇濆瓨鏄庣粏
-// saveNewPaymentConfirm(customer,null,lastContract,transtionRemainAmount,payDate);
-// }
-// if (ArrayUtil.isEmpty(payNoCompleteContractList)&&ArrayUtil.isEmpty(advanceContractList)
-// &&ArrayUtil.isNotEmpty(payCompleteContractList)) {
-// //瀹㈡埛棰勪粯鏈夊墿浣� 娌℃湁棰勪粯娆剧殑鍚堝悓
-// Contract lastContract = payCompleteContractList.get(payCompleteContractList.size() - 1);
-// //淇濆瓨鏄庣粏
-// saveNewPaymentConfirm(customer,null,lastContract,transtionRemainAmount,payDate);
-//
-// }
-// }
-// }
- return R.ok();
+ private void handleSlipToSchedule(PaymentConfirmAddDTO addDTO,Contract contract) {
+ //鏇存柊浠樻闃舵浠樻
+ List<ContractPaymentSchedule> scheduleList = contractPaymentScheduleMapper.selectList(Wrappers.<ContractPaymentSchedule>lambdaQuery()
+ .eq(ContractPaymentSchedule::getContractId, contract.getId()).ne(ContractPaymentSchedule::getPaymentStatus, 2).ne(ContractPaymentSchedule::getPaymentStatus, 3)
+ .orderByAsc(ContractPaymentSchedule::getCreateTime));
+ if (CollUtil.isNotEmpty(scheduleList)) {
+ 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);
+ //鏇存柊褰撳墠閫炬湡
+ currentOverdue.setReceivableAmount(schedule.getPlannedAmount().subtract(schedule.getActualAmount()));
+ currentOverdueMapper.updateById(currentOverdue);
+ }
+ break;
+ }
+ }
+ }
+ }
+
+ private void savePaymentConfirm(PaymentConfirmAddDTO addDTO,Contract contract,BusinessCustomer customer) {
+
+ 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();
+ }
+ 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);
+ }
+ }
+
+ private void savePaymentSlip(PaymentConfirmAddDTO addDTO,BusinessCustomer customer,Contract contract) {
+ //鏂板浠樻鍗�
+ PaymentSlip slip = new PaymentSlip();
+ slip.setBusGuestId(customer.getId());
+ slip.setBusGuestName(customer.getCompanyName());
+ slip.setPayeeCompId(SecurityUtils.getUser().getCompId());
+ slip.setPaymentTime(addDTO.getConfirmTime());
+ slip.setPaymentAmount(addDTO.getTransationAmount());
+ slip.setPayType(addDTO.getPayType());
+ slip.setContractId(contract.getId());
+ paymentSlipMapper.insert(slip);
}
@Override
@@ -515,6 +321,7 @@
}else {
params.put("enddate", DateUtil.today());
}
+ params.put("dc_flag","1");//1 鍊� 2 璐� 鍙煡鏀舵
//鍗曟嵁鐘舵�佸凡瀹℃壒
params.put("accentity_code", bipCode);
String finalAccessToken = accessToken;
@@ -601,27 +408,19 @@
return;
}
log.info("==================寮�濮嬪鐞嗛摱琛屾祦姘翠俊鎭�===================");
- recordList.stream().forEach(record -> {
-
- savePaymentConfirm((JSONObject) record, dept);
+ recordList.stream().forEach(obj -> {
+ JSONObject record = (JSONObject) obj;
+ BusinessCustomer customer = businessCustomerService.getOne(Wrappers.<BusinessCustomer>lambdaQuery()
+ .eq(BusinessCustomer::getCompanyName, record.getString("to_acct_name"))
+ .eq(BusinessCustomer::getCompId,dept.getDeptId())
+ );
+ //淇濆瓨浠樻鍗�
+ Boolean codeFlag = saveBankStatement(customer, record,dept);
+ if (!codeFlag) {
+ log.error("浠樻鍗昳d锛歿},浠樻鍗曞凡瀛樺湪");
+ }
});
log.info("==================缁撴潫澶勭悊閾惰娴佹按淇℃伅===================");
- }
-
- private void savePaymentConfirm(JSONObject record, SysDept dept) {
-
-
- BusinessCustomer customer = businessCustomerService.getOne(Wrappers.<BusinessCustomer>lambdaQuery()
- .eq(BusinessCustomer::getCompanyName, record.getString("to_acct_name"))
- .eq(BusinessCustomer::getCompId,dept.getDeptId())
- );
- //淇濆瓨浠樻鍗�
- Boolean codeFlag = saveBankStatement(customer, record,dept);
- if (codeFlag) {
- log.error("浠樻鍗昳d锛歿},浠樻鍗曞凡瀛樺湪");
- return;
- }
-
}
private Boolean saveBankStatement(BusinessCustomer customer, JSONObject record,SysDept dept) {
@@ -634,6 +433,7 @@
bankStatement.setPayBankAccName(record.getString("to_acct_name"));
bankStatement.setTranDate(DateUtil.parseDateTime(record.getString("tran_date")));
bankStatement.setTranAmount(record.getBigDecimal("tran_amt"));
+ bankStatement.setDcFlag(record.getString("dc_flag"));
bankStatement.setDataId(record.getLong("id"));
bankStatement.setDataJson(record.toJSONString());
if (ObjUtil.isNotNull(customer)) {
diff --git a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/TaxCodeServiceImpl.java b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/TaxCodeServiceImpl.java
index 6cff924..21f1228 100644
--- a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/TaxCodeServiceImpl.java
+++ b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/TaxCodeServiceImpl.java
@@ -39,6 +39,7 @@
.selectAll(TaxCode.class)
.selectAs("(select count(1) from tax_code t1 where t1.parent_bm = t.bm)",TaxCode::getChildNum)
.like(StrUtil.isNotBlank(queryDTO.getMc()),TaxCode::getMc,queryDTO.getMc())
+ .like(StrUtil.isNotBlank(queryDTO.getJc()),TaxCode::getSphwjc,queryDTO.getJc())
.like(StrUtil.isNotBlank(queryDTO.getBm()),TaxCode::getBm,queryDTO.getBm());
if (ObjUtil.isNotNull(queryDTO.getChildNum())){
if (queryDTO.getChildNum()==0){
diff --git a/platformx-business-finance-biz/src/main/resources/mapper/BipDictMapper.xml b/platformx-business-finance-biz/src/main/resources/mapper/BipDictMapper.xml
new file mode 100644
index 0000000..c753ce2
--- /dev/null
+++ b/platformx-business-finance-biz/src/main/resources/mapper/BipDictMapper.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.BipDictMapper">
+
+ <resultMap id="bipDictMap" type="com.by4cloud.platformx.business.entity.BipDict">
+ <id property="id" column="id"/>
+ <result property="compId" column="comp_id"/>
+ <result property="dictCode" column="dict_code"/>
+ <result property="dictKey" column="dict_key"/>
+ <result property="dictName" column="dict_name"/>
+ <result property="parentId" column="parent_id"/>
+ <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/ContractInvoiceMapper.xml b/platformx-business-finance-biz/src/main/resources/mapper/ContractInvoiceMapper.xml
index 1873e9d..4dc90be 100644
--- a/platformx-business-finance-biz/src/main/resources/mapper/ContractInvoiceMapper.xml
+++ b/platformx-business-finance-biz/src/main/resources/mapper/ContractInvoiceMapper.xml
@@ -454,6 +454,7 @@
t.comp_id,
t1.contract_no,
t2.company_name AS busGuestName,
+ t.bw_request_result,
t1.party_b
FROM
contract_invoice t
@@ -467,6 +468,9 @@
<if test="queryDTO.invoiceCategory !=null and queryDTO.invoiceCategory !=''">
AND t.invoice_category = #{queryDTO.invoiceCategory}
</if>
+ <if test="queryDTO.bwRequestResult !=null and queryDTO.bwRequestResult !=''">
+ AND t.bw_request_result = #{queryDTO.bwRequestResult}
+ </if>
<if test="queryDTO.contractNo !=null and queryDTO.contractNo !=''">
AND t1.contract_no LIKE CONCAT('%', #{queryDTO.contractNo}, '%')
</if>
diff --git a/platformx-business-finance-biz/src/main/resources/mapper/ContractSubjectMatterChangeMapper.xml b/platformx-business-finance-biz/src/main/resources/mapper/ContractSubjectMatterChangeMapper.xml
new file mode 100644
index 0000000..dcb21e9
--- /dev/null
+++ b/platformx-business-finance-biz/src/main/resources/mapper/ContractSubjectMatterChangeMapper.xml
@@ -0,0 +1,76 @@
+<?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.ContractSubjectMatterChangeMapper">
+
+ <resultMap id="contractSubjectMatterMap" type="com.by4cloud.platformx.business.entity.ContractSubjectMatterChange">
+ <id property="id" column="id"/>
+ <result property="compId" column="comp_id"/>
+ <result property="attachmentName" column="attachment_name"/>
+ <result property="attachmentUrl" column="attachment_url"/>
+ <result property="beforeChange" column="before_change"/>
+ <result property="afterChange" column="after_change"/>
+ <result property="contractId" column="contract_id"/>
+ <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>
+ <select id="subjectChangePage" resultType="com.by4cloud.platformx.business.vo.ContractPageVo">
+ SELECT
+ c.id,
+ c.contract_no,
+ c.contract_name,
+ c.party_a_id,
+ c.party_a,
+ c.party_b_id,
+ c.party_b,
+ c.amount,
+ c.contract_type,
+ c.supply_attribute,
+ c.contract_status,
+ c.contract_attribute,
+ c.sign_date,
+ c.sign_place,
+ c.effective_date,
+ c.delivery_cycle,
+ c.expiration_date,
+ c.attachment_url,
+ c.remark,
+ c.parent_id,
+ c.approve_time,
+ c.arrival_schedule_id,
+ c.accept_schedule_id,
+ c.billing_status,
+ c.billing_amout,
+ c.template_id,
+ c.sales_model,
+ c.paid_amount,
+ c.contract_category,
+ c.exec_frequency,
+ c.next_schedule_name,
+ c.warranty_schedule_id,
+ c.comp_id,
+ c.center_push_flag,
+ csmc.before_change,
+ csmc.after_change
+ FROM
+ contract_subject_matter_change csmc
+ left join
+ contract c on csmc.contract_id = c.id
+ WHERE
+ c.del_flag = '0'
+ AND csmc.del_flag = '0'
+ <if test="queryDTO.contractName !=null and queryDTO.contractName !=''">
+ AND contract_name LIKE CONCAT('%', #{queryDTO.contractName}, '%')
+ </if>
+ <if test="queryDTO.contractNo !=null and queryDTO.contractNo !=''">
+ AND contract_no LIKE CONCAT('%', #{queryDTO.contractNo}, '%')
+ </if>
+ <if test="queryDTO.partyA !=null and queryDTO.partyA !=''">
+ AND party_a LIKE CONCAT('%', #{queryDTO.partyA}, '%')
+ </if>
+ order by csmc.create_time desc
+ </select>
+</mapper>
\ No newline at end of file
diff --git a/platformx-business-finance-biz/src/main/resources/mapper/ProductMapper.xml b/platformx-business-finance-biz/src/main/resources/mapper/ProductMapper.xml
index 92d2e65..2e84309 100644
--- a/platformx-business-finance-biz/src/main/resources/mapper/ProductMapper.xml
+++ b/platformx-business-finance-biz/src/main/resources/mapper/ProductMapper.xml
@@ -46,7 +46,7 @@
<select id="getProductListByParentId" resultType="com.by4cloud.platformx.business.vo.ProductSelectVo">
SELECT
t.id,
- t.product_name,
+ CONCAT(t.product_name,IFNULL(t.product_type,'')) product_name,
t.main_code,
t.erp_code,
t.product_type,
@@ -91,7 +91,7 @@
<select id="getProductSMJListByParentId" resultType="com.by4cloud.platformx.business.vo.ProductSelectVo">
SELECT
t.id,
- t.product_name,
+ CONCAT(t.product_name,IFNULL(t.product_type,'')) product_name,
t.main_code,
t.erp_code,
t.product_type,
--
Gitblit v1.9.1