From a422a984cfa2a5a2bbe89c6fa6947363e559bb4f Mon Sep 17 00:00:00 2001
From: shiyunteng <shiyunteng@example.com>
Date: 星期五, 22 五月 2026 09:29:14 +0800
Subject: [PATCH] feat:faet:出库加批次号，合同履约加销方购方履约，到货单据必填校验，验收单据必填校验，单位新增法人、委托代理人字段 、合同出库新增erp出库ID

---
 platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/PaymentConfirmServiceImpl.java |  784 +++++++++++++++++++++++++++++++++++++++++++++++--------
 1 files changed, 664 insertions(+), 120 deletions(-)

diff --git a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/PaymentConfirmServiceImpl.java b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/PaymentConfirmServiceImpl.java
index 9555670..81b05af 100644
--- a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/PaymentConfirmServiceImpl.java
+++ b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/PaymentConfirmServiceImpl.java
@@ -1,32 +1,39 @@
 package com.by4cloud.platformx.business.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.date.DatePattern;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ArrayUtil;
 import cn.hutool.core.util.ObjUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.http.HttpUtil;
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.by4cloud.platformx.admin.api.entity.SysDept;
+import com.by4cloud.platformx.admin.api.feign.RemoteDeptService;
 import com.by4cloud.platformx.business.dto.PaymentConfirmAddDTO;
 import com.by4cloud.platformx.business.entity.*;
-import com.by4cloud.platformx.business.mapper.ContractPaymentScheduleMapper;
-import com.by4cloud.platformx.business.mapper.CurrentOverdueMapper;
-import com.by4cloud.platformx.business.mapper.HistoryOverdueMapper;
-import com.by4cloud.platformx.business.mapper.PaymentConfirmMapper;
+import com.by4cloud.platformx.business.mapper.*;
 import com.by4cloud.platformx.business.service.BusinessCustomerService;
 import com.by4cloud.platformx.business.service.ContractService;
 import com.by4cloud.platformx.business.service.PaymentConfirmService;
+import com.by4cloud.platformx.business.utils.SignHelper;
 import com.by4cloud.platformx.common.core.util.R;
+import com.by4cloud.platformx.common.security.util.SecurityUtils;
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
 
+import java.io.UnsupportedEncodingException;
 import java.math.BigDecimal;
-import java.util.Date;
-import java.util.List;
-import java.util.Objects;
+import java.security.InvalidKeyException;
+import java.security.NoSuchAlgorithmException;
+import java.util.*;
+import java.util.concurrent.TimeUnit;
 
 /**
  * 鏀舵纭
@@ -34,6 +41,7 @@
  * @author syt
  * @date 2026-04-29 11:33:26
  */
+@Slf4j
 @Service
 @RequiredArgsConstructor
 public class PaymentConfirmServiceImpl extends ServiceImpl<PaymentConfirmMapper, PaymentConfirm> implements PaymentConfirmService {
@@ -43,109 +51,608 @@
 	private final ContractPaymentScheduleMapper contractPaymentScheduleMapper;
 	private final CurrentOverdueMapper currentOverdueMapper;
 	private final HistoryOverdueMapper historyOverdueMapper;
+	private final PaymentSlipMapper paymentSlipMapper;
+	private final BipRequestRecordMapper bipRequestRecordMapper;
+	private final RemoteDeptService remoteDeptService;
+	private final RedisTemplate redisTemplate;
 
 	@Value("${bip.url}")
 	private String url;
 
+	@Value("${bip.codes}")
+	private String codes;
+
+	@Value("${bip.appKey}")
+	private String appKey;
+
+	@Value("${bip.appSecret}")
+	private String appSecret;
 
 	@Override
 	public R add(PaymentConfirmAddDTO addDTO) {
-		Contract contract = contractService.getOne(Wrappers.<Contract>lambdaQuery().eq(Contract::getContractNo,addDTO.getContractNo()));
-		if(ObjUtil.isNull(contract)){
-			return R.failed("鍚堝悓鏌ヨ澶辫触锛岃妫�鏌ュ悎鍚岀紪鍙�");
+		if (StrUtil.isNotBlank(addDTO.getContractNo())) {
+			Contract contract = contractService.getOne(Wrappers.<Contract>lambdaQuery().eq(Contract::getContractNo, addDTO.getContractNo()));
+			BusinessCustomer customer = businessCustomerService.getOne(Wrappers.<BusinessCustomer>lambdaQuery()
+					.eq(StrUtil.isNotBlank(addDTO.getBusGuestName()), BusinessCustomer::getCompanyName, addDTO.getBusGuestName())
+					.eq(StrUtil.isNotBlank(addDTO.getBusGuestId()), BusinessCustomer::getId, addDTO.getBusGuestId()));
+			if (ObjUtil.isNull(customer)) {
+				return R.failed("瀹㈠晢鏌ヨ澶辫触锛岃妫�鏌ュ鍟�");
+			}
+
+			PaymentConfirm lastConfirm = baseMapper.selectOne(Wrappers.<PaymentConfirm>lambdaQuery().eq(PaymentConfirm::getContractId, contract.getId())
+					.orderByDesc(PaymentConfirm::getCreateTime).last("limit 1"));
+			BigDecimal lastTotal = new BigDecimal("0");
+			if (ObjUtil.isNotNull(lastConfirm)) {
+				lastTotal = lastConfirm.getTotalAmount();
+			}
+
+			//杞叆
+			if (StrUtil.equals(addDTO.getInOrOut(), "1")) {
+				BigDecimal newtotal = addDTO.getTransationAmount().add(lastTotal);
+				PaymentConfirm entity = new PaymentConfirm();
+				entity.setContractId(contract.getId());
+				entity.setContractName(contract.getContractName());
+				entity.setContractNo(addDTO.getContractNo());
+				if (ObjUtil.isNotNull(lastConfirm)) {
+					entity.setScheduleId(lastConfirm.getScheduleId());
+					entity.setScheduleName(lastConfirm.getScheduleName());
+				}
+				entity.setBusGuestId(customer.getId());
+				entity.setBusGuestName(customer.getCompanyName());
+				entity.setBusinessType("瀹㈡埛浠樻");
+				if (newtotal.compareTo(new BigDecimal("0")) > 0) {
+					entity.setTransationAmount(addDTO.getTransationAmount());
+					entity.setAdvanceAmount(newtotal);
+					entity.setTotalAmount(newtotal);
+					entity.setConfirmTime(new Date());
+					baseMapper.insert(entity);
+				} else if (newtotal.compareTo(new BigDecimal("0")) == 0) {
+					entity.setTransationAmount(addDTO.getTransationAmount());
+					entity.setTotalAmount(newtotal);
+					entity.setConfirmTime(new Date());
+					baseMapper.insert(entity);
+				} else {
+					entity.setTransationAmount(addDTO.getTransationAmount());
+					entity.setReceivableAmount(newtotal.multiply(new BigDecimal("-1")));
+					entity.setTotalAmount(newtotal);
+					entity.setConfirmTime(new Date());
+					baseMapper.insert(entity);
+				}
+				//鏇存柊浠樻闃舵浠樻
+				List<ContractPaymentSchedule> scheduleList = contractPaymentScheduleMapper.selectList(Wrappers.<ContractPaymentSchedule>lambdaQuery()
+						.eq(ContractPaymentSchedule::getContractId, contract.getId()).ne(ContractPaymentSchedule::getPaymentStatus, 2)
+						.orderByAsc(ContractPaymentSchedule::getCreateTime));
+				if (ArrayUtil.isNotEmpty(scheduleList.toArray())) {
+					BigDecimal remain = addDTO.getTransationAmount();
+					for (ContractPaymentSchedule schedule : scheduleList) {
+						BigDecimal lastRemain = remain;
+						remain = remain.subtract(StrUtil.equals(schedule.getPaymentStatus() + "", "0") ? schedule.getPlannedAmount() :
+								schedule.getPlannedAmount().subtract(schedule.getActualAmount()));
+						if (remain.compareTo(new BigDecimal("0")) >= 0) {
+							schedule.setActualAmount(schedule.getPlannedAmount());
+							schedule.setPaymentDate(addDTO.getConfirmTime());
+							schedule.setPaymentStatus(2);
+							contractPaymentScheduleMapper.updateById(schedule);
+							//鏌ヨ鏄惁鏈夊綋鍓嶉�炬湡
+							CurrentOverdue currentOverdue = currentOverdueMapper.selectOne(Wrappers.<CurrentOverdue>lambdaQuery().eq(CurrentOverdue::getScheduleId, schedule.getId())
+									.eq(CurrentOverdue::getContractId, schedule.getContractId()).last("limit 1"));
+							if (ObjUtil.isNotNull(currentOverdue)) {
+								//鏂板閫炬湡鍘嗗彶
+								HistoryOverdue historyOverdue = BeanUtil.copyProperties(currentOverdue, HistoryOverdue.class, "id");
+								historyOverdue.setPaymentTime(addDTO.getConfirmTime());
+								historyOverdue.setCompId(schedule.getCompId());
+								historyOverdueMapper.insert(historyOverdue);
+								//鍒犻櫎褰撳墠閫炬湡
+								currentOverdueMapper.deleteById(currentOverdue);
+							}
+						} else {
+							schedule.setActualAmount(StrUtil.equals(schedule.getPaymentStatus() + "", "0") ? schedule.getPlannedAmount().add(remain) :
+									schedule.getActualAmount().add(lastRemain));
+							schedule.setPaymentDate(addDTO.getConfirmTime());
+							schedule.setPaymentStatus(1);
+							contractPaymentScheduleMapper.updateById(schedule);
+							//鏌ヨ鏄惁鏈夊綋鍓嶉�炬湡
+							CurrentOverdue currentOverdue = currentOverdueMapper.selectOne(Wrappers.<CurrentOverdue>lambdaQuery().eq(CurrentOverdue::getScheduleId, schedule.getId())
+									.eq(CurrentOverdue::getContractId, schedule.getContractId()).last("limit 1"));
+							if (ObjUtil.isNotNull(currentOverdue)) {
+								//鏂板閫炬湡鍘嗗彶
+								HistoryOverdue historyOverdue = BeanUtil.copyProperties(currentOverdue, HistoryOverdue.class, "id");
+								historyOverdue.setReceivableAmount(lastRemain);
+								historyOverdue.setPaymentTime(addDTO.getConfirmTime());
+								historyOverdue.setCompId(schedule.getCompId());
+								historyOverdueMapper.insert(historyOverdue);
+								//鏌ヨ鍘嗗彶宸蹭粯閫炬湡閲戦
+								List<HistoryOverdue> historyOverdueList = historyOverdueMapper.selectList(Wrappers.<HistoryOverdue>lambdaQuery().eq(HistoryOverdue::getScheduleId, currentOverdue.getScheduleId()));
+								BigDecimal hisTotal = historyOverdueList.stream().map(item -> item.getReceivableAmount()).reduce(BigDecimal.ZERO, BigDecimal::add);
+								//鏇存柊褰撳墠閫炬湡
+								currentOverdue.setReceivableAmount(schedule.getPlannedAmount().subtract(hisTotal));
+								currentOverdueMapper.updateById(currentOverdue);
+							}
+							break;
+						}
+					}
+				}
+				//鏇存柊鍚堝悓宸蹭粯娆�
+				BigDecimal paid = new BigDecimal("0");
+				if (ObjUtil.isNotNull(contract.getPaidAmount())) {
+					paid = contract.getPaidAmount();
+				}
+				paid = paid.add(addDTO.getTransationAmount());
+				contract.setPaidAmount(paid);
+				if (paid.compareTo(contract.getAmount()) > 0) {
+					contract.setPaidAmount(contract.getAmount());
+				}
+				contractService.updateById(contract);
+			}
+			//杞嚭
+			if (StrUtil.equals(addDTO.getInOrOut(), "2")) {
+				PaymentConfirm entity = new PaymentConfirm();
+				entity.setContractId(contract.getId());
+				entity.setContractName(contract.getContractName());
+				entity.setContractNo(addDTO.getContractNo());
+
+				entity.setBusGuestId(customer.getId());
+				entity.setBusGuestName(customer.getCompanyName());
+				entity.setBusinessType("");
+				entity.setTransationAmount(addDTO.getTransationAmount());
+				BigDecimal newtotal = addDTO.getTransationAmount().multiply(new BigDecimal("-1")).add(lastConfirm.getTotalAmount());
+				if (newtotal.compareTo(new BigDecimal("0")) > 0) {
+					entity.setAdvanceAmount(newtotal);
+					entity.setTotalAmount(newtotal);
+				} else if (newtotal.compareTo(new BigDecimal("0")) == 0) {
+					entity.setTotalAmount(newtotal);
+				} else {
+					return R.failed("褰撳墠瀹㈡埛浣欓涓�" + lastConfirm.getTotalAmount() + "涓嶈冻浠ユ弧瓒冲綋鍓嶅彂鐢熼噾棰濓紝鏃犳硶鎿嶄綔");
+				}
+				entity.setConfirmTime(new Date());
+				baseMapper.insert(entity);
+			}
+			// 鏌ヨ鎵�鏈変粯娆鹃樁娈垫槸鍚﹂兘浠樻瀹屾垚
+			List<ContractPaymentSchedule> scheduleList = contractPaymentScheduleMapper.selectList(Wrappers.<ContractPaymentSchedule>lambdaQuery().eq(ContractPaymentSchedule::getContractId, contract.getId()));
+			if (ArrayUtil.isNotEmpty(scheduleList.toArray())) {
+				if (scheduleList.stream().allMatch(item -> Objects.equals(item.getPaymentStatus(), 2))) {
+					contract.setContractStatus(3);
+					contractService.updateById(contract);
+				}
+				;
+			}
+		}else {
+			List<Contract> customerContractList = contractService.list(Wrappers.<Contract>lambdaQuery().eq(Contract::getPartyAId, addDTO.getBusGuestId())
+					.eq(Contract::getPartyBId,SecurityUtils.getUser().getCompId()).orderByAsc(Contract::getCreateTime).apply(" amount != paid_amount"));
+			if (ArrayUtil.isEmpty(customerContractList.toArray())) {
+				return R.failed("涓烘煡璇㈠埌鏈粯娆惧悎鍚�");
+			}
+			BusinessCustomer customer = businessCustomerService.getOne(Wrappers.<BusinessCustomer>lambdaQuery()
+					.eq(StrUtil.isNotBlank(addDTO.getBusGuestName()), BusinessCustomer::getCompanyName, addDTO.getBusGuestName())
+					.eq(ObjUtil.isNotNull(addDTO.getBusGuestId()), BusinessCustomer::getId, addDTO.getBusGuestId())
+					.last("limit 1"));
+			if (ObjUtil.isNull(customer)) {
+				return  R.failed("瀹㈠晢鏌ヨ澶辫触");
+			}
+
+			BigDecimal transtionAmount = addDTO.getTransationAmount();
+			//鍓╀綑浠樻
+			BigDecimal transtionRemainAmount = transtionAmount;
+			//鏀跺埌浠樻鐨勫悎鍚�
+			List<Contract> payContractList = new ArrayList<>();
+			//浠樻瀹屾垚鐨勫悎鍚�
+			List<Contract> payCompleteContractList = new ArrayList<>();
+			//浠樻鏈畬鎴愮殑鍚堝悓
+			List<Contract> payNoCompleteContractList = new ArrayList<>();
+			//鏈夐浠樻鐨勫悎鍚�
+			List<Contract> advanceContractList = new ArrayList<>();
+			//浠樻鏃堕棿
+			Date payDate = addDTO.getConfirmTime();
+			for (Contract contract : customerContractList) {
+				PaymentConfirm lastConfirm = baseMapper.selectOne(Wrappers.<PaymentConfirm>lambdaQuery().eq(PaymentConfirm::getContractId, contract.getId())
+						.orderByDesc(PaymentConfirm::getCreateTime).last("limit 1"));
+				BigDecimal lastTotal = new BigDecimal("0");
+				if (ObjUtil.isNotNull(lastConfirm)) {
+					lastTotal = lastConfirm.getTotalAmount();
+				}
+
+				//鍚堝悓鏈�杩戞槑缁嗘�婚涓�0 鎴� > 0 鎯呭喌涓�
+				if (lastTotal.compareTo(new BigDecimal("0")) >= 0) {
+					log.info("褰撳墠鍚堝悓鍙凤細{},鏄庣粏鎬婚鏃犲簲鏀舵", contract.getContractNo());
+					advanceContractList.add(contract);
+					continue;
+				}
+
+				transtionRemainAmount = transtionRemainAmount.add(lastTotal);
+				PaymentConfirm entity = new PaymentConfirm();
+				entity.setContractId(contract.getId());
+				entity.setContractName(contract.getContractName());
+				entity.setContractNo(contract.getContractNo());
+				if (ObjUtil.isNotNull(lastConfirm)) {
+					entity.setScheduleId(lastConfirm.getScheduleId());
+					entity.setScheduleName(lastConfirm.getScheduleName());
+				}
+				entity.setBusGuestId(customer.getId());
+				entity.setBusGuestName(customer.getCompanyName());
+				entity.setBusinessType("瀹㈡埛浠樻");
+				if (transtionRemainAmount.compareTo(new BigDecimal("0")) > 0) {
+					entity.setTransationAmount(lastTotal.multiply(new BigDecimal("-1")));
+					entity.setTotalAmount(new BigDecimal("0"));
+					entity.setConfirmTime(payDate);
+					baseMapper.insert(entity);
+					payContractList.add(contract);
+				} else if (transtionRemainAmount.compareTo(new BigDecimal("0")) == 0) {
+					entity.setTransationAmount(lastTotal.multiply(new BigDecimal("-1")));
+					entity.setTotalAmount(new BigDecimal("0"));
+					entity.setConfirmTime(payDate);
+					baseMapper.insert(entity);
+					payContractList.add(contract);
+					break;
+				} else {
+					entity.setTransationAmount(transtionRemainAmount.subtract(lastTotal));
+					entity.setTotalAmount(transtionAmount);
+					entity.setConfirmTime(payDate);
+					baseMapper.insert(entity);
+					payContractList.add(contract);
+					break;
+				}
+			}
+
+			payContractList.stream().forEach(contract -> {
+				//鏇存柊浠樻闃舵浠樻
+				List<ContractPaymentSchedule> scheduleList = contractPaymentScheduleMapper.selectList(Wrappers.<ContractPaymentSchedule>lambdaQuery()
+						.eq(ContractPaymentSchedule::getContractId, contract.getId()).ne(ContractPaymentSchedule::getPaymentStatus, 2)
+						.orderByAsc(ContractPaymentSchedule::getCreateTime));
+				if (ArrayUtil.isNotEmpty(scheduleList.toArray())) {
+					BigDecimal remain = transtionAmount;
+					for (ContractPaymentSchedule schedule : scheduleList) {
+						BigDecimal lastRemain = remain;
+						remain = lastRemain.subtract(StrUtil.equals(schedule.getPaymentStatus() + "", "0") ? schedule.getPlannedAmount() :
+								schedule.getPlannedAmount().subtract(schedule.getActualAmount()));
+						if (remain.compareTo(new BigDecimal("0")) >= 0) {
+							schedule.setActualAmount(schedule.getPlannedAmount());
+							schedule.setPaymentDate(payDate);
+							schedule.setPaymentStatus(2);
+							contractPaymentScheduleMapper.updateById(schedule);
+							//鏌ヨ鏄惁鏈夊綋鍓嶉�炬湡
+							CurrentOverdue currentOverdue = currentOverdueMapper.selectOne(Wrappers.<CurrentOverdue>lambdaQuery().eq(CurrentOverdue::getScheduleId, schedule.getId())
+									.eq(CurrentOverdue::getContractId, schedule.getContractId()).last("limit 1"));
+							if (ObjUtil.isNotNull(currentOverdue)) {
+								//鏂板閫炬湡鍘嗗彶
+								HistoryOverdue historyOverdue = BeanUtil.copyProperties(currentOverdue, HistoryOverdue.class, "id");
+								historyOverdue.setPaymentTime(payDate);
+								historyOverdue.setCompId(schedule.getCompId());
+								historyOverdueMapper.insert(historyOverdue);
+								//鍒犻櫎褰撳墠閫炬湡
+								currentOverdueMapper.deleteById(currentOverdue);
+							}
+						} else {
+							schedule.setActualAmount(StrUtil.equals(schedule.getPaymentStatus() + "", "0") ? schedule.getPlannedAmount().add(remain) :
+									schedule.getActualAmount().add(lastRemain));
+							schedule.setPaymentDate(payDate);
+							schedule.setPaymentStatus(1);
+							contractPaymentScheduleMapper.updateById(schedule);
+							//鏌ヨ鏄惁鏈夊綋鍓嶉�炬湡
+							CurrentOverdue currentOverdue = currentOverdueMapper.selectOne(Wrappers.<CurrentOverdue>lambdaQuery().eq(CurrentOverdue::getScheduleId, schedule.getId())
+									.eq(CurrentOverdue::getContractId, schedule.getContractId()).last("limit 1"));
+							if (ObjUtil.isNotNull(currentOverdue)) {
+								//鏂板閫炬湡鍘嗗彶
+								HistoryOverdue historyOverdue = BeanUtil.copyProperties(currentOverdue, HistoryOverdue.class, "id");
+								historyOverdue.setReceivableAmount(lastRemain);
+								historyOverdue.setPaymentTime(payDate);
+								historyOverdue.setCompId(schedule.getCompId());
+								historyOverdueMapper.insert(historyOverdue);
+								//鏌ヨ鍘嗗彶宸蹭粯閫炬湡閲戦
+								List<HistoryOverdue> historyOverdueList = historyOverdueMapper.selectList(Wrappers.<HistoryOverdue>lambdaQuery().eq(HistoryOverdue::getScheduleId, currentOverdue.getScheduleId()));
+								BigDecimal hisTotal = historyOverdueList.stream().map(item -> item.getReceivableAmount()).reduce(BigDecimal.ZERO, BigDecimal::add);
+								//鏇存柊褰撳墠閫炬湡
+								currentOverdue.setReceivableAmount(schedule.getPlannedAmount().subtract(hisTotal));
+								currentOverdueMapper.updateById(currentOverdue);
+							}
+							break;
+						}
+					}
+				}
+				//鍚堝悓鎵�鏈変粯娆鹃樁娈�
+				List<ContractPaymentSchedule> payComScheduleList = contractPaymentScheduleMapper.selectList(Wrappers.<ContractPaymentSchedule>lambdaQuery()
+						.eq(ContractPaymentSchedule::getContractId, contract.getId()).ne(ContractPaymentSchedule::getPaymentStatus, 0)
+						);
+				if (ArrayUtil.isNotEmpty(payComScheduleList.toArray())){
+					BigDecimal payTotal = payComScheduleList.stream().map(item->StrUtil.equals(item.getPaymentStatus() + "", "0") ? item.getPlannedAmount() :
+							item.getActualAmount()).reduce(BigDecimal.ZERO,BigDecimal::add);
+					contract.setPaidAmount(payTotal);
+					if (payComScheduleList.stream().allMatch(item -> Objects.equals(item.getPaymentStatus(), 2))) {
+						contract.setContractStatus(3);
+					}
+					contractService.updateById(contract);
+					if (contract.getAmount().compareTo(contract.getPaidAmount()) == 0) {
+						payCompleteContractList.add(contract);
+					}
+					//浠樻 涓� 浠樻鏈叏浠�
+					if (contract.getAmount().compareTo(contract.getPaidAmount()) > 0) {
+						payNoCompleteContractList.add(contract);
+					}
+				}
+			});
+
+			//瀹㈡埛棰勪粯鏈夊墿浣� 涓� 鏈夐浠樻鐨勫悎鍚�
+			if (transtionRemainAmount.compareTo(new BigDecimal("0")) > 0) {
+				if (ArrayUtil.isNotEmpty(payNoCompleteContractList.toArray())){
+					//浣欓 鏀惧埌浠樻鏈畬鎴愬悎鍚� 棰勬敹
+					Contract lastContract = payNoCompleteContractList.get(0);
+					//淇濆瓨鏄庣粏
+					saveNewPaymentConfirm(customer,null,lastContract,transtionRemainAmount,payDate);
+				}
+				if (ArrayUtil.isEmpty(payNoCompleteContractList.toArray())&&ArrayUtil.isNotEmpty(advanceContractList.toArray())){
+					//瀹㈡埛棰勪粯鏈夊墿浣� 娌℃湁棰勪粯娆剧殑鍚堝悓
+					Contract lastContract = advanceContractList.get(0);
+					//淇濆瓨鏄庣粏
+					saveNewPaymentConfirm(customer,null,lastContract,transtionRemainAmount,payDate);
+				}
+				if (ArrayUtil.isEmpty(payNoCompleteContractList.toArray())&&ArrayUtil.isEmpty(advanceContractList.toArray())
+						&&ArrayUtil.isNotEmpty(payCompleteContractList.toArray())) {
+					//瀹㈡埛棰勪粯鏈夊墿浣� 娌℃湁棰勪粯娆剧殑鍚堝悓
+					Contract lastContract = payCompleteContractList.get(payCompleteContractList.size() - 1);
+					//淇濆瓨鏄庣粏
+					saveNewPaymentConfirm(customer,null,lastContract,transtionRemainAmount,payDate);
+
+				}
+			}
+		}
+		return R.ok();
+	}
+
+	@Override
+	public R syncPaymentRecepit() {
+		String accessToken = "";
+		if (redisTemplate.hasKey("BIP_TOKEN")) {
+			accessToken = (String) redisTemplate.opsForValue().get("BIP_TOKEN");
+		} else {
+			getAccessToken(accessToken);
+		}
+		if (StrUtil.isEmpty(accessToken)) {
+			return R.failed("鑾峰彇token澶辫触");
+		}
+		String[] bipCodeArr = codes.split(",");
+		for (String bipCode : bipCodeArr) {
+			//鍏ュ弬
+			JSONObject params = genParams(bipCode);
+			String finalAccessToken = accessToken;
+			new Thread(() -> {
+				try {
+					Thread.sleep(500);
+				} catch (InterruptedException e) {
+					throw new RuntimeException(e);
+				}
+				log.info("SK_CX Request:", params.toJSONString());
+				String result = HttpUtil.post(url + "/yonbip/EFI/collection/list?access_token=" + finalAccessToken, params.toJSONString());
+				log.info("SK_CX Response:{}", result);
+				//淇濆瓨璇锋眰璁板綍
+				saveBipRequestRecord(params, result);
+				JSONObject resultJson = JSONObject.parseObject(result);
+				if (resultJson.containsKey("code") && resultJson.getString("code").equals("200")) {
+					handleAndSave(bipCode, resultJson);
+				}
+
+			}).start();
+		}
+		return R.ok();
+	}
+
+	private JSONObject genParams(String bipCode){
+		JSONObject params = new JSONObject();
+		params.put("pageIndex", 1);
+		params.put("pageSize", 999);
+		params.put("open_billDate_begin", DateUtil.offsetDay(new Date(), -1) + " 00:00:00");
+		params.put("open_billDate_begin", DateUtil.today() + " 00:00:00");
+		//鍗曟嵁鐘舵�佸凡瀹℃壒
+		params.put("verifyState", new String[]{"2"});
+		//寰�鏉ュ璞″鎴�
+		params.put("objectType", new String[]{"1"});
+		//鍗曚綅
+		JSONObject simpleMap = new JSONObject();
+		simpleMap.put("financeOrg.code", bipCode);
+		params.put("simple", simpleMap);
+		return params;
+	}
+
+	private void getAccessToken(String accessToken) {
+		long timestamp = System.currentTimeMillis();
+		Map<String, Object> paramMap = new HashMap<>();
+		paramMap.put("appKey", appKey);
+		paramMap.put("timestamp", timestamp);
+		String signature = null;
+		try {
+			signature = SignHelper.sign(paramMap, appSecret);
+		} catch (NoSuchAlgorithmException e) {
+			throw new RuntimeException(e);
+		} catch (UnsupportedEncodingException e) {
+			throw new RuntimeException(e);
+		} catch (InvalidKeyException e) {
+			throw new RuntimeException(e);
+		}
+		String getTokenResult = HttpUtil.get(url + "/iuap-api-auth/open-auth/selfAppAuth/getAccessToken?appKey=" + appKey + "&timestamp=" + timestamp
+				+ "&signature=" + signature);
+		log.info("Get access_token Response:", getTokenResult);
+		JSONObject tokenJson = JSONObject.parseObject(getTokenResult);
+		if (!tokenJson.containsKey("code") || !tokenJson.getString("code").equals("200")) {
+			log.error("Get access_token ERROR");
+			return;
+		}
+		if (ObjUtil.isNull(tokenJson.get("data")) || ObjUtil.isNull(JSONObject.parseObject(tokenJson.getString("data")))) {
+			log.error("access_token value exception");
+			return;
+		}
+		accessToken = JSONObject.parseObject(tokenJson.getString("data")).getString("access_token");
+		log.info("access_token value:", accessToken);
+		redisTemplate.opsForValue().set("BIP_TOKEN", accessToken, tokenJson.getIntValue("expire") - 10, TimeUnit.SECONDS);
+	}
+
+	private void saveBipRequestRecord(JSONObject params, String result) {
+		BipRequestRecord record = new BipRequestRecord();
+		record.setInterfaceName("<XSJZ_SK_CX_001>-鏀舵鍗曟煡璇㈡帴鍙�");
+		record.setRequestParams(params.toJSONString());
+		record.setResponseParams(result);
+		record.setResponseCode(JSONObject.parseObject(result).getString("code"));
+		bipRequestRecordMapper.insert(record);
+	}
+
+	private void handleAndSave(String bipCode, JSONObject resultJson) {
+		R<SysDept> r = remoteDeptService.selectDeptByBipCode(bipCode);
+		if (!r.isOk()) {
+			log.error("bipcode鏌ヨ鍗曚綅澶辫触");
+			return;
+		}
+		SysDept dept = r.getData();
+		JSONObject dataJson = JSONObject.parseObject(resultJson.getString("data"));
+		if (ObjUtil.isNull(dataJson)) {
+			log.error("杩斿洖缁撴灉涓璬ata瑙ｆ瀽澶辫触");
+			return;
+		}
+		JSONArray recordList = JSONArray.parseArray(resultJson.getString("recordList"));
+		if (ArrayUtil.isEmpty(recordList.toArray())) {
+			log.error("杩斿洖缁撴灉涓璻ecordList涓虹┖");
+			return;
+		}
+		log.info("==================寮�濮嬪鐞嗘敹娆惧崟淇℃伅===================");
+		recordList.stream().forEach(record -> {
+
+			savePaymentConfirm((JSONObject) record, dept);
+		});
+		log.info("==================缁撴潫澶勭悊鏀舵鍗曚俊鎭�===================");
+	}
+
+	private void savePaymentConfirm(JSONObject record, SysDept dept) {
+
+		List<Contract> contractList = contractService.list(Wrappers.<Contract>lambdaQuery().eq(Contract::getPartyA, record.getString("bodyItemCustomerName"))
+				.eq(Contract::getPartyBId, dept.getDeptId()).orderByAsc(Contract::getCreateTime));
+		if (ArrayUtil.isEmpty(contractList.toArray())) {
+			log.error("浠樻鍗昳d锛歿},鐢叉柟锛歿},涔欐柟锛歿},鏃犵浉鍏冲悎鍚�", record.getString("id"), record.getString("bodyItemCustomerName"), dept.getName());
+			return;
 		}
 		BusinessCustomer customer = businessCustomerService.getOne(Wrappers.<BusinessCustomer>lambdaQuery()
-				.eq(StrUtil.isNotBlank(addDTO.getBusGuestName()),BusinessCustomer::getCompanyName,addDTO.getBusGuestName())
-				.eq(StrUtil.isNotBlank(addDTO.getBusGuestId()),BusinessCustomer::getId,addDTO.getBusGuestId()));
-		if(ObjUtil.isNull(customer)){
-			return R.failed("瀹㈠晢鏌ヨ澶辫触锛岃妫�鏌ュ鍟�");
+				.eq(StrUtil.isNotBlank(record.getString("bodyItemCustomerName")), BusinessCustomer::getCompanyName, record.getString("bodyItemCustomerName"))
+		);
+		if (ObjUtil.isNull(customer)) {
+			log.error("浠樻鍗昳d锛歿},瀹㈠晢鏌ヨ澶辫触锛岃妫�鏌ュ鍟�", record.getString("id"));
+			return;
 		}
-
-		PaymentConfirm lastConfirm = baseMapper.selectOne(Wrappers.<PaymentConfirm>lambdaQuery().eq(PaymentConfirm::getContractId,contract.getId())
-				.orderByDesc(PaymentConfirm::getCreateTime).last("limit 1"));
-		BigDecimal lastTotal = new BigDecimal("0");
-		if(ObjUtil.isNotNull(lastConfirm)){
-			lastTotal = lastConfirm.getTotalAmount();
+		if (ObjUtil.isNull(record.getBigDecimal("bodyItemOriTaxExcludedAmount"))) {
+			log.error("浠樻鍗昳d锛歿},浠樻鍗曟棤绋庨噾棰濓紝寮傚父", record.getString("id"));
+			return;
 		}
+		//淇濆瓨浠樻鍗�
+		Boolean codeFlag = savePaymentSlip(customer,record);
+		if (codeFlag){
+			log.error("浠樻鍗昳d锛歿},浠樻鍗曞凡瀛樺湪");
+			return;
+		}
+		BigDecimal transtionAmount = record.getBigDecimal("bodyItemOriTaxExcludedAmount");
+		//鍓╀綑浠樻
+		BigDecimal transtionRemainAmount = transtionAmount;
+		//鏀跺埌浠樻鐨勫悎鍚�
+		List<Contract> payContractList = new ArrayList<>();
+		//浠樻瀹屾垚鐨勫悎鍚�
+		List<Contract> payCompleteContractList = new ArrayList<>();
+		//浠樻鏈畬鎴愮殑鍚堝悓
+		List<Contract> payNoCompleteContractList = new ArrayList<>();
+		//鏈夐浠樻鐨勫悎鍚�
+		List<Contract> advanceContractList = new ArrayList<>();
+		//浠樻鏃堕棿
+		Date payDate = DateUtil.parse(record.getString("billDate"), DatePattern.NORM_DATETIME_FORMAT);
+		for (Contract contract : contractList) {
+			PaymentConfirm lastConfirm = baseMapper.selectOne(Wrappers.<PaymentConfirm>lambdaQuery().eq(PaymentConfirm::getContractId, contract.getId())
+					.orderByDesc(PaymentConfirm::getCreateTime).last("limit 1"));
+			BigDecimal lastTotal = new BigDecimal("0");
+			if (ObjUtil.isNotNull(lastConfirm)) {
+				lastTotal = lastConfirm.getTotalAmount();
+			}
 
-		//杞叆
-		if (StrUtil.equals(addDTO.getInOrOut(),"1")){
-			BigDecimal newtotal = addDTO.getTransationAmount().add(lastTotal);
+			//鍚堝悓鏈�杩戞槑缁嗘�婚涓�0 鎴� > 0 鎯呭喌涓�
+			if (lastTotal.compareTo(new BigDecimal("0")) >= 0) {
+				log.info("褰撳墠鍚堝悓鍙凤細{},鏄庣粏鎬婚鏃犲簲鏀舵", contract.getContractNo());
+				advanceContractList.add(contract);
+				continue;
+			}
+
+			transtionRemainAmount = transtionRemainAmount.add(lastTotal);
 			PaymentConfirm entity = new PaymentConfirm();
 			entity.setContractId(contract.getId());
 			entity.setContractName(contract.getContractName());
-			entity.setContractNo(addDTO.getContractNo());
-			if(ObjUtil.isNotNull(lastConfirm)){
+			entity.setContractNo(contract.getContractNo());
+			if (ObjUtil.isNotNull(lastConfirm)) {
 				entity.setScheduleId(lastConfirm.getScheduleId());
 				entity.setScheduleName(lastConfirm.getScheduleName());
 			}
 			entity.setBusGuestId(customer.getId());
 			entity.setBusGuestName(customer.getCompanyName());
 			entity.setBusinessType("瀹㈡埛浠樻");
-			if (newtotal.compareTo(new BigDecimal("0"))>0){
-				entity.setTransationAmount(addDTO.getTransationAmount());
-				entity.setAdvanceAmount(newtotal);
-				entity.setTotalAmount(newtotal);
-				entity.setConfirmTime(new Date());
+			entity.setIsBip(1);
+			entity.setPaymentCode(record.getString("code"));
+			entity.setPayType(record.get("bodyItemSettleModeName") != null ? record.getString("bodyItemSettleModeName").contains("鎵垮厬姹囩エ") ? 1 : 0 : null);
+			entity.setBipId(record.getString("id"));
+			if (transtionRemainAmount.compareTo(new BigDecimal("0")) > 0) {
+				entity.setTransationAmount(lastTotal.multiply(new BigDecimal("-1")));
+				entity.setTotalAmount(new BigDecimal("0"));
+				entity.setConfirmTime(payDate);
 				baseMapper.insert(entity);
-			}else if (newtotal.compareTo(new BigDecimal("0"))==0){
-				entity.setTransationAmount(addDTO.getTransationAmount());
-				entity.setTotalAmount(newtotal);
-				entity.setConfirmTime(new Date());
+			} else if (transtionRemainAmount.compareTo(new BigDecimal("0")) == 0) {
+				entity.setTransationAmount(lastTotal.multiply(new BigDecimal("-1")));
+				entity.setTotalAmount(new BigDecimal("0"));
+				entity.setConfirmTime(payDate);
 				baseMapper.insert(entity);
-			}else {
-				entity.setTransationAmount(addDTO.getTransationAmount());
-				entity.setReceivableAmount(newtotal.multiply(new BigDecimal("-1")));
-				entity.setTotalAmount(newtotal);
-				entity.setConfirmTime(new Date());
+				break;
+			} else {
+				entity.setTransationAmount(transtionRemainAmount.subtract(lastTotal));
+				entity.setTotalAmount(transtionAmount);
+				entity.setConfirmTime(payDate);
 				baseMapper.insert(entity);
+				break;
 			}
+		}
+
+		payContractList.stream().forEach(contract -> {
 			//鏇存柊浠樻闃舵浠樻
 			List<ContractPaymentSchedule> scheduleList = contractPaymentScheduleMapper.selectList(Wrappers.<ContractPaymentSchedule>lambdaQuery()
-					.eq(ContractPaymentSchedule::getContractId,contract.getId()).ne(ContractPaymentSchedule::getPaymentStatus,2)
+					.eq(ContractPaymentSchedule::getContractId, contract.getId()).ne(ContractPaymentSchedule::getPaymentStatus, 2)
 					.orderByAsc(ContractPaymentSchedule::getCreateTime));
-			if (ArrayUtil.isNotEmpty(scheduleList.toArray())){
-				BigDecimal remain = addDTO.getTransationAmount();
-				for (ContractPaymentSchedule schedule:scheduleList) {
+			if (ArrayUtil.isNotEmpty(scheduleList.toArray())) {
+				BigDecimal remain = transtionAmount;
+				for (ContractPaymentSchedule schedule : scheduleList) {
 					BigDecimal lastRemain = remain;
-					remain = remain.subtract(StrUtil.equals(schedule.getPaymentStatus()+"","0")?schedule.getPlannedAmount():
+					remain = remain.subtract(StrUtil.equals(schedule.getPaymentStatus() + "", "0") ? schedule.getPlannedAmount() :
 							schedule.getPlannedAmount().subtract(schedule.getActualAmount()));
-					if (remain.compareTo(new BigDecimal("0"))>=0){
+					if (remain.compareTo(new BigDecimal("0")) >= 0) {
 						schedule.setActualAmount(schedule.getPlannedAmount());
-						schedule.setPaymentDate(addDTO.getConfirmTime());
+						schedule.setPaymentDate(payDate);
 						schedule.setPaymentStatus(2);
 						contractPaymentScheduleMapper.updateById(schedule);
 						//鏌ヨ鏄惁鏈夊綋鍓嶉�炬湡
-						CurrentOverdue currentOverdue = currentOverdueMapper.selectOne(Wrappers.<CurrentOverdue>lambdaQuery().eq(CurrentOverdue::getScheduleId,schedule.getId())
-								.eq(CurrentOverdue::getContractId,schedule.getContractId()).last("limit 1"));
-						if (ObjUtil.isNotNull(currentOverdue)){
+						CurrentOverdue currentOverdue = currentOverdueMapper.selectOne(Wrappers.<CurrentOverdue>lambdaQuery().eq(CurrentOverdue::getScheduleId, schedule.getId())
+								.eq(CurrentOverdue::getContractId, schedule.getContractId()).last("limit 1"));
+						if (ObjUtil.isNotNull(currentOverdue)) {
 							//鏂板閫炬湡鍘嗗彶
-							HistoryOverdue historyOverdue = BeanUtil.copyProperties(currentOverdue,HistoryOverdue.class,"id");
-							historyOverdue.setPaymentTime(addDTO.getConfirmTime());
+							HistoryOverdue historyOverdue = BeanUtil.copyProperties(currentOverdue, HistoryOverdue.class, "id");
+							historyOverdue.setPaymentTime(payDate);
 							historyOverdue.setCompId(schedule.getCompId());
 							historyOverdueMapper.insert(historyOverdue);
 							//鍒犻櫎褰撳墠閫炬湡
 							currentOverdueMapper.deleteById(currentOverdue);
 						}
-					}else {
-						schedule.setActualAmount(StrUtil.equals(schedule.getPaymentStatus()+"","0")?schedule.getPlannedAmount().add(remain):
+					} else {
+						schedule.setActualAmount(StrUtil.equals(schedule.getPaymentStatus() + "", "0") ? schedule.getPlannedAmount().add(remain) :
 								schedule.getActualAmount().add(lastRemain));
-						schedule.setPaymentDate(addDTO.getConfirmTime());
+						schedule.setPaymentDate(payDate);
 						schedule.setPaymentStatus(1);
 						contractPaymentScheduleMapper.updateById(schedule);
 						//鏌ヨ鏄惁鏈夊綋鍓嶉�炬湡
-						CurrentOverdue currentOverdue = currentOverdueMapper.selectOne(Wrappers.<CurrentOverdue>lambdaQuery().eq(CurrentOverdue::getScheduleId,schedule.getId())
-								.eq(CurrentOverdue::getContractId,schedule.getContractId()).last("limit 1"));
-						if (ObjUtil.isNotNull(currentOverdue)){
+						CurrentOverdue currentOverdue = currentOverdueMapper.selectOne(Wrappers.<CurrentOverdue>lambdaQuery().eq(CurrentOverdue::getScheduleId, schedule.getId())
+								.eq(CurrentOverdue::getContractId, schedule.getContractId()).last("limit 1"));
+						if (ObjUtil.isNotNull(currentOverdue)) {
 							//鏂板閫炬湡鍘嗗彶
-							HistoryOverdue historyOverdue = BeanUtil.copyProperties(currentOverdue,HistoryOverdue.class,"id");
+							HistoryOverdue historyOverdue = BeanUtil.copyProperties(currentOverdue, HistoryOverdue.class, "id");
 							historyOverdue.setReceivableAmount(lastRemain);
-							historyOverdue.setPaymentTime(addDTO.getConfirmTime());
+							historyOverdue.setPaymentTime(payDate);
 							historyOverdue.setCompId(schedule.getCompId());
 							historyOverdueMapper.insert(historyOverdue);
 							//鏌ヨ鍘嗗彶宸蹭粯閫炬湡閲戦
-							List<HistoryOverdue> historyOverdueList = historyOverdueMapper.selectList(Wrappers.<HistoryOverdue>lambdaQuery().eq(HistoryOverdue::getScheduleId,currentOverdue.getScheduleId()));
-							BigDecimal hisTotal = historyOverdueList.stream().map(item->item.getReceivableAmount()).reduce(BigDecimal.ZERO,BigDecimal::add);
+							List<HistoryOverdue> historyOverdueList = historyOverdueMapper.selectList(Wrappers.<HistoryOverdue>lambdaQuery().eq(HistoryOverdue::getScheduleId, currentOverdue.getScheduleId()));
+							BigDecimal hisTotal = historyOverdueList.stream().map(item -> item.getReceivableAmount()).reduce(BigDecimal.ZERO, BigDecimal::add);
 							//鏇存柊褰撳墠閫炬湡
 							currentOverdue.setReceivableAmount(schedule.getPlannedAmount().subtract(hisTotal));
 							currentOverdueMapper.updateById(currentOverdue);
@@ -154,70 +661,107 @@
 					}
 				}
 			}
-			//鏇存柊鍚堝悓宸蹭粯娆�
-			BigDecimal paid = new BigDecimal("0");
-			if (ObjUtil.isNotNull(contract.getPaidAmount())){
-				paid = contract.getPaidAmount();
-			}
-			paid = paid.add(addDTO.getTransationAmount());
-			contract.setPaidAmount(paid);
-			if (paid.compareTo(contract.getAmount())>0){
-				contract.setPaidAmount(contract.getAmount());
-			}
-			contractService.updateById(contract);
-		}
-		//杞嚭
-		if (StrUtil.equals(addDTO.getInOrOut(),"2")){
-			PaymentConfirm entity = new PaymentConfirm();
-			entity.setContractId(contract.getId());
-			entity.setContractName(contract.getContractName());
-			entity.setContractNo(addDTO.getContractNo());
-
-			entity.setBusGuestId(customer.getId());
-			entity.setBusGuestName(customer.getCompanyName());
-			entity.setBusinessType("");
-			entity.setTransationAmount(addDTO.getTransationAmount());
-			BigDecimal newtotal = addDTO.getTransationAmount().multiply(new BigDecimal("-1")).add(lastConfirm.getTotalAmount());
-			if (newtotal.compareTo(new BigDecimal("0"))>0){
-				entity.setAdvanceAmount(newtotal);
-				entity.setTotalAmount(newtotal);
-			}else if (newtotal.compareTo(new BigDecimal("0"))==0){
-				entity.setTotalAmount(newtotal);
-			}else {
-				return R.failed("褰撳墠瀹㈡埛浣欓涓�"+lastConfirm.getTotalAmount()+"涓嶈冻浠ユ弧瓒冲綋鍓嶅彂鐢熼噾棰濓紝鏃犳硶鎿嶄綔");
-			}
-			entity.setConfirmTime(new Date());
-			baseMapper.insert(entity);
-		}
-		// 鏌ヨ鎵�鏈変粯娆鹃樁娈垫槸鍚﹂兘浠樻瀹屾垚
-		List<ContractPaymentSchedule> scheduleList = contractPaymentScheduleMapper.selectList(Wrappers.<ContractPaymentSchedule>lambdaQuery().eq(ContractPaymentSchedule::getContractId,contract.getId()));
-		if (ArrayUtil.isNotEmpty(scheduleList.toArray())){
-			if (scheduleList.stream().allMatch(item -> Objects.equals(item.getPaymentStatus(), 2))){
-				contract.setContractStatus(3);
+			//鍚堝悓鎵�鏈変粯娆鹃樁娈�
+			List<ContractPaymentSchedule> payComScheduleList = contractPaymentScheduleMapper.selectList(Wrappers.<ContractPaymentSchedule>lambdaQuery()
+					.eq(ContractPaymentSchedule::getContractId, contract.getId()).ne(ContractPaymentSchedule::getPaymentStatus, 0)
+			);
+			if (ArrayUtil.isNotEmpty(payComScheduleList.toArray())){
+				BigDecimal payTotal = payComScheduleList.stream().map(item->StrUtil.equals(item.getPaymentStatus() + "", "0") ? item.getPlannedAmount() :
+						item.getActualAmount()).reduce(BigDecimal.ZERO,BigDecimal::add);
+				contract.setPaidAmount(payTotal);
+				if (payComScheduleList.stream().allMatch(item -> Objects.equals(item.getPaymentStatus(), 2))) {
+					contract.setContractStatus(3);
+				}
 				contractService.updateById(contract);
-			};
+				if (contract.getAmount().compareTo(contract.getPaidAmount()) == 0) {
+					payCompleteContractList.add(contract);
+				}
+				//浠樻 涓� 浠樻鏈叏浠�
+				if (contract.getAmount().compareTo(contract.getPaidAmount()) > 0) {
+					payNoCompleteContractList.add(contract);
+				}
+			}
+		});
+
+		//瀹㈡埛棰勪粯鏈夊墿浣� 涓� 鏈夐浠樻鐨勫悎鍚�
+		if (transtionRemainAmount.compareTo(new BigDecimal("0")) > 0) {
+			if (ArrayUtil.isNotEmpty(payNoCompleteContractList.toArray())){
+				//浣欓 鏀惧埌浠樻鏈畬鎴愬悎鍚� 棰勬敹
+				Contract lastContract = payNoCompleteContractList.get(payNoCompleteContractList.size() - 1);
+				//淇濆瓨鏄庣粏
+				saveNewPaymentConfirm(customer,record,lastContract,transtionRemainAmount,payDate);
+			}
+			if (ArrayUtil.isEmpty(payNoCompleteContractList.toArray())&&ArrayUtil.isNotEmpty(advanceContractList.toArray())){
+				//瀹㈡埛棰勪粯鏈夊墿浣� 娌℃湁棰勪粯娆剧殑鍚堝悓
+				Contract lastContract = payNoCompleteContractList.get(payNoCompleteContractList.size() - 1);
+				//淇濆瓨鏄庣粏
+				saveNewPaymentConfirm(customer,record,lastContract,transtionRemainAmount,payDate);
+			}
+			if (ArrayUtil.isEmpty(payNoCompleteContractList.toArray())&&ArrayUtil.isEmpty(advanceContractList.toArray())
+					&&ArrayUtil.isNotEmpty(payCompleteContractList.toArray())) {
+				//瀹㈡埛棰勪粯鏈夊墿浣� 娌℃湁棰勪粯娆剧殑鍚堝悓
+				Contract lastContract = payCompleteContractList.get(payCompleteContractList.size() - 1);
+				//淇濆瓨鏄庣粏
+				saveNewPaymentConfirm(customer,record,lastContract,transtionRemainAmount,payDate);
+
+			}
 		}
-		return R.ok();
 	}
 
-	@Override
-	public R syncPaymentRecepit() {
+	private Boolean savePaymentSlip(BusinessCustomer customer, JSONObject record) {
+		PaymentSlip slip = new PaymentSlip();
+		slip.setBusGuestId(customer.getId());
+		slip.setBusGuestName(customer.getCompanyName());
+		slip.setPaymentTime(ObjUtil.isNotNull(record.get("billDate"))?
+				DateUtil.parse(record.getString("billDate"), DatePattern.NORM_DATETIME_FORMAT):new Date());
+		slip.setPaymentAmount(ObjUtil.isNotNull(record.get("bodyItemOriTaxExcludedAmount"))?record.getBigDecimal("bodyItemOriTaxExcludedAmount"):new BigDecimal("0"));
+		slip.setPayType(ObjUtil.isNotNull(record.get("bodyItemSettleModeName"))?record.getString("bodyItemSettleModeName"):"");
+		if (ObjUtil.isNotNull(record.get("code"))){
+			slip.setPaymentNumber(record.getString("code"));
+			PaymentSlip paymentSlip = paymentSlipMapper.selectOne(Wrappers.<PaymentSlip>lambdaQuery().eq(PaymentSlip::getPaymentNumber,slip.getPaymentNumber()));
+			if (ObjUtil.isNull(paymentSlip)) {
+				paymentSlipMapper.insert(slip);
+				return false;
+			}
+		}
+		return true;
+	}
 
-		JSONObject params = new JSONObject();
-		params.put("pageIndex", 1);
-		params.put("pageSize", 999);
-		params.put("open_billDate_begin", DateUtil.offsetDay(new Date(),-1) + " 00:00:00");
-		params.put("open_billDate_begin", DateUtil.today() + " 00:00:00");
-		//鍗曟嵁鐘舵�佸凡瀹℃壒
-		params.put("verifyState", new String[]{"2"});
-		//寰�鏉ュ璞″鎴�
-		params.put("objectType", new String[]{"1"});
-		//鍗曚綅
-//		JSONObject simpleMap = new JSONObject();
-//		simpleMap.put("financeOrg.code", bipCode);
-//		params.put("simple", simpleMap);
-		HttpUtil.post(url+"/yonbip/EFI/collection/list",params.toJSONString());
+	public void saveNewPaymentConfirm(BusinessCustomer customer,JSONObject record,Contract contract,BigDecimal transtionRemainAmount
+		,Date payDate){
+		PaymentConfirm entity = new PaymentConfirm();
+		entity.setContractId(contract.getId());
+		entity.setContractName(contract.getContractName());
+		entity.setContractNo(contract.getContractNo());
+		PaymentConfirm lastConfirm = baseMapper.selectOne(Wrappers.<PaymentConfirm>lambdaQuery().eq(PaymentConfirm::getContractId, contract.getId())
+				.orderByDesc(PaymentConfirm::getCreateTime).last("limit 1"));
+		BigDecimal lastTotal = new BigDecimal("0");
+		if (ObjUtil.isNotNull(lastConfirm)) {
+			lastTotal = lastConfirm.getTotalAmount();
+		}
 
-		return null;
+		if (ObjUtil.isNotNull(lastConfirm)) {
+			entity.setScheduleId(lastConfirm.getScheduleId());
+			entity.setScheduleName(lastConfirm.getScheduleName());
+		}
+
+		entity.setBusGuestId(customer.getId());
+		entity.setBusGuestName(customer.getCompanyName());
+		entity.setBusinessType("瀹㈡埛浠樻");
+		if (ObjUtil.isNotNull(record)){
+			entity.setIsBip(1);
+			entity.setPaymentCode(record.getString("code"));
+			entity.setPayType(record.get("bodyItemSettleModeName") != null ? record.getString("bodyItemSettleModeName").contains("鎵垮厬姹囩エ") ? 1 : 0 : null);
+			entity.setBipId(record.getString("id"));
+		}
+		entity.setConfirmTime(payDate);
+		entity.setTransationAmount(transtionRemainAmount);
+		entity.setTotalAmount(transtionRemainAmount.add(lastTotal));
+		if (entity.getTotalAmount().compareTo(new BigDecimal("0"))>0){
+			entity.setAdvanceAmount(entity.getTotalAmount());
+		}else if (entity.getTotalAmount().compareTo(new BigDecimal("0"))<0){
+			entity.setReceivableAmount(entity.getTotalAmount().multiply(new BigDecimal("-1")));
+		}
+		baseMapper.insert(entity);
 	}
 }
\ No newline at end of file

--
Gitblit v1.9.1