diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapplydetail/ScmCollectionrebateCheckapplydetailDto.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapplydetail/ScmCollectionrebateCheckapplydetailDto.java index 7df15a72ce..5af3bbc5fe 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapplydetail/ScmCollectionrebateCheckapplydetailDto.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapplydetail/ScmCollectionrebateCheckapplydetailDto.java @@ -33,7 +33,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.math.BigDecimal; -import java.util.List; /** * Project: anrui-scm(回款返利)
diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebate/ScmCollectionRebateService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebate/ScmCollectionRebateService.java index cfcad04219..73c4701b51 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebate/ScmCollectionRebateService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebate/ScmCollectionRebateService.java @@ -194,9 +194,6 @@ public class ScmCollectionRebateService extends MybatisBaseService scmCollectionrebateCheckapplydetailVos = dto.getScmCollectionrebateCheckapplydetailVos(); + for (ScmCollectionrebateCheckapplydetailDto scmCollectionrebateCheckapplydetailDto : scmCollectionrebateCheckapplydetailVos) { + scmCollectionRebateService.updateState(scmCollectionrebateCheckapplydetailDto.getCollectionRebateSid(), 3); + } if (r == 1) { ResultBean voResultBean = flowFeign.startProcess(bv); UpdateFlowFieldVo ufVo = voResultBean.getData(); @@ -537,6 +543,7 @@ public class ScmCollectionrebateCheckapplyService extends MybatisBaseService collectionRebateSids = scmCollectionrebateCheckapplydetailService.fetchCollectionReBateSidByMainSid(bv.getBusinessSid()); if (bv.getTaskId().equals(scmCollectionrebateCheckapply.getTaskId())) { ResultBean resultBean = flowFeign.handleProsess(bv); if (!resultBean.getSuccess()) { @@ -544,6 +551,9 @@ public class ScmCollectionrebateCheckapplyService extends MybatisBaseService collectionRebateSids = scmCollectionrebateCheckapplydetailService.fetchCollectionReBateSidByMainSid(query.getBusinessSid()); String businessTaskId = scmCollectionrebateCheckapply.getTaskId(); if (StringUtils.isNotBlank(businessTaskId)) { if (businessTaskId.equals(query.getTaskId())) { @@ -618,6 +629,9 @@ public class ScmCollectionrebateCheckapplyService extends MybatisBaseService selByCollectionRebateSid(String mainSid); BigDecimal compute(@Param("createOrgSid") String createOrgSid,@Param("purchaseSystemSid") String purchaseSystemSid); + + @Select("select collectionRebateSid from scm_collectionrebate_checkapplydetail where mainSid = #{businessSid}") + List fetchCollectionReBateSidByMainSid(String businessSid); } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapplydetail/ScmCollectionrebateCheckapplydetailService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapplydetail/ScmCollectionrebateCheckapplydetailService.java index 5e48f2b815..544acd6b5f 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapplydetail/ScmCollectionrebateCheckapplydetailService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapplydetail/ScmCollectionrebateCheckapplydetailService.java @@ -124,4 +124,8 @@ public class ScmCollectionrebateCheckapplydetailService extends MybatisBaseServi BigDecimal num = baseMapper.compute(createOrgSid,purchaseSystemSid); return rb.success().setData(num); } + + public List fetchCollectionReBateSidByMainSid(String businessSid) { + return baseMapper.fetchCollectionReBateSidByMainSid(businessSid); + } } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyService.java index 045301c7f2..5b25524889 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyService.java @@ -587,6 +587,7 @@ public class ScmCollectionRebateWithApplyService extends MybatisBaseService collectionRebateSids = scmCollectionRebateWithService.fetchCollectionReBateSidByMainSid(query.getBusinessSid()); String businessTaskId = scmCollectionRebateWithApply.getTaskId(); if (StringUtils.isNotBlank(businessTaskId)) { if (businessTaskId.equals(query.getTaskId())) { @@ -597,6 +598,9 @@ public class ScmCollectionRebateWithApplyService extends MybatisBaseService