feat:合同新增时显示供应属性 出库新增根据合同出库 资金账目新增时间条件检索 新增延期出货菜单

shiyunteng

2026-06-17 0ee46d33cc339f3fd17593e6bfe2f033afe6019a

 platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/PaymentConfirmServiceImpl.java

@@ -34,6 +34,7 @@
import java.security.NoSuchAlgorithmException;
import java.util.*;
import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;

/**
 * 收款确认
@@ -73,8 +74,11 @@
   public R add(PaymentConfirmAddDTO addDTO) {
      if (StrUtil.isNotBlank(addDTO.getContractNo())) {
         Contract contract = contractService.getOne(Wrappers.<Contract>lambdaQuery().eq(Contract::getContractNo, addDTO.getContractNo()));
         if (ObjUtil.isNull(contract)) {
            return R.failed("合同查询失败，请检查合同编号");
         }
         BusinessCustomer customer = businessCustomerService.getOne(Wrappers.<BusinessCustomer>lambdaQuery()
               .eq(StrUtil.isNotBlank(addDTO.getBusGuestName()), BusinessCustomer::getCompanyName, addDTO.getBusGuestName())
               .eq(StrUtil.isNotBlank(addDTO.getBusGuestName()), BusinessCustomer::getRegisterName, addDTO.getBusGuestName())
               .eq(StrUtil.isNotBlank(addDTO.getBusGuestId()), BusinessCustomer::getId, addDTO.getBusGuestId()));
         if (ObjUtil.isNull(customer)) {
            return R.failed("客商查询失败，请检查客商");
@@ -99,7 +103,7 @@
               entity.setScheduleName(lastConfirm.getScheduleName());
            }
            entity.setBusGuestId(customer.getId());
            entity.setBusGuestName(customer.getCompanyName());
            entity.setBusGuestName(customer.getRegisterName());
            entity.setBusinessType("客户付款");
            if (newtotal.compareTo(new BigDecimal("0")) > 0) {
               entity.setTransationAmount(addDTO.getTransationAmount());
@@ -193,8 +197,8 @@
            entity.setContractNo(addDTO.getContractNo());

            entity.setBusGuestId(customer.getId());
            entity.setBusGuestName(customer.getCompanyName());
            entity.setBusinessType("");
            entity.setBusGuestName(customer.getRegisterName());
            entity.setBusinessType("退款");
            entity.setTransationAmount(addDTO.getTransationAmount());
            BigDecimal newtotal = addDTO.getTransationAmount().multiply(new BigDecimal("-1")).add(lastConfirm.getTotalAmount());
            if (newtotal.compareTo(new BigDecimal("0")) > 0) {
@@ -225,7 +229,7 @@
            return R.failed("为查询到未付款合同");
         }
         BusinessCustomer customer = businessCustomerService.getOne(Wrappers.<BusinessCustomer>lambdaQuery()
               .eq(StrUtil.isNotBlank(addDTO.getBusGuestName()), BusinessCustomer::getCompanyName, addDTO.getBusGuestName())
               .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)) {
@@ -234,7 +238,7 @@
         //新增付款单
         PaymentSlip slip = new PaymentSlip();
         slip.setBusGuestId(customer.getId());
         slip.setBusGuestName(customer.getCompanyName());
         slip.setBusGuestName(customer.getRegisterName());
         slip.setPayeeCompId(SecurityUtils.getUser().getCompId());
         slip.setPaymentTime(addDTO.getConfirmTime());
         slip.setPaymentAmount(addDTO.getTransationAmount());
@@ -285,7 +289,7 @@
               entity.setScheduleName(lastConfirm.getScheduleName());
            }
            entity.setBusGuestId(customer.getId());
            entity.setBusGuestName(customer.getCompanyName());
            entity.setBusGuestName(customer.getRegisterName());
            entity.setBusinessType("客户付款");
            if (transtionRemainAmount.compareTo(new BigDecimal("0")) > 0) {
               entity.setConfirmTime(payDate);
@@ -465,7 +469,7 @@
            String result = HttpUtil.post(url + "/yonbip/EFI/collection/list?access_token=" + finalAccessToken, params.toJSONString());
            log.info("SK_CX Response:{}", result);
            //保存请求记录
            saveBipRequestRecord(params, result);
            saveBipRequestRecord(params,"<XSJZ_SK_CX_001>-收款单查询接口", result);
            JSONObject resultJson = JSONObject.parseObject(result);
            if (resultJson.containsKey("code") && resultJson.getString("code").equals("200")) {
               handleAndSave(bipCode, resultJson);
@@ -493,7 +497,8 @@
      return params;
   }

   private void getAccessToken(String accessToken) {
   @Override
   public String getAccessToken(String accessToken) {
      long timestamp = System.currentTimeMillis();
      Map<String, Object> paramMap = new HashMap<>();
      paramMap.put("appKey", appKey);
@@ -514,20 +519,22 @@
      JSONObject tokenJson = JSONObject.parseObject(getTokenResult);
      if (!tokenJson.containsKey("code") || !tokenJson.getString("code").equals("200")) {
         log.error("Get access_token ERROR");
         return;
         return "";
      }
      if (ObjUtil.isNull(tokenJson.get("data")) || ObjUtil.isNull(JSONObject.parseObject(tokenJson.getString("data")))) {
         log.error("access_token value exception");
         return;
         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);
      return accessToken;
   }

   private void saveBipRequestRecord(JSONObject params, String result) {
   @Override
   public void saveBipRequestRecord(JSONObject params, String methodName, String result) {
      BipRequestRecord record = new BipRequestRecord();
      record.setInterfaceName("<XSJZ_SK_CX_001>-收款单查询接口");
      record.setInterfaceName(methodName);
      record.setRequestParams(params.toJSONString());
      record.setResponseParams(result);
      record.setResponseCode(JSONObject.parseObject(result).getString("code"));
@@ -568,7 +575,7 @@
         return;
      }
      BusinessCustomer customer = businessCustomerService.getOne(Wrappers.<BusinessCustomer>lambdaQuery()
            .eq(StrUtil.isNotBlank(record.getString("bodyItemCustomerName")), BusinessCustomer::getCompanyName, record.getString("bodyItemCustomerName"))
            .eq(StrUtil.isNotBlank(record.getString("bodyItemCustomerName")), BusinessCustomer::getRegisterName, record.getString("bodyItemCustomerName"))
      );
      if (ObjUtil.isNull(customer)) {
         log.error("付款单id：{},客商查询失败，请检查客商", record.getString("id"));
@@ -624,7 +631,7 @@
            entity.setScheduleName(lastConfirm.getScheduleName());
         }
         entity.setBusGuestId(customer.getId());
         entity.setBusGuestName(customer.getCompanyName());
         entity.setBusGuestName(customer.getRegisterName());
         entity.setBusinessType("客户付款");
         entity.setIsBip(1);
         entity.setPaymentCode(record.getString("code"));
@@ -781,7 +788,7 @@
   private Boolean savePaymentSlip(BusinessCustomer customer, JSONObject record,SysDept dept) {
      PaymentSlip slip = new PaymentSlip();
      slip.setBusGuestId(customer.getId());
      slip.setBusGuestName(customer.getCompanyName());
      slip.setBusGuestName(customer.getRegisterName());
      slip.setPayee(dept.getName());
      slip.setPayeeCompId(dept.getDeptId());
      slip.setPaymentTime(ObjUtil.isNotNull(record.get("billDate"))?
@@ -818,7 +825,7 @@
      }

      entity.setBusGuestId(customer.getId());
      entity.setBusGuestName(customer.getCompanyName());
      entity.setBusGuestName(customer.getRegisterName());
      entity.setBusinessType("客户付款");
      if (ObjUtil.isNotNull(record)){
         entity.setIsBip(1);
@@ -836,4 +843,10 @@
      }
      baseMapper.insert(entity);
   }

   @Override
   public R queryAllBusinessType() {
      return R.ok(baseMapper.selectList(Wrappers.<PaymentConfirm>lambdaQuery().select(PaymentConfirm::getBusinessType).isNotNull(PaymentConfirm::getBusinessType)
                  .groupBy(PaymentConfirm::getBusinessType)).stream().map(PaymentConfirm::getBusinessType).collect(Collectors.toList()));
   }
}