diff --git a/src/main/java/com/qs/serve/modules/tbs/controller/TbsCostApplyController.java b/src/main/java/com/qs/serve/modules/tbs/controller/TbsCostApplyController.java index 9384002c..accef289 100644 --- a/src/main/java/com/qs/serve/modules/tbs/controller/TbsCostApplyController.java +++ b/src/main/java/com/qs/serve/modules/tbs/controller/TbsCostApplyController.java @@ -354,7 +354,7 @@ public class TbsCostApplyController { apply.setId(costApply.getId()); apply.setChargeState(TbsCostApplyState.State_5_stop.getCode()); tbsCostApplyService.updateById(apply); - //todo 释放预算费用 + tbsCostApplyService.releaseCost(costApply.getId(), 1); return R.ok(); }else if ("next".equals(flag)){ return R.ok(); diff --git a/src/main/java/com/qs/serve/modules/tbs/entity/TbsActivityCenterGoods.java b/src/main/java/com/qs/serve/modules/tbs/entity/TbsActivityCenterGoods.java index 255383ac..a30af49c 100644 --- a/src/main/java/com/qs/serve/modules/tbs/entity/TbsActivityCenterGoods.java +++ b/src/main/java/com/qs/serve/modules/tbs/entity/TbsActivityCenterGoods.java @@ -188,6 +188,15 @@ public class TbsActivityCenterGoods implements Serializable { /** 模板唯一健 */ private String tmpUk; + /** 客户id */ + private Long supplierId; + + /** 客户编码 */ + private String supplierCode; + + /** 客户名称 */ + private String supplierName; + @TableField(exist = false) private String spuName; diff --git a/src/main/java/com/qs/serve/modules/tbs/entity/TbsBudgetCostItem.java b/src/main/java/com/qs/serve/modules/tbs/entity/TbsBudgetCostItem.java index d3076e70..f3a08311 100644 --- a/src/main/java/com/qs/serve/modules/tbs/entity/TbsBudgetCostItem.java +++ b/src/main/java/com/qs/serve/modules/tbs/entity/TbsBudgetCostItem.java @@ -46,6 +46,15 @@ public class TbsBudgetCostItem implements Serializable { @NotNull(message = "活动id不能为空") private Long activityId; + /** 客户id */ + private Long supplierId; + + /** 客户编码 */ + private String supplierCode; + + /** 客户名称 */ + private String supplierName; + /** 科目id */ @NotNull(message = "科目id不能为空") private Long subjectId; @@ -205,7 +214,7 @@ public class TbsBudgetCostItem implements Serializable { /** TbsActivityCenterGoods的id */ private Long centerGoodItemId; - /** todo 是否无效(退回,拒绝时使用) */ + /** 是否无效(退回,拒绝时使用,释放则不计入预算占用) */ private Integer invalidFlag; diff --git a/src/main/java/com/qs/serve/modules/tbs/service/TbsCostApplyService.java b/src/main/java/com/qs/serve/modules/tbs/service/TbsCostApplyService.java index c48fe9e5..0563b580 100644 --- a/src/main/java/com/qs/serve/modules/tbs/service/TbsCostApplyService.java +++ b/src/main/java/com/qs/serve/modules/tbs/service/TbsCostApplyService.java @@ -17,5 +17,12 @@ public interface TbsCostApplyService extends IService { */ void commitApply(String id); + /** + * 释放预算占用 + * @param costApplyId + * @param invalidFlag 1-释放;0-重新绑定 + */ + void releaseCost(Long costApplyId,Integer invalidFlag); + } diff --git a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsActivityServiceImpl.java b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsActivityServiceImpl.java index 1e03fdb0..e275626e 100644 --- a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsActivityServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsActivityServiceImpl.java @@ -137,7 +137,7 @@ public class TbsActivityServiceImpl extends ServiceImpl checkAmountMap = new HashMap<>(); List activityCenterGoodsList = new ArrayList<>(); - this.initCenterGoods(activityBo,subjectMap,centerDtoMap,checkAmountMap,activityGoodsList,activityCenterGoodsList,costApply,activity); + this.initCenterGoods(activityBo,subjectMap,centerDtoMap,checkAmountMap,activityGoodsList,activityCenterGoodsList,costApply,activity,supplier); //校验金额和比率 Map> actCenterGoodsMap = activityCenterGoodsList.stream().collect(Collectors.groupingBy(TbsActivityCenterGoods::getSubjectId)); for (Long subjectId : actCenterGoodsMap.keySet()) { @@ -245,11 +245,14 @@ public class TbsActivityServiceImpl extends ServiceImpl checkAmountMap, List activityGoodsList, List activityCenterGoodsList, - TbsCostApply costApply,TbsActivity activity){ + TbsCostApply costApply,TbsActivity activity,BmsSupplier supplier){ for (int i = 0; i < activityBo.getActivityCenterGoodsList().size(); i++) { TbsActivityCenterGoodsBo centerGoodsBo = activityBo.getActivityCenterGoodsList().get(i); BmsSubject subject = subjectMap.get(centerGoodsBo.getSubjectId()); TbsActivityCenterGoods centerGoods = new TbsActivityCenterGoods(); + centerGoods.setSupplierId(Long.parseLong(supplier.getId())); + centerGoods.setSupplierCode(supplier.getCode()); + centerGoods.setSubjectName(supplier.getName()); centerGoods.setCenterGoodsCode(activity.getActivityCode()+"_"+(i+1)); centerGoods.setTmpUk(centerGoodsBo.getTmpUk()); //设置成本中心 diff --git a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyServiceImpl.java b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyServiceImpl.java index 24436e92..e214d5b0 100644 --- a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyServiceImpl.java @@ -1,5 +1,6 @@ package com.qs.serve.modules.tbs.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.qs.serve.common.model.dto.R; import com.qs.serve.common.util.Assert; @@ -57,6 +58,8 @@ public class TbsCostApplyServiceImpl extends ServiceImpl data = new HashMap<>(10); data.put("empId",sysUser.getCode()); @@ -98,5 +101,13 @@ public class TbsCostApplyServiceImpl extends ServiceImpl lqw = new LambdaQueryWrapper<>(); + lqw.eq(TbsBudgetCostItem::getCostApplyId,costApplyId); + TbsBudgetCostItem costItem = new TbsBudgetCostItem(); + costItem.setInvalidFlag(invalidFlag); + budgetCostItemService.update(costItem,lqw); + } } diff --git a/src/main/java/com/qs/serve/modules/vtb/entity/VtbFundFlow.java b/src/main/java/com/qs/serve/modules/vtb/entity/VtbFundFlow.java index d81df277..90db6524 100644 --- a/src/main/java/com/qs/serve/modules/vtb/entity/VtbFundFlow.java +++ b/src/main/java/com/qs/serve/modules/vtb/entity/VtbFundFlow.java @@ -145,5 +145,13 @@ public class VtbFundFlow implements Serializable { @TableField(exist = false) private BigDecimal tempBalance; + /** 客户id */ + private Long supplierId; + + /** 客户编码 */ + private String supplierCode; + + /** 客户名称 */ + private String supplierName; } diff --git a/src/main/java/com/qs/serve/modules/vtb/service/VtbVerificationService.java b/src/main/java/com/qs/serve/modules/vtb/service/VtbVerificationService.java index 6253d0e6..1e542484 100644 --- a/src/main/java/com/qs/serve/modules/vtb/service/VtbVerificationService.java +++ b/src/main/java/com/qs/serve/modules/vtb/service/VtbVerificationService.java @@ -42,12 +42,6 @@ public interface VtbVerificationService extends IService { */ void successCommit(Long verificationId); - /** - * 释放费用占用(不更改核销状态) - * @param verificationId - */ - void releaseVerification(Long verificationId); - /** * 检测释放正在核销 * @param activityId diff --git a/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java b/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java index 5d032f47..38f9f228 100644 --- a/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java @@ -81,6 +81,9 @@ public class VtbVerificationServiceImpl extends ServiceImpl subjectLqw = new LambdaQueryWrapper<>(); + subjectLqw.eq(VtbVerificationSubject::getVerificationId,verificationId); + VtbVerificationSubject subjectParam = new VtbVerificationSubject(); + subjectParam.setEffectiveFlag(1); + verificationSubjectService.update(subjectParam,subjectLqw); } /**