fix: 添加thirty不再支付

src/main/java/com/qs/serve/modules/pay/entity/bo/PayPaymentBo.java

@@ -31,12 +31,9 @@ public class PayPaymentBo implements Serializable {
     private String verificationSubCode;
 
     /** 支付金额 */
-//    @DecimalMin(value = "0.01",message = "支付金额必须大于0元")
-//    @NotNull(message = "支付金额不能为空")
     private BigDecimal payAmount;
 
     /** ERP编码 */
-//    @NotNull(message = "ERP编码不能为空")
     private String erpId;
 
     /** 发票编号 */
@@ -50,13 +47,11 @@ public class PayPaymentBo implements Serializable {
     /** 支付时间 */
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
-//    @NotNull(message = "支付时间不能为空")
     private LocalDateTime payTime;
 
     /** 支付日期 */
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
-//    @NotNull(message = "支付日期不能为空")
     private LocalDateTime payDate;
 
     /** 人员工号 */

src/main/java/com/qs/serve/modules/third/PortalOfCostController.java

@@ -8,15 +8,14 @@ import com.qs.serve.common.model.dto.R;
 import com.qs.serve.common.util.Assert;
 import com.qs.serve.common.util.CollectionUtil;
 import com.qs.serve.common.util.JsonUtil;
+import com.qs.serve.modules.pay.entity.bo.PayPaymentBo;
 import com.qs.serve.modules.sys.entity.SysSyncLog;
 import com.qs.serve.modules.sys.service.SysSyncLogService;
 import com.qs.serve.modules.tbs.entity.TbsCostApply;
 import com.qs.serve.modules.third.consts.ThirtyConst;
-import com.qs.serve.modules.third.entity.ProcessCreateContractCheckBo;
+import com.qs.serve.modules.third.entity.*;
-import com.qs.serve.modules.third.entity.ProcessCreateCostApplyBo;
-import com.qs.serve.modules.third.entity.ProcessCreatePolicyCostBo;
-import com.qs.serve.modules.third.entity.ProcessReleaseContractBo;
 import com.qs.serve.modules.third.service.PortalOfCostApplication;
+import com.qs.serve.modules.third.service.PortalOfCostPartApplication;
 import com.qs.serve.modules.tzc.service.TzcPolicyGoodsSyncService;
 import com.qs.serve.modules.vtb.common.VtbVerificationState;
 import com.qs.serve.modules.vtb.entity.VtbVerification;
@@ -52,6 +51,7 @@ public class PortalOfCostController {
     private VtbVerificationSubjectService verificationSubjectService;
     private PortalOfCostApplication portalOfCostApplication;
     private SysSyncLogService sysSyncLogService;
+    private PortalOfCostPartApplication portalOfCostPartApplication;
 
     /**
      * 一站式创建费用(费用申请)
@@ -147,7 +147,7 @@ public class PortalOfCostController {
      * @return
      */
     @PostMapping("releaseContractNoPay")
-    public R<?> releaseContractNoPay(@Valid @RequestBody ProcessReleaseContractBo contractBo, HttpServletRequest request){
+    public R<?> releaseContractNoPay(@Valid @RequestBody PayPaymentBo contractBo, HttpServletRequest request){
         SysSyncLog syncLog = new SysSyncLog();
         syncLog.setFromPlat("协议类不再支付");
         syncLog.setUrl(request.getRequestURI());
@@ -155,7 +155,7 @@ public class PortalOfCostController {
         syncLog.setEntityClass(ProcessCreateCostApplyBo.class.getName());
         try {
             ThirdTokenUtil.checkToken(request);
-            portalOfCostApplication.releaseContractCost(contractBo);
+            portalOfCostPartApplication.toContractNotPay(contractBo);
             syncLog.setSuccessStatus(1);
         } catch (Exception e) {
             log.error("协议类不再支付===>{}", JsonUtil.objectToJson(contractBo));

src/main/java/com/qs/serve/modules/third/service/PortalOfCostPartApplication.java

@@ -0,0 +1,139 @@
+package com.qs.serve.modules.third.service;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.qs.serve.common.config.properties.ProjectApisProperties;
+import com.qs.serve.common.model.consts.ResultFlag;
+import com.qs.serve.common.model.enums.BudgetLogOptFlag;
+import com.qs.serve.common.util.*;
+import com.qs.serve.modules.bms.entity.BmsCostCenter;
+import com.qs.serve.modules.bms.entity.BmsRegion;
+import com.qs.serve.modules.bms.entity.BmsSubject;
+import com.qs.serve.modules.bms.entity.BmsSupplier;
+import com.qs.serve.modules.bms.service.BmsCostCenterService;
+import com.qs.serve.modules.bms.service.BmsRegionService;
+import com.qs.serve.modules.bms.service.BmsSubjectService;
+import com.qs.serve.modules.bms.service.BmsSupplierService;
+import com.qs.serve.modules.goods.entity.GoodsCategory;
+import com.qs.serve.modules.goods.entity.GoodsSku;
+import com.qs.serve.modules.goods.entity.GoodsSpu;
+import com.qs.serve.modules.goods.service.GoodsCategoryService;
+import com.qs.serve.modules.goods.service.GoodsSkuService;
+import com.qs.serve.modules.goods.service.GoodsSpuService;
+import com.qs.serve.modules.pay.common.PaymentType;
+import com.qs.serve.modules.pay.entity.PayPayment;
+import com.qs.serve.modules.pay.entity.PayPaymentItem;
+import com.qs.serve.modules.pay.entity.bo.PayPaymentBo;
+import com.qs.serve.modules.pay.service.PayPaymentItemService;
+import com.qs.serve.modules.pay.service.PayPaymentService;
+import com.qs.serve.modules.seeyon.service.XiaoLuTonService;
+import com.qs.serve.modules.sys.entity.SysSyncLog;
+import com.qs.serve.modules.sys.entity.SysTableTemp;
+import com.qs.serve.modules.sys.entity.SysUser;
+import com.qs.serve.modules.sys.mapper.SysTableTempMapper;
+import com.qs.serve.modules.sys.mapper.SysUserCodeMathMapper;
+import com.qs.serve.modules.sys.service.SysSyncLogService;
+import com.qs.serve.modules.sys.service.SysUserService;
+import com.qs.serve.modules.tbs.common.TbsActivityState;
+import com.qs.serve.modules.tbs.common.TbsCostApplyState;
+import com.qs.serve.modules.tbs.common.util.TbsBudgetLogBuildUtil;
+import com.qs.serve.modules.tbs.entity.*;
+import com.qs.serve.modules.tbs.entity.dto.TbsBudgetCostResult;
+import com.qs.serve.modules.tbs.mapper.TbsBudgetMapper;
+import com.qs.serve.modules.tbs.service.*;
+import com.qs.serve.modules.third.entity.*;
+import com.qs.serve.modules.third.util.ThirtyVerificationUtil;
+import com.qs.serve.modules.tzc.common.TzPolicyItemStatus;
+import com.qs.serve.modules.tzc.entity.TzcPolicyItem;
+import com.qs.serve.modules.tzc.entity.TzcPolicyItemLog;
+import com.qs.serve.modules.tzc.mapper.TzcPolicyItemMapper;
+import com.qs.serve.modules.tzc.service.TzcPolicyGoodsSyncService;
+import com.qs.serve.modules.tzc.service.TzcPolicyItemLogService;
+import com.qs.serve.modules.tzc.service.TzcPolicyItemService;
+import com.qs.serve.modules.vtb.common.VtbVerificationState;
+import com.qs.serve.modules.vtb.entity.VtbVerification;
+import com.qs.serve.modules.vtb.entity.VtbVerificationSubject;
+import com.qs.serve.modules.vtb.mapper.VtbVerificationSubjectMapper;
+import com.qs.serve.modules.vtb.service.VtbFundFlowService;
+import com.qs.serve.modules.vtb.service.VtbVerificationService;
+import com.qs.serve.modules.vtb.service.VtbVerificationSubjectService;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.jetbrains.annotations.NotNull;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.util.*;
+import java.util.stream.Collectors;
+
+/**
+ * @author YenHex
+ * @since 2023/2/14
+ */
+@Slf4j
+@Service
+@AllArgsConstructor
+public class PortalOfCostPartApplication {
+
+    private SysUserCodeMathMapper userCodeMathMapper;
+    private final SysSyncLogService sysSyncLogService;
+    private SysTableTempMapper sysTableTempMapper;
+
+    private TbsCostTodoService tbsCostTodoService;
+    private final TbsActivityPayConditionService activityPayConditionService;
+    private final TbsBudgetService budgetService;
+    private final TbsBudgetCostItemService budgetCostItemService;
+    private final VtbFundFlowService fundFlowService;
+    private TbsActivityService activityService;
+    private TbsActivityCenterService activityCenterService;
+    private TbsActivitySubjectService activitySubjectService;
+    private TbsActivityGoodsService activityGoodsService;
+    private TbsActivityCenterGoodsService activityCenterGoodsService;
+
+    private BmsSupplierService supplierService;
+    private BmsSubjectService subjectService;
+    private BmsCostCenterService costCenterService;
+    private BmsRegionService saleRegionService;
+
+    private SysUserService userService;
+
+    private TbsCostApplyService costApplyService;
+    private TbsCostUnItemService costUnItemService;
+    private TbsBudgetCostItemService costItemService;
+    private TbsBudgetLogService budgetLogService;
+    private TbsBudgetApplicationService budgetApplicationService;
+    private TbsBudgetMapper tbsBudgetMapper;
+    private TzcPolicyItemMapper tzcPolicyItemMapper;
+
+
+    private GoodsSkuService goodsSkuService;
+    private GoodsSpuService goodsSpuService;
+    private GoodsCategoryService goodsCategoryService;
+
+    private PayPaymentService paymentService;
+    private PayPaymentItemService paymentItemService;
+
+    private VtbVerificationService verificationService;
+    private VtbVerificationSubjectService verificationSubjectService;
+
+    private TzcPolicyItemService policyItemServiceService;
+    private TzcPolicyItemLogService policyItemLogService;
+    private TzcPolicyGoodsSyncService tzcPolicyGoodsSyncService;
+    private SysUserService sysUserService;
+    private final XiaoLuTonService xiaoLuTonService;
+    private ProjectApisProperties projectApisProperties;
+    private PayPaymentService payPaymentService;
+
+    /**
+     * 协议类费用 释放接口，释放合同不再支付的金额；
+     * @param paymentBo
+     */
+    public void toContractNotPay(PayPaymentBo paymentBo){
+        payPaymentService.unpayment(paymentBo);
+    }
+
+}