From f1f53b898603c935afcd36ea04d6e98c0bb3a83c Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Fri, 18 Oct 2024 16:56:18 +0800 Subject: [PATCH] 1 --- .../FinPaymentrecordService.java | 5 + .../ScmCollectionRebate.java | 6 +- .../ScmCollectionRebateDetailsVo.java | 2 + .../ScmCollectionRebateDto.java | 3 + .../ScmCollectionRebateFeign.java | 5 + .../ScmCollectionRebateFeignFallback.java | 5 + .../ScmCollectionRebateVo.java | 33 +++-- .../ScmCollectionrebateCheckapply.java | 8 +- ...cmCollectionrebateCheckapplyDetailsVo.java | 13 +- .../ScmCollectionrebateCheckapplyDto.java | 16 ++- .../ScmCollectionrebateCheckapplyQuery.java | 15 ++- .../ScmCollectionrebateCheckapplyVo.java | 8 +- .../ScmCollectionrebateCheckapplydetail.java | 46 +++++++ ...ectionrebateCheckapplydetailDetailsVo.java | 14 +-- ...cmCollectionrebateCheckapplydetailDto.java | 48 +++++++- ...CollectionrebateCheckapplydetailFeign.java | 14 +-- ...onrebateCheckapplydetailFeignFallback.java | 72 ----------- ...ScmCollectionrebateCheckapplydetailVo.java | 46 +++++++ .../ScmCollectionRebateWithDetailsVo.java | 18 ++- .../ScmCollectionRebateWithApply.java | 14 ++- ...ScmCollectionRebateWithApplyDetailsVo.java | 17 ++- .../ScmCollectionRebateWithApplyDto.java | 13 +- .../ScmCollectionRebateWithApplyQuery.java | 14 ++- .../ScmCollectionRebateWithApplyVo.java | 17 +-- .../ScmCollectionRebateMapper.java | 18 +-- .../ScmCollectionRebateMapper.xml | 17 ++- .../ScmCollectionRebateRest.java | 34 ++---- .../ScmCollectionRebateService.java | 93 +++++++------- .../ScmCollectionrebateCheckapplyMapper.xml | 9 +- .../ScmCollectionrebateCheckapplyService.java | 113 ++++++------------ ...ollectionrebateCheckapplydetailMapper.java | 12 +- ...CollectionrebateCheckapplydetailMapper.xml | 60 ++++------ ...mCollectionrebateCheckapplydetailRest.java | 15 +-- ...llectionrebateCheckapplydetailService.java | 35 ++++-- .../ScmCollectionRebateWithMapper.xml | 19 ++- .../ScmCollectionRebateWithApplyMapper.java | 17 --- .../ScmCollectionRebateWithApplyMapper.xml | 19 +-- .../ScmCollectionRebateWithApplyRest.java | 15 +-- .../ScmCollectionRebateWithApplyService.java | 50 ++++---- .../ScmSpecialRebateService.java | 4 +- 40 files changed, 485 insertions(+), 497 deletions(-) delete mode 100644 anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapplydetail/ScmCollectionrebateCheckapplydetailFeignFallback.java diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java index ebc062bef2..19d3bd1afe 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java @@ -395,11 +395,15 @@ public class FinPaymentrecordService extends MybatisBaseService dto); @ApiOperation("根据sid删除记录") @DeleteMapping("/delBySids") diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebate/ScmCollectionRebateFeignFallback.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebate/ScmCollectionRebateFeignFallback.java index be71a2e2c9..b8b862a160 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebate/ScmCollectionRebateFeignFallback.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebate/ScmCollectionRebateFeignFallback.java @@ -59,6 +59,11 @@ public class ScmCollectionRebateFeignFallback implements ScmCollectionRebateFeig return ResultBean.fireFail().setMsg("接口anrui-scm/scmcollectionrebate/save无法访问"); } + @Override + public ResultBean confirm(List dto) { + return null; + } + @Override public ResultBean delBySids( String[] sids){ return ResultBean.fireFail().setMsg("接口anrui-scm/scmcollectionrebate/delBySids无法访问"); diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebate/ScmCollectionRebateVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebate/ScmCollectionRebateVo.java index c4d67fd72f..f72d1ad4a8 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebate/ScmCollectionRebateVo.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebate/ScmCollectionRebateVo.java @@ -27,6 +27,7 @@ package com.yxt.anrui.scm.api.scmcollectionrebate; import com.fasterxml.jackson.annotation.JsonFormat; +import com.yxt.anrui.scm.api.scmcollectionrebateveh.ScmCollectionRebateVehDetailsVo; import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModel; @@ -35,6 +36,7 @@ import lombok.Data; import java.math.BigDecimal; import java.util.Date; +import java.util.List; /** * Project: anrui-scm(回款返利)
@@ -55,16 +57,32 @@ public class ScmCollectionRebateVo implements Vo { private String sid; + private String collectionRebateSid; + private Integer isEnable; + @ApiModelProperty("备注") + private String remarks; + @ApiModelProperty("创建人sid") + private String createBySid; @ApiModelProperty("状态") private String state; + @ApiModelProperty("创建组织sid") + private String createOrgSid; @ApiModelProperty("分公司") private String createOrgName; + @ApiModelProperty("采购系统sid") + private String purchaseSystemSid; @ApiModelProperty("采购系统名称") private String purchaseSystemName; + @ApiModelProperty("品牌sid") + private String brandSid; @ApiModelProperty("品牌名称") private String brandName; + @ApiModelProperty("回款方式key") + private String collectionTypeKey; @ApiModelProperty("回款方式value") private String collectionTypeValue; + @ApiModelProperty("厂家销售通路key") + private String manufaSaleChannel; @ApiModelProperty("厂家回款通路") private String manufaSaleChannelValue; @ApiModelProperty("回款金额") @@ -76,6 +94,8 @@ public class ScmCollectionRebateVo implements Vo { private Date collectionDate; // 回款日期 @ApiModelProperty("上装金额") private BigDecimal topAmount; + @ApiModelProperty("返利类型key") + private String rebateTypeKey; @ApiModelProperty("返利类型value") private String rebateTypeValue; // 返利类型value @ApiModelProperty("返利名称") @@ -95,13 +115,8 @@ public class ScmCollectionRebateVo implements Vo { private BigDecimal adjustmentMoney; // 调整金额 @ApiModelProperty("调整说明") private String adjustmentRemarks; // 调整说明 - /*其他返回参数*/ - @ApiModelProperty("品牌sid") - private String brandSid; - @ApiModelProperty("厂家收款账号") - private String manufaBankAccount; - @ApiModelProperty("上传状态(2未上传、3已上传)") - private String uploadState; - @ApiModelProperty("预提日期(页面展示)") - private String withholdingDateCopy; + @ApiModelProperty("组织全路径") + private String orgPath; + @ApiModelProperty("回款返利车辆列表") + private List scmCollectionRebateVehs; } diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapply.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapply.java index 560cfd496f..5fb89b3c5b 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapply.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapply.java @@ -50,10 +50,10 @@ import lombok.Data; public class ScmCollectionrebateCheckapply extends BaseEntity { private static final long serialVersionUID = 1L; - @ApiModelProperty("品牌sid") - private String brandSid; // 品牌sid - @ApiModelProperty("品牌名称") - private String brandName; // 品牌名称 + @ApiModelProperty("部门sid") + private String deptSid; + @ApiModelProperty("部门") + private String deptName; @ApiModelProperty("核对申请标题") private String checkApply; // 核对申请标题 @ApiModelProperty("创建人姓名") diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyDetailsVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyDetailsVo.java index ae6453c14f..f5341c0980 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyDetailsVo.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyDetailsVo.java @@ -27,6 +27,8 @@ package com.yxt.anrui.scm.api.scmcollectionrebatecheckapply; import com.yxt.anrui.scm.api.scmcollectionrebatecheckapplydetail.ScmCollectionrebateCheckapplydetailDetailsVo; +import com.yxt.anrui.scm.api.scmcollectionrebatecheckapplydetail.ScmCollectionrebateCheckapplydetailVo; +import com.yxt.anrui.scm.api.scmspecialrebatecheckapplydetail.ScmSpecialrebateCheckapplydetailVo; import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModel; @@ -56,10 +58,10 @@ public class ScmCollectionrebateCheckapplyDetailsVo implements Vo { @ApiModelProperty("备注") private String remarks; // 备注 - @ApiModelProperty("品牌sid") - private String brandSid; // 品牌sid - @ApiModelProperty("品牌名称") - private String brandName; // 品牌名称 + @ApiModelProperty("部门sid") + private String deptSid; + @ApiModelProperty("部门") + private String deptName; @ApiModelProperty("核对申请标题") private String checkApply; // 核对申请标题 @ApiModelProperty("创建人sid") @@ -91,5 +93,6 @@ public class ScmCollectionrebateCheckapplyDetailsVo implements Vo { private List scmWhenCollectionrebateCheckapplydetailDetails; // 本月核对本月已上传回款返利信息 @ApiModelProperty("本月核对往月已上传回款返利信息") private List scmLastCollectionrebateCheckapplydetailDetails; // 本月核对往月已上传回款返利信息 - + @ApiModelProperty("返利信息") + private List scmCollectionrebateCheckapplydetailVos; } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyDto.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyDto.java index 39d70afb7d..4ca8992efc 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyDto.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyDto.java @@ -27,6 +27,7 @@ package com.yxt.anrui.scm.api.scmcollectionrebatecheckapply; import com.yxt.anrui.scm.api.scmcollectionrebatecheckapplydetail.ScmCollectionrebateCheckapplydetailDto; +import com.yxt.anrui.scm.api.scmcollectionrebatecheckapplydetail.ScmCollectionrebateCheckapplydetailVo; import com.yxt.common.core.dto.Dto; import io.swagger.annotations.ApiModel; @@ -58,10 +59,10 @@ public class ScmCollectionrebateCheckapplyDto implements Dto { private String createBySid; // 创建人sid @ApiModelProperty("备注") private String remarks; // 备注 - @ApiModelProperty("品牌sid") - private String brandSid; // 品牌sid - @ApiModelProperty("品牌名称") - private String brandName; // 品牌名称 + @ApiModelProperty("部门sid") + private String deptSid; + @ApiModelProperty("部门") + private String deptName; @ApiModelProperty("核对申请标题") private String checkApply; // 核对申请标题 @ApiModelProperty("创建人姓名") @@ -86,9 +87,6 @@ public class ScmCollectionrebateCheckapplyDto implements Dto { private String taskId; // taskId @ApiModelProperty("组织全路径") private String orgPath; - - @ApiModelProperty("本月核对本月已上传回款返利信息") - private List scmWhenCollectionrebateCheckapplydetailDetails; // 本月核对本月已上传回款返利信息 - @ApiModelProperty("本月核对往月已上传回款返利信息") - private List scmLastCollectionrebateCheckapplydetailDetails; // 本月核对往月已上传回款返利信息 + @ApiModelProperty("返利信息") + private List scmCollectionrebateCheckapplydetailVos; } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyQuery.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyQuery.java index ed8a775da5..57be51f1b4 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyQuery.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyQuery.java @@ -49,14 +49,19 @@ import lombok.Data; @ApiModel(value = "回款返利核对申请表 查询条件", description = "回款返利核对申请表 查询条件") public class ScmCollectionrebateCheckapplyQuery implements Query { - @ApiModelProperty("品牌名称") - private String brandName; - @ApiModelProperty("核对申请标题") + private String useOrgName; + @ApiModelProperty("部门") + private String deptName; + @ApiModelProperty("创建人姓名") + private String createByName; + @ApiModelProperty("回款申请标题") private String checkApply; - @ApiModelProperty(value = "创建开始日期") + @ApiModelProperty("创建日期") private String createStartTime; - @ApiModelProperty(value = "创建结束日期") private String createEndTime; + @ApiModelProperty("办结日期") + private String finishTimeStart; + private String finishTimeEnd; private String userSid; private String orgPath; diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyVo.java index a43b6bfc86..f286f814ee 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyVo.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyVo.java @@ -57,13 +57,11 @@ public class ScmCollectionrebateCheckapplyVo implements Vo { @ApiModelProperty("流程状态") private String nodeState; @ApiModelProperty("分公司") - private String useOrgName; - @ApiModelProperty("品牌名称") - private String brandName; + private String createOrgName; + @ApiModelProperty("部门") + private String deptName; @ApiModelProperty("核对申请标题") private String checkApply; - @ApiModelProperty("回款金额") - private String collectionMoney; @ApiModelProperty("预提返利") private String estimateRebate; @ApiModelProperty("上传金额") diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapplydetail/ScmCollectionrebateCheckapplydetail.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapplydetail/ScmCollectionrebateCheckapplydetail.java index 444c7562ee..35e8f22245 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapplydetail/ScmCollectionrebateCheckapplydetail.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapplydetail/ScmCollectionrebateCheckapplydetail.java @@ -31,6 +31,8 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.math.BigDecimal; + /** * Project: anrui-scm(回款返利)
* File: ScmCollectionrebateCheckapplydetail.java
@@ -54,5 +56,49 @@ public class ScmCollectionrebateCheckapplydetail extends BaseEntity { private String collectionRebateSid; // 回款返利sid @ApiModelProperty("核对申请sid") private String mainSid; // 核对申请sid + @ApiModelProperty("采购系统sid") + private String purchaseSystemSid; + @ApiModelProperty("采购系统名称") + private String purchaseSystemName; + @ApiModelProperty("品牌sid") + private String brandSid; // 品牌sid + @ApiModelProperty("品牌名称") + private String brandName; // 品牌名称 + @ApiModelProperty("回款方式key") + private String collectionTypeKey; // 回款方式key + @ApiModelProperty("回款方式value") + private String collectionTypeValue; // 回款方式value + @ApiModelProperty("厂家销售通路key") + private String manufaSaleChannel; // 厂家销售通路key + @ApiModelProperty("厂家销售通路value") + private String manufaSaleChannelValue; // 厂家销售通路value + @ApiModelProperty("回款金额") + private BigDecimal collectionMoney; // 回款金额 + @ApiModelProperty("运费") + private BigDecimal freight; // 运费 + @ApiModelProperty("回款日期") + private String collectionDate; // 回款日期 + @ApiModelProperty("上装金额") + private BigDecimal topAmount; + @ApiModelProperty("返利类型key") + private String rebateTypeKey; // 返利类型key + @ApiModelProperty("返利类型value") + private String rebateTypeValue; // 返利类型value + @ApiModelProperty("返利名称") + private String rebateName; + @ApiModelProperty("计算标准") + private String calculationStandard; // 计算标准 + @ApiModelProperty("预计返利") + private BigDecimal estimateRebate; // 预计返利 + @ApiModelProperty("预提日期") + private String withholdingDate; // 预提日期 + @ApiModelProperty("上传日期") + private String uploadDate; // 上传日期 + @ApiModelProperty("上传金额") + private BigDecimal uploadMoney; // 上传金额 + @ApiModelProperty("调整金额") + private BigDecimal adjustmentMoney; // 调整金额 + @ApiModelProperty("调整说明") + private String adjustmentRemarks; // 调整说明 } diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapplydetail/ScmCollectionrebateCheckapplydetailDetailsVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapplydetail/ScmCollectionrebateCheckapplydetailDetailsVo.java index 1952643c0d..c80d88c60e 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapplydetail/ScmCollectionrebateCheckapplydetailDetailsVo.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapplydetail/ScmCollectionrebateCheckapplydetailDetailsVo.java @@ -55,16 +55,12 @@ public class ScmCollectionrebateCheckapplydetailDetailsVo implements Vo { @ApiModelProperty("预提日期") private String withholdingDate; // 预提日期 - @ApiModelProperty("预提日期(页面展示)") - private String withholdingDateCopy; // 预提日期(页面展示) - @ApiModelProperty("回款方式key") - private String collectionTypeKey; // 回款方式key - @ApiModelProperty("回款方式value") - private String collectionTypeValue; // 回款方式value - @ApiModelProperty("回款金额") - private String collectionMoney; // 回款金额 + @ApiModelProperty("返利类型value") + private String rebateTypeValue; // 返利类型value + @ApiModelProperty("台数") + private String num; // 台数 @ApiModelProperty("预提金额") - private String estimateRebate; // 预提金额 + private String estimateRebate; @ApiModelProperty("上传金额") private String uploadMoney; // 上传金额 @ApiModelProperty("调整金额") 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 61638b1323..5d7a205e39 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 @@ -32,6 +32,7 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.math.BigDecimal; import java.util.List; /** @@ -54,8 +55,51 @@ public class ScmCollectionrebateCheckapplydetailDto implements Dto { private String sid; // sid @ApiModelProperty("回款返利sid") - private List collectionRebateSids; // 回款返利sid + private String collectionRebateSid; // 回款返利sid @ApiModelProperty("核对申请sid") private String mainSid; // 核对申请sid - + @ApiModelProperty("采购系统sid") + private String purchaseSystemSid; + @ApiModelProperty("采购系统名称") + private String purchaseSystemName; + @ApiModelProperty("品牌sid") + private String brandSid; // 品牌sid + @ApiModelProperty("品牌名称") + private String brandName; // 品牌名称 + @ApiModelProperty("回款方式key") + private String collectionTypeKey; // 回款方式key + @ApiModelProperty("回款方式value") + private String collectionTypeValue; // 回款方式value + @ApiModelProperty("厂家销售通路key") + private String manufaSaleChannel; // 厂家销售通路key + @ApiModelProperty("厂家销售通路value") + private String manufaSaleChannelValue; // 厂家销售通路value + @ApiModelProperty("回款金额") + private BigDecimal collectionMoney; // 回款金额 + @ApiModelProperty("运费") + private BigDecimal freight; // 运费 + @ApiModelProperty("回款日期") + private String collectionDate; // 回款日期 + @ApiModelProperty("上装金额") + private BigDecimal topAmount; + @ApiModelProperty("返利类型key") + private String rebateTypeKey; // 返利类型key + @ApiModelProperty("返利类型value") + private String rebateTypeValue; // 返利类型value + @ApiModelProperty("返利名称") + private String rebateName; + @ApiModelProperty("计算标准") + private String calculationStandard; // 计算标准 + @ApiModelProperty("预计返利") + private BigDecimal estimateRebate; // 预计返利 + @ApiModelProperty("预提日期") + private String withholdingDate; // 预提日期 + @ApiModelProperty("上传日期") + private String uploadDate; // 上传日期 + @ApiModelProperty("上传金额") + private BigDecimal uploadMoney; // 上传金额 + @ApiModelProperty("调整金额") + private BigDecimal adjustmentMoney; // 调整金额 + @ApiModelProperty("调整说明") + private String adjustmentRemarks; // 调整说明 } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapplydetail/ScmCollectionrebateCheckapplydetailFeign.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapplydetail/ScmCollectionrebateCheckapplydetailFeign.java index f2f1069327..870496ef15 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapplydetail/ScmCollectionrebateCheckapplydetailFeign.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapplydetail/ScmCollectionrebateCheckapplydetailFeign.java @@ -25,6 +25,7 @@ *********************************************************/ package com.yxt.anrui.scm.api.scmcollectionrebatecheckapplydetail; +import com.yxt.anrui.scm.api.scmcollectionrebate.ScmCollectionRebateDetailsVo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import com.yxt.common.core.query.PagerQuery; @@ -52,15 +53,9 @@ import java.util.List; @FeignClient( contextId = "anrui-scm-ScmCollectionrebateCheckapplydetail", name = "anrui-scm", - path = "v1/scmcollectionrebatecheckapplydetail", - fallback = ScmCollectionrebateCheckapplydetailFeignFallback.class) + path = "v1/scmcollectionrebatecheckapplydetail") public interface ScmCollectionrebateCheckapplydetailFeign { - @ApiOperation("根据条件分页查询数据的列表") - @PostMapping("/listPage") - @ResponseBody - public ResultBean> listPage(@RequestBody PagerQuery pq); - @ApiOperation("新增或修改") @PostMapping("/save") @ResponseBody @@ -75,4 +70,9 @@ public interface ScmCollectionrebateCheckapplydetailFeign { @GetMapping("/fetchDetailsBySid/{sid}") @ResponseBody public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid); + + @ApiOperation("回款返利核对查看详情") + @GetMapping("/collectionRebateCheckDetails/{sid}") + @ResponseBody + public ResultBean> collectionRebateCheckDetails(@PathVariable("sid") String sid); } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapplydetail/ScmCollectionrebateCheckapplydetailFeignFallback.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapplydetail/ScmCollectionrebateCheckapplydetailFeignFallback.java deleted file mode 100644 index ef66e06eec..0000000000 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapplydetail/ScmCollectionrebateCheckapplydetailFeignFallback.java +++ /dev/null @@ -1,72 +0,0 @@ -/********************************************************* - ********************************************************* - ******************** ******************* - ************* ************ - ******* _oo0oo_ ******* - *** o8888888o *** - * 88" . "88 * - * (| -_- |) * - * 0\ = /0 * - * ___/`---'\___ * - * .' \\| |// '. * - * / \\||| : |||// \ * - * / _||||| -:- |||||- \ * - * | | \\\ - /// | | * - * | \_| ''\---/'' |_/ | * - * \ .-\__ '-' ___/-. / * - * ___'. .' /--.--\ `. .'___ * - * ."" '< `.___\_<|>_/___.' >' "". * - * | | : `- \`.;`\ _ /`;.`/ - ` : | | * - * \ \ `_. \_ __\ /__ _/ .-` / / * - * =====`-.____`.___ \_____/___.-`___.-'===== * - * `=---=' * - * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * - *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* - *********************************************************/ -package com.yxt.anrui.scm.api.scmcollectionrebatecheckapplydetail; - -import com.yxt.common.core.query.PagerQuery; -import com.yxt.common.core.result.ResultBean; -import com.yxt.common.core.vo.PagerVo; -import org.springframework.stereotype.Component; - -import java.util.List; - -/** - * Project: anrui-scm(回款返利)
- * File: ScmCollectionrebateCheckapplydetailFeignFallback.java
- * Class: com.yxt.anrui.scm.api.scmcollectionrebatecheckapplydetail.ScmCollectionrebateCheckapplydetailFeignFallback
- * Description: 回款返利核对申请表_返利列表.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2022-09-27 15:14:19
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ -@Component -public class ScmCollectionrebateCheckapplydetailFeignFallback implements ScmCollectionrebateCheckapplydetailFeign { - - @Override - public ResultBean> listPage(PagerQuery pq) { - ResultBean rb = ResultBean.fireFail(); - return rb.setMsg("接口anrui-scm/scmcollectionrebatecheckapplydetail/listPage无法访问"); - } - - @Override - public ResultBean save(ScmCollectionrebateCheckapplydetailDto dto) { - return ResultBean.fireFail().setMsg("接口anrui-scm/scmcollectionrebatecheckapplydetail/save无法访问"); - } - - @Override - public ResultBean delBySids(String[] sids) { - return ResultBean.fireFail().setMsg("接口anrui-scm/scmcollectionrebatecheckapplydetail/delBySids无法访问"); - } - - @Override - public ResultBean fetchDetailsBySid(String sid) { - ResultBean rb = ResultBean.fireFail(); - return rb.setMsg("接口anrui-scm/scmcollectionrebatecheckapplydetail/fetchDetailsBySid无法访问"); - } -} \ No newline at end of file diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapplydetail/ScmCollectionrebateCheckapplydetailVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapplydetail/ScmCollectionrebateCheckapplydetailVo.java index b5f761ef3d..ec6c500dc8 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapplydetail/ScmCollectionrebateCheckapplydetailVo.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapplydetail/ScmCollectionrebateCheckapplydetailVo.java @@ -32,6 +32,8 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.math.BigDecimal; + /** * Project: anrui-scm(回款返利)
* File: ScmCollectionrebateCheckapplydetailVo.java
@@ -56,4 +58,48 @@ public class ScmCollectionrebateCheckapplydetailVo implements Vo { @ApiModelProperty("核对申请sid") private String mainSid; // 核对申请sid + @ApiModelProperty("采购系统sid") + private String purchaseSystemSid; + @ApiModelProperty("采购系统名称") + private String purchaseSystemName; + @ApiModelProperty("品牌sid") + private String brandSid; // 品牌sid + @ApiModelProperty("品牌名称") + private String brandName; // 品牌名称 + @ApiModelProperty("回款方式key") + private String collectionTypeKey; // 回款方式key + @ApiModelProperty("回款方式value") + private String collectionTypeValue; // 回款方式value + @ApiModelProperty("厂家销售通路key") + private String manufaSaleChannel; // 厂家销售通路key + @ApiModelProperty("厂家销售通路value") + private String manufaSaleChannelValue; // 厂家销售通路value + @ApiModelProperty("回款金额") + private BigDecimal collectionMoney; // 回款金额 + @ApiModelProperty("运费") + private BigDecimal freight; // 运费 + @ApiModelProperty("回款日期") + private String collectionDate; // 回款日期 + @ApiModelProperty("上装金额") + private BigDecimal topAmount; + @ApiModelProperty("返利类型key") + private String rebateTypeKey; // 返利类型key + @ApiModelProperty("返利类型value") + private String rebateTypeValue; // 返利类型value + @ApiModelProperty("返利名称") + private String rebateName; + @ApiModelProperty("计算标准") + private String calculationStandard; // 计算标准 + @ApiModelProperty("预计返利") + private BigDecimal estimateRebate; // 预计返利 + @ApiModelProperty("预提日期") + private String withholdingDate; // 预提日期 + @ApiModelProperty("上传日期") + private String uploadDate; // 上传日期 + @ApiModelProperty("上传金额") + private BigDecimal uploadMoney; // 上传金额 + @ApiModelProperty("调整金额") + private BigDecimal adjustmentMoney; // 调整金额 + @ApiModelProperty("调整说明") + private String adjustmentRemarks; // 调整说明 } diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewith/ScmCollectionRebateWithDetailsVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewith/ScmCollectionRebateWithDetailsVo.java index 35927e7494..7686e064b2 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewith/ScmCollectionRebateWithDetailsVo.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewith/ScmCollectionRebateWithDetailsVo.java @@ -55,16 +55,14 @@ public class ScmCollectionRebateWithDetailsVo implements Vo { @ApiModelProperty("回款返利预提申请sid") private String mainSid; // 回款返利预提申请sid - @ApiModelProperty("回款方式key") - private String collectionTypeKey; // 回款方式key - @ApiModelProperty("回款方式value") - private String collectionTypeValue; // 回款方式value - @ApiModelProperty("回款金额") - private String collectionMoney; // 回款金额 - @ApiModelProperty("运费") - private String freight; // 运费 - @ApiModelProperty("计算标准") - private String calculationStandard; // 计算标准 + @ApiModelProperty("采购系统名称") + private String purchaseSystemName; + @ApiModelProperty("品牌名称") + private String brandName; + @ApiModelProperty("返利类型value") + private String rebateTypeValue; + @ApiModelProperty("返利名称") + private String rebateName; @ApiModelProperty("预计返利") private String estimateRebate; // 预计返利 @ApiModelProperty("回款返利sid") diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewithapply/ScmCollectionRebateWithApply.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewithapply/ScmCollectionRebateWithApply.java index 4bd5a21700..e65297ade2 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewithapply/ScmCollectionRebateWithApply.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewithapply/ScmCollectionRebateWithApply.java @@ -26,11 +26,14 @@ package com.yxt.anrui.scm.api.scmcollectionrebatewithapply; import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; import com.yxt.common.core.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.Date; + /** * Project: anrui-scm(回款返利)
* File: ScmCollectionRebateWithApply.java
@@ -50,10 +53,10 @@ import lombok.Data; public class ScmCollectionRebateWithApply extends BaseEntity { private static final long serialVersionUID = 1L; - @ApiModelProperty("品牌sid") - private String brandSid; // 品牌sid - @ApiModelProperty("品牌名称") - private String brandName; // 品牌名称 + @ApiModelProperty("部门sid") + private String deptSid; + @ApiModelProperty("部门") + private String deptName; @ApiModelProperty("回款申请标题") private String collectionApply; // 回款申请标题 @ApiModelProperty("创建人姓名") @@ -66,6 +69,9 @@ public class ScmCollectionRebateWithApply extends BaseEntity { private String createOrgSid; // 创建组织sid @ApiModelProperty("创建组织名称") private String createOrgName; // 创建组织名称 + @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") + @ApiModelProperty("办结日期") + private Date finishTime; @ApiModelProperty("流程状态") private String nodeState; // 流程状态 @ApiModelProperty("流程定义的id") diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyDetailsVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyDetailsVo.java index c25e360435..f3f295d5b0 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyDetailsVo.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyDetailsVo.java @@ -26,6 +26,7 @@ package com.yxt.anrui.scm.api.scmcollectionrebatewithapply; +import com.fasterxml.jackson.annotation.JsonFormat; import com.yxt.anrui.scm.api.scmcollectionrebatewith.ScmCollectionRebateWithDetailsVo; import com.yxt.common.core.vo.Vo; @@ -33,6 +34,7 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.Date; import java.util.List; /** @@ -54,16 +56,16 @@ public class ScmCollectionRebateWithApplyDetailsVo implements Vo { private String sid; // sid - @ApiModelProperty("申请人sid") - private String createBySid; // 申请人sid @ApiModelProperty("备注") private String remarks; // 备注 - @ApiModelProperty("品牌sid") - private String brandSid; // 品牌sid - @ApiModelProperty("品牌名称") - private String brandName; // 品牌名称 + @ApiModelProperty("部门sid") + private String deptSid; + @ApiModelProperty("部门") + private String deptName; @ApiModelProperty("回款申请标题") private String collectionApply; // 回款申请标题 + @ApiModelProperty("创建人sid") + private String createBySid; // 创建人sid @ApiModelProperty("创建人姓名") private String createByName; // 创建人姓名 @ApiModelProperty("使用组织sid") @@ -74,6 +76,9 @@ public class ScmCollectionRebateWithApplyDetailsVo implements Vo { private String createOrgSid; // 创建组织sid @ApiModelProperty("创建组织名称") private String createOrgName; // 创建组织名称 + @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") + @ApiModelProperty("办结日期") + private Date finishTime; @ApiModelProperty("流程状态") private String nodeState; // 流程状态 @ApiModelProperty("流程定义的id") diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyDto.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyDto.java index 90a4e071ee..37a322c07d 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyDto.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyDto.java @@ -26,6 +26,7 @@ package com.yxt.anrui.scm.api.scmcollectionrebatewithapply; +import com.fasterxml.jackson.annotation.JsonFormat; import com.yxt.anrui.scm.api.scmcollectionrebatewith.ScmCollectionRebateWithDto; import com.yxt.common.core.dto.Dto; @@ -33,6 +34,7 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.Date; import java.util.List; /** @@ -56,10 +58,10 @@ public class ScmCollectionRebateWithApplyDto implements Dto { @ApiModelProperty("备注") private String remarks; // 备注 - @ApiModelProperty("品牌sid") - private String brandSid; // 品牌sid - @ApiModelProperty("品牌名称") - private String brandName; // 品牌名称 + @ApiModelProperty("部门sid") + private String deptSid; + @ApiModelProperty("部门") + private String deptName; @ApiModelProperty("回款申请标题") private String collectionApply; // 回款申请标题 @ApiModelProperty("创建人sid") @@ -74,6 +76,9 @@ public class ScmCollectionRebateWithApplyDto implements Dto { private String createOrgSid; // 创建组织sid @ApiModelProperty("创建组织名称") private String createOrgName; // 创建组织名称 + @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") + @ApiModelProperty("办结日期") + private Date finishTime; @ApiModelProperty("流程状态") private String nodeState; // 流程状态 @ApiModelProperty("流程定义的id") diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyQuery.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyQuery.java index 94377c4d1a..f30e87391b 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyQuery.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyQuery.java @@ -49,14 +49,20 @@ import lombok.Data; @ApiModel(value = "回款返利预提申请表 查询条件", description = "回款返利预提申请表 查询条件") public class ScmCollectionRebateWithApplyQuery implements Query { - @ApiModelProperty("品牌") - private String brandName; + @ApiModelProperty("分公司") + private String useOrgName; + @ApiModelProperty("部门") + private String deptName; + @ApiModelProperty("创建人姓名") + private String createByName; @ApiModelProperty("回款申请标题") private String collectionApply; - @ApiModelProperty(value = "创建开始日期") + @ApiModelProperty("创建日期") private String createStartTime; - @ApiModelProperty(value = "创建结束日期") private String createEndTime; + @ApiModelProperty("办结日期") + private String finishTimeStart; + private String finishTimeEnd; private String userSid; private String orgPath; diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyVo.java index 438e8af655..72eb53ced5 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyVo.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyVo.java @@ -58,21 +58,22 @@ public class ScmCollectionRebateWithApplyVo implements Vo { private String nodeState; @ApiModelProperty("分公司") private String useOrgName; - @ApiModelProperty("品牌名称") - private String brandName; @ApiModelProperty("回款申请标题") private String collectionApply; - @ApiModelProperty("回款金额") - private String withRebateTotal; - @ApiModelProperty("运费") - private String freight; @ApiModelProperty("预提返利") private String estimateRebate; + @ApiModelProperty("备注") + private String remarks; + @ApiModelProperty("创建人姓名") + private String createByName; + @ApiModelProperty("部门") + private String deptName; @ApiModelProperty("创建日期") @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") private Date createTime; - @ApiModelProperty("创建人姓名") - private String createByName; + @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") + @ApiModelProperty("办结日期") + private Date finishTime; @ApiModelProperty("流程定义的id") private String procDefId; @ApiModelProperty("流程实例的sid") diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebate/ScmCollectionRebateMapper.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebate/ScmCollectionRebateMapper.java index 94045d5eb4..672a8f8e4d 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebate/ScmCollectionRebateMapper.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebate/ScmCollectionRebateMapper.java @@ -54,19 +54,11 @@ import java.util.List; @Mapper public interface ScmCollectionRebateMapper extends BaseMapper { - //@Update("update scm_collection_rebate set name=#{msg} where id=#{id}") - //IPage voPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); - - IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); - - List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); - - @Select("select * from scm_collection_rebate") - List selectListVo(); + IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); - @Update("update scm_collection_rebate set withholdingDate = CURRENT_TIMESTAMP where sid = #{collectionRebateSid}") - void updateWithholdingDateBySid(String collectionRebateSid); + @Update("update scm_collection_rebate set withholdingDate = #{withholdingDate} where sid = #{collectionRebateSid}") + void updateWithholdingDateBySid(@Param("collectionRebateSid") String collectionRebateSid,@Param("withholdingDate") String withholdingDate); - @Update("update scm_collection_rebate set state = 1 where sid = #{collectionRebateSid}") - void updateState(String collectionRebateSid); + @Update("update scm_collection_rebate set state = #{state} where sid = #{collectionRebateSid}") + void updateState(@Param("collectionRebateSid") String collectionRebateSid, @Param("state") Integer state); } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebate/ScmCollectionRebateMapper.xml b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebate/ScmCollectionRebateMapper.xml index d5fca3e354..a70cdf14ce 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebate/ScmCollectionRebateMapper.xml +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebate/ScmCollectionRebateMapper.xml @@ -1,13 +1,12 @@ - - - - - + + + \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebate/ScmCollectionRebateRest.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebate/ScmCollectionRebateRest.java index 9ea33c5948..1ee152fe34 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebate/ScmCollectionRebateRest.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebate/ScmCollectionRebateRest.java @@ -33,27 +33,13 @@ import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import java.util.List; -/** - * Project: anrui-scm(回款返利)
- * File: ScmCollectionRebateFeignFallback.java
- * Class: com.yxt.anrui.scm.biz.scmcollectionrebate.ScmCollectionRebateRest
- * Description: 回款返利表.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2022-09-27 15:14:18
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ @Api(tags = "回款返利表") -@RestController("com.yxt.anrui.scm.biz.scmcollectionrebate.ScmCollectionRebateRest") +@RestController @RequestMapping("v1/scmcollectionrebate") public class ScmCollectionRebateRest implements ScmCollectionRebateFeign { @@ -65,8 +51,6 @@ public class ScmCollectionRebateRest implements ScmCollectionRebateFeign { private ScmCollectionRebateWithApplyService scmCollectionRebateWithApplyService; @Override - @ApiOperation("根据条件分页查询数据的列表") - @PostMapping("/listPage") public ResultBean> listPage(@RequestBody PagerQuery pq) { ResultBean rb = ResultBean.fireFail(); PagerVo pv = scmCollectionRebateService.listPageVo(pq); @@ -74,18 +58,23 @@ public class ScmCollectionRebateRest implements ScmCollectionRebateFeign { } @Override - @ApiOperation("新增或修改") - @PostMapping("/save") public ResultBean save(@RequestBody ScmCollectionRebateDto dto) { return scmCollectionRebateService.saveOrUpdateDto(dto); } @Override - @ApiOperation("根据sid批量删除") - @PostMapping("/delBySids") + public ResultBean confirm(List dto) { + return scmCollectionRebateService.confirm(dto); + } + + @Override public ResultBean delBySids(@RequestBody String[] sids) { ResultBean rb = ResultBean.fireFail(); for (String sid : sids) { + ScmCollectionRebate scmCollectionRebate = scmCollectionRebateService.fetchBySid(sid); + if (scmCollectionRebate.getIsEnable() == 1){ + return rb.setMsg("所选数据中包含推送的回款返利信息，无法删除"); + } List stringList = scmCollectionRebateWithService.fetchByCollectionReBateSid(sid); for (String s : stringList) { ScmCollectionRebateWithApply scmCollectionRebateWithApply = scmCollectionRebateWithApplyService.fetchBySid(s); @@ -93,7 +82,6 @@ public class ScmCollectionRebateRest implements ScmCollectionRebateFeign { return rb.setMsg("所选数据中包含已提交回款返利信息，无法删除"); } } - ScmCollectionRebate scmCollectionRebate = scmCollectionRebateService.fetchBySid(sid); Integer state = scmCollectionRebate.getState(); if (state == 1) { return rb.setMsg("所选数据中包含已预提回款返利信息，无法删除"); @@ -104,8 +92,6 @@ public class ScmCollectionRebateRest implements ScmCollectionRebateFeign { } @Override - @ApiOperation("根据SID获取一条记录") - @GetMapping("/fetchDetailsBySid/{sid}") public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid) { return scmCollectionRebateService.fetchAllDetailsVoBySid(sid); } 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 5ce3c4828a..d90ca83d21 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 @@ -84,7 +84,10 @@ public class ScmCollectionRebateService extends MybatisBaseService qw = new QueryWrapper<>(); //========================================数据授权开始 - if (StringUtils.isNotBlank(query.getMenuUrl())) { + if (StringUtils.isBlank(query.getOrgPath())) { + qw.eq("createOrgSid", query.getCreateOrgSid()); + qw.eq("isEnable", 1); + } else if (StringUtils.isNotBlank(query.getMenuUrl())) { PrivilegeQuery privilegeQuery = new PrivilegeQuery(); privilegeQuery.setOrgPath(query.getOrgPath()); privilegeQuery.setMenuUrl(query.getMenuUrl()); @@ -157,6 +160,11 @@ public class ScmCollectionRebateService extends MybatisBaseService page = PagerUtil.queryToPage(pq); IPage pagging = baseMapper.selectPageVo(page, qw); + for (ScmCollectionRebateVo record : pagging.getRecords()) { + List scmCollectionRebateVehDetailsVos = scmCollectionRebateVehService.fetchByMainSid(record.getSid()); + record.setScmCollectionRebateVehs(scmCollectionRebateVehDetailsVos); + record.setIsEnable(0); + } PagerVo p = PagerUtil.pageToVo(pagging, null); return p; } @@ -193,6 +201,21 @@ public class ScmCollectionRebateService extends MybatisBaseService dto) { + ResultBean rb = ResultBean.fireFail(); + for (ScmCollectionRebateDto scmCollectionRebateDto : dto) { + String sid = this.insertByDto(scmCollectionRebateDto); + List scmCollectionRebateVehs = scmCollectionRebateDto.getScmCollectionRebateVehs(); + if (!scmCollectionRebateVehs.isEmpty()) { + for (ScmCollectionRebateVehDto scmCollectionRebateVeh : scmCollectionRebateVehs) { + scmCollectionRebateVeh.setMainSid(sid); + scmCollectionRebateVehService.insertByDto(scmCollectionRebateVeh); + } + } + } + return rb.success(); + } + public String insertByDto(ScmCollectionRebateDto dto) { ScmCollectionRebate entity = new ScmCollectionRebate(); BeanUtil.copyProperties(dto, entity, "id", "sid"); @@ -218,18 +241,29 @@ public class ScmCollectionRebateService extends MybatisBaseService withApplyGetCollectionRebate(PagerQuery pq) { ScmCollectionRebateQuery query = pq.getParams(); QueryWrapper qw = new QueryWrapper<>(); - qw.eq("brandSid", query.getBrandSid()); + if (StringUtils.isNotBlank(query.getPurchaseSystemName())) { + qw.like("purchaseSystemName", query.getPurchaseSystemName()); + } + if (StringUtils.isNotBlank(query.getBrandName())) { + qw.like("brandName", query.getBrandName()); + } + if (StringUtils.isNotBlank(query.getRebateTypeKey())) { + qw.eq("rebateTypeKey", query.getRebateTypeKey()); + } + if (StringUtils.isNotBlank(query.getRebateName())) { + qw.like("rebateName", query.getRebateName()); + } if (StringUtils.isNotBlank(query.getCollectionTypeKey())) { qw.eq("collectionTypeKey", query.getCollectionTypeKey()); } @@ -245,17 +279,12 @@ public class ScmCollectionRebateService extends MybatisBaseService 0) { qw.notIn("sid", query.getSidList()); } IPage page = PagerUtil.queryToPage(pq); IPage pagging = baseMapper.selectPageVo(page, qw); - for (ScmCollectionRebateVo record : pagging.getRecords()) { - String brandSid = record.getBrandSid(); - String manufaSaleChannelValue = record.getManufaSaleChannelValue(); - String bankAccount = baseManufacturerBankFeign.selectBankAccount(brandSid, manufaSaleChannelValue).getData(); - record.setManufaBankAccount(bankAccount); - } PagerVo p = PagerUtil.pageToVo(pagging, null); return p; } @@ -278,26 +307,9 @@ public class ScmCollectionRebateService extends MybatisBaseService page = PagerUtil.queryToPage(pq); IPage pagging = baseMapper.selectPageVo(page, qw); - List records = pagging.getRecords(); - for (ScmCollectionRebateVo record : records) { - //上传状态：未上传 - if (record.getUploadDate() == null) { - record.setUploadState("2"); - }else { - //上传状态：已上传 - record.setUploadState("3"); - } - String withholdingDate = record.getWithholdingDate(); - DateTime parse = DateUtil.parse(withholdingDate, "yyyy-MM-dd"); - record.setWithholdingDate(parse.toString()); - String brandSid = record.getBrandSid(); - String manufaSaleChannelValue = record.getManufaSaleChannelValue(); - String bankAccount = baseManufacturerBankFeign.selectBankAccount(brandSid, manufaSaleChannelValue).getData(); - record.setManufaBankAccount(bankAccount); - } PagerVo p = PagerUtil.pageToVo(pagging, null); return p; } @@ -318,27 +330,14 @@ public class ScmCollectionRebateService extends MybatisBaseService= date_format('" + withholdingStartDate + "','%Y-%m-%d')"). apply(StringUtils.isNotBlank(withholdingEndDate), "date_format (withholdingDate,'%Y-%m-%d') <= date_format('" + withholdingEndDate + "','%Y-%m-%d')" ); - String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(query.getOrgPath()).getData(); - qw.eq("createOrgSid", useOrgSid); - qw.eq("state", 3); + qw.eq("createOrgSid", query.getCreateOrgSid()); + qw.eq("state", 2); + qw.isNotNull("uploadDate"); if (query.getSidList().size() > 0) { qw.notIn("sid", query.getSidList()); } IPage page = PagerUtil.queryToPage(pq); IPage pagging = baseMapper.selectPageVo(page, qw); - for (ScmCollectionRebateVo record : pagging.getRecords()) { - String withholdingDate = record.getWithholdingDate(); - DateTime parse = DateUtil.parse(withholdingDate, "yyyy-MM-dd"); - int year = DateUtil.year(parse); - int month = DateUtil.month(parse) + 1; - String withholdingDateCopy = year + "年" + month + "月"; - record.setWithholdingDate(parse.toString()); - record.setWithholdingDateCopy(withholdingDateCopy); - String brandSid = record.getBrandSid(); - String manufaSaleChannelValue = record.getManufaSaleChannelValue(); - String bankAccount = baseManufacturerBankFeign.selectBankAccount(brandSid, manufaSaleChannelValue).getData(); - record.setManufaBankAccount(bankAccount); - } PagerVo p = PagerUtil.pageToVo(pagging, null); return p; } @@ -357,7 +356,7 @@ public class ScmCollectionRebateService extends MybatisBaseService SELECT scc.*, - SUM(scr.`estimateRebate`) estimateRebate, - SUM(scr.`uploadMoney`) uploadMoney, - SUM(scr.`collectionMoney`) collectionMoney, - SUM(scr.`adjustmentMoney`) adjustmentMoney + SUM(sccd.`estimateRebate`) estimateRebate, + SUM(sccd.`uploadMoney`) uploadMoney, + SUM(sccd.`adjustmentMoney`) adjustmentMoney FROM scm_collectionrebate_checkapply scc LEFT JOIN scm_collectionrebate_checkapplydetail sccd ON scc.`sid` = sccd.`mainSid` - LEFT JOIN scm_collection_rebate scr - ON scr.`sid` = sccd.`collectionRebateSid` ${ew.sqlSegment} diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyService.java index 2b4c03a4c1..81385a5102 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyService.java @@ -46,6 +46,7 @@ import com.yxt.anrui.scm.api.scmcollectionrebatecheckapply.flow.SubmitScmCollect import com.yxt.anrui.scm.api.scmcollectionrebatecheckapplydetail.ScmCollectionrebateCheckapplydetail; import com.yxt.anrui.scm.api.scmcollectionrebatecheckapplydetail.ScmCollectionrebateCheckapplydetailDetailsVo; import com.yxt.anrui.scm.api.scmcollectionrebatecheckapplydetail.ScmCollectionrebateCheckapplydetailDto; +import com.yxt.anrui.scm.api.scmcollectionrebatecheckapplydetail.ScmCollectionrebateCheckapplydetailVo; import com.yxt.anrui.scm.api.scmcollectionrebatewithapply.ScmCollectionRebateWithApplyVo; import com.yxt.anrui.scm.api.scmcollectionrebatewithapply.flow.GetNodeQuery; import com.yxt.anrui.scm.api.scmcollectionrebatewithapply.flow.GetNodeVo; @@ -97,13 +98,6 @@ public class ScmCollectionrebateCheckapplyService extends MybatisBaseService createQueryWrapper(ScmCollectionrebateCheckapplyQuery query) { - // todo: 这里根据具体业务调整查询条件 - // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); - QueryWrapper qw = new QueryWrapper<>(); - return qw; - } - public PagerVo listPageVo(PagerQuery pq) { ScmCollectionrebateCheckapplyQuery query = pq.getParams(); QueryWrapper qw = new QueryWrapper<>(); @@ -147,26 +141,32 @@ public class ScmCollectionrebateCheckapplyService extends MybatisBaseService= date_format('" + createStartTime + "','%Y-%m-%d')"). apply(StringUtils.isNotBlank(createEndTime), "date_format (scc.createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')" ); + String finishTimeStart = query.getFinishTimeStart(); + String finishTimeEnd = query.getFinishTimeEnd(); + qw.apply(StringUtils.isNotEmpty(finishTimeStart), "date_format (scc.finishTime,'%Y-%m-%d') >= date_format('" + finishTimeStart + "','%Y-%m-%d')"). + apply(StringUtils.isNotEmpty(finishTimeEnd), "date_format (scc.finishTime,'%Y-%m-%d') <= date_format('" + finishTimeEnd + "','%Y-%m-%d')" + ); + qw.groupBy("scc.sid"); + qw.orderByDesc("scc.createTime"); IPage page = PagerUtil.queryToPage(pq); IPage pagging = baseMapper.selectPageVo(page, qw); - List records = pagging.getRecords(); - for (ScmCollectionrebateCheckapplyVo record : records) { - record.setEstimateRebate(record.getEstimateRebate().substring(0, record.getEstimateRebate().lastIndexOf("."))); - record.setUploadMoney(record.getUploadMoney().substring(0, record.getUploadMoney().lastIndexOf("."))); - record.setCollectionMoney(record.getCollectionMoney().substring(0, record.getCollectionMoney().lastIndexOf("."))); - record.setAdjustmentMoney(record.getAdjustmentMoney().substring(0, record.getAdjustmentMoney().lastIndexOf("."))); - } PagerVo p = PagerUtil.pageToVo(pagging, null); return p; } @@ -174,32 +174,15 @@ public class ScmCollectionrebateCheckapplyService extends MybatisBaseService scmWhenCollectionrebateCheckapplydetailDetails = dto.getScmWhenCollectionrebateCheckapplydetailDetails(); - List scmLastCollectionrebateCheckapplydetailDetails = dto.getScmLastCollectionrebateCheckapplydetailDetails(); - if (scmWhenCollectionrebateCheckapplydetailDetails.size() < 1 && scmLastCollectionrebateCheckapplydetailDetails.size() < 1) { + List scmCollectionrebateCheckapplydetailVos = dto.getScmCollectionrebateCheckapplydetailVos(); + if (scmCollectionrebateCheckapplydetailVos.size() == 0) { return rb.setMsg("请选择已核对回款返利信息"); } if (StringUtils.isBlank(dtoSid)) { String sid = this.insertByDto(dto).getData(); - if (scmWhenCollectionrebateCheckapplydetailDetails.size() > 0) { - for (ScmCollectionrebateCheckapplydetailDto scmCollectionrebateCheckapplydetail : scmWhenCollectionrebateCheckapplydetailDetails) { - for (String CollectionRebateSid : scmCollectionrebateCheckapplydetail.getCollectionRebateSids()) { - ScmCollectionrebateCheckapplydetail scmCollectionrebateCheckapplydetail1 = new ScmCollectionrebateCheckapplydetail(); - scmCollectionrebateCheckapplydetail1.setCollectionRebateSid(CollectionRebateSid); - scmCollectionrebateCheckapplydetail1.setMainSid(sid); - scmCollectionrebateCheckapplydetailService.save(scmCollectionrebateCheckapplydetail1); - } - } - } - if (scmLastCollectionrebateCheckapplydetailDetails.size() > 0) { - for (ScmCollectionrebateCheckapplydetailDto scmCollectionrebateCheckapplydetail : scmLastCollectionrebateCheckapplydetailDetails) { - for (String CollectionRebateSid : scmCollectionrebateCheckapplydetail.getCollectionRebateSids()) { - ScmCollectionrebateCheckapplydetail scmCollectionrebateCheckapplydetail1 = new ScmCollectionrebateCheckapplydetail(); - scmCollectionrebateCheckapplydetail1.setCollectionRebateSid(CollectionRebateSid); - scmCollectionrebateCheckapplydetail1.setMainSid(sid); - scmCollectionrebateCheckapplydetailService.save(scmCollectionrebateCheckapplydetail1); - } - } + for (ScmCollectionrebateCheckapplydetailDto scmCollectionrebateCheckapplydetailDto : scmCollectionrebateCheckapplydetailVos) { + scmCollectionrebateCheckapplydetailDto.setMainSid(sid); + scmCollectionrebateCheckapplydetailService.insertByDto(scmCollectionrebateCheckapplydetailDto); } return rb.success().setMsg("添加成功").setData(sid); } @@ -209,25 +192,9 @@ public class ScmCollectionrebateCheckapplyService extends MybatisBaseService 0) { - for (ScmCollectionrebateCheckapplydetailDto scmCollectionrebateCheckapplydetail : scmWhenCollectionrebateCheckapplydetailDetails) { - for (String CollectionRebateSid : scmCollectionrebateCheckapplydetail.getCollectionRebateSids()) { - ScmCollectionrebateCheckapplydetail scmCollectionrebateCheckapplydetail1 = new ScmCollectionrebateCheckapplydetail(); - scmCollectionrebateCheckapplydetail1.setCollectionRebateSid(CollectionRebateSid); - scmCollectionrebateCheckapplydetail1.setMainSid(dtoSid); - scmCollectionrebateCheckapplydetailService.save(scmCollectionrebateCheckapplydetail1); - } - } - } - if (scmLastCollectionrebateCheckapplydetailDetails.size() > 0) { - for (ScmCollectionrebateCheckapplydetailDto scmCollectionrebateCheckapplydetail : scmLastCollectionrebateCheckapplydetailDetails) { - for (String CollectionRebateSid : scmCollectionrebateCheckapplydetail.getCollectionRebateSids()) { - ScmCollectionrebateCheckapplydetail scmCollectionrebateCheckapplydetail1 = new ScmCollectionrebateCheckapplydetail(); - scmCollectionrebateCheckapplydetail1.setCollectionRebateSid(CollectionRebateSid); - scmCollectionrebateCheckapplydetail1.setMainSid(dtoSid); - scmCollectionrebateCheckapplydetailService.save(scmCollectionrebateCheckapplydetail1); - } - } + for (ScmCollectionrebateCheckapplydetailDto scmCollectionrebateCheckapplydetailDto : scmCollectionrebateCheckapplydetailVos) { + scmCollectionrebateCheckapplydetailDto.setMainSid(dtoSid); + scmCollectionrebateCheckapplydetailService.insertByDto(scmCollectionrebateCheckapplydetailDto); } return rb.success().setMsg("修改成功").setData(dtoSid); } @@ -255,39 +222,27 @@ public class ScmCollectionrebateCheckapplyService extends MybatisBaseService scmWhenCollectionrebateCheckapplydetailDetailsVos = scmCollectionrebateCheckapplydetailService.fetchWhenDetailsVoBySid(sid); - if (scmWhenCollectionrebateCheckapplydetailDetailsVos.size() > 0){ + if (scmWhenCollectionrebateCheckapplydetailDetailsVos.size() > 0) { for (ScmCollectionrebateCheckapplydetailDetailsVo scmWhenCollectionrebateCheckapplydetailDetailsVo : scmWhenCollectionrebateCheckapplydetailDetailsVos) { String CollectionRebateSid = scmWhenCollectionrebateCheckapplydetailDetailsVo.getCollectionRebateSid(); String[] CollectionRebateSids = CollectionRebateSid.split(","); scmWhenCollectionrebateCheckapplydetailDetailsVo.setCollectionRebateSids(Arrays.asList(CollectionRebateSids)); - scmWhenCollectionrebateCheckapplydetailDetailsVo.setEstimateRebate(scmWhenCollectionrebateCheckapplydetailDetailsVo.getEstimateRebate().substring(0,scmWhenCollectionrebateCheckapplydetailDetailsVo.getEstimateRebate().lastIndexOf("."))); - scmWhenCollectionrebateCheckapplydetailDetailsVo.setUploadMoney(scmWhenCollectionrebateCheckapplydetailDetailsVo.getUploadMoney().substring(0,scmWhenCollectionrebateCheckapplydetailDetailsVo.getUploadMoney().lastIndexOf("."))); - scmWhenCollectionrebateCheckapplydetailDetailsVo.setCollectionMoney(scmWhenCollectionrebateCheckapplydetailDetailsVo.getCollectionMoney().substring(0,scmWhenCollectionrebateCheckapplydetailDetailsVo.getCollectionMoney().lastIndexOf("."))); - scmWhenCollectionrebateCheckapplydetailDetailsVo.setAdjustmentMoney(scmWhenCollectionrebateCheckapplydetailDetailsVo.getAdjustmentMoney().substring(0,scmWhenCollectionrebateCheckapplydetailDetailsVo.getAdjustmentMoney().lastIndexOf("."))); } } scmCollectionrebateCheckapplyDetailsVo.setScmWhenCollectionrebateCheckapplydetailDetails(scmWhenCollectionrebateCheckapplydetailDetailsVos); List scmLastCollectionrebateCheckapplydetailDetailsVos = scmCollectionrebateCheckapplydetailService.fetchLastDetailsVoBySid(sid); - if (scmLastCollectionrebateCheckapplydetailDetailsVos.size() > 0){ + if (scmLastCollectionrebateCheckapplydetailDetailsVos.size() > 0) { for (ScmCollectionrebateCheckapplydetailDetailsVo scmLastCollectionrebateCheckapplydetailDetailsVo : scmLastCollectionrebateCheckapplydetailDetailsVos) { String CollectionRebateSid = scmLastCollectionrebateCheckapplydetailDetailsVo.getCollectionRebateSid(); String[] CollectionRebateSids = CollectionRebateSid.split(","); scmLastCollectionrebateCheckapplydetailDetailsVo.setCollectionRebateSids(Arrays.asList(CollectionRebateSids)); - scmLastCollectionrebateCheckapplydetailDetailsVo.setEstimateRebate(scmLastCollectionrebateCheckapplydetailDetailsVo.getEstimateRebate().substring(0,scmLastCollectionrebateCheckapplydetailDetailsVo.getEstimateRebate().lastIndexOf("."))); - scmLastCollectionrebateCheckapplydetailDetailsVo.setUploadMoney(scmLastCollectionrebateCheckapplydetailDetailsVo.getUploadMoney().substring(0,scmLastCollectionrebateCheckapplydetailDetailsVo.getUploadMoney().lastIndexOf("."))); - scmLastCollectionrebateCheckapplydetailDetailsVo.setCollectionMoney(scmLastCollectionrebateCheckapplydetailDetailsVo.getCollectionMoney().substring(0,scmLastCollectionrebateCheckapplydetailDetailsVo.getCollectionMoney().lastIndexOf("."))); - scmLastCollectionrebateCheckapplydetailDetailsVo.setAdjustmentMoney(scmLastCollectionrebateCheckapplydetailDetailsVo.getAdjustmentMoney().substring(0,scmLastCollectionrebateCheckapplydetailDetailsVo.getAdjustmentMoney().lastIndexOf("."))); - String withholdingDate = scmLastCollectionrebateCheckapplydetailDetailsVo.getWithholdingDate(); - Date parse = DateUtil.parse(withholdingDate); - int year = DateUtil.year(parse); - int month = DateUtil.month(parse) + 1; - String withholdingDateCopy = year + "年" + month + "月"; - scmLastCollectionrebateCheckapplydetailDetailsVo.setWithholdingDateCopy(withholdingDateCopy); } } scmCollectionrebateCheckapplyDetailsVo.setScmLastCollectionrebateCheckapplydetailDetails(scmLastCollectionrebateCheckapplydetailDetailsVos); + List scmCollectionrebateCheckapplydetailVos = scmCollectionrebateCheckapplydetailService.selByMainSid(sid); + scmCollectionrebateCheckapplyDetailsVo.setScmCollectionrebateCheckapplydetailVos(scmCollectionrebateCheckapplydetailVos); return rb.success().setData(scmCollectionrebateCheckapplyDetailsVo); } @@ -326,9 +281,9 @@ public class ScmCollectionrebateCheckapplyService extends MybatisBaseService appMap = new HashMap<>(); - appMap.put("sid",businessSid); - variables.put("app",appMap); + Map appMap = new HashMap<>(); + appMap.put("sid", businessSid); + variables.put("app", appMap); //用户的部门全路径sid bv.setOrgSidPath(orgSidPath); //业务sid @@ -503,7 +458,7 @@ public class ScmCollectionrebateCheckapplyService extends MybatisBaseService>> resultBean = flowTaskFeign.getPreviousNodesForReject(bv); //判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给getNodeVo - List voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m),GetNodeVo.class)).collect(Collectors.toList()); + List voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), GetNodeVo.class)).collect(Collectors.toList()); // List voList = resultBean.getData().stream().map(m -> JSON.parseObject(JSON.toJSONString(m), GetNodeVo.class)).collect(Collectors.toList()); return rb.success().setData(voList); } diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapplydetail/ScmCollectionrebateCheckapplydetailMapper.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapplydetail/ScmCollectionrebateCheckapplydetailMapper.java index ecb2239ff2..8e108c191d 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapplydetail/ScmCollectionrebateCheckapplydetailMapper.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapplydetail/ScmCollectionrebateCheckapplydetailMapper.java @@ -29,6 +29,7 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.yxt.anrui.scm.api.scmcollectionrebate.ScmCollectionRebate; import com.yxt.anrui.scm.api.scmcollectionrebatecheckapplydetail.ScmCollectionrebateCheckapplydetailDetailsVo; import org.apache.ibatis.annotations.Delete; import org.apache.ibatis.annotations.Mapper; @@ -55,15 +56,14 @@ import java.util.List; @Mapper public interface ScmCollectionrebateCheckapplydetailMapper extends BaseMapper { - IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); - - List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); - - List selectListVo(); - void delByMainSid(String dtoSid); List fetchWhenDetailsVoBySid(String sid); List fetchLastDetailsVoBySid(String sid); + + @Select("select * from scm_collectionrebate_checkapplydetail where mainSid = #{s}") + List selByMainSid(String s); + + ScmCollectionRebate selByCollectionRebateSid(String collectionRebateSid); } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapplydetail/ScmCollectionrebateCheckapplydetailMapper.xml b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapplydetail/ScmCollectionrebateCheckapplydetailMapper.xml index 79e0f502d4..b18584e814 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapplydetail/ScmCollectionrebateCheckapplydetailMapper.xml +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapplydetail/ScmCollectionrebateCheckapplydetailMapper.xml @@ -3,27 +3,6 @@ - - - - - DELETE @@ -33,34 +12,35 @@ + + \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapplydetail/ScmCollectionrebateCheckapplydetailRest.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapplydetail/ScmCollectionrebateCheckapplydetailRest.java index 5f2499824b..642787184b 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapplydetail/ScmCollectionrebateCheckapplydetailRest.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapplydetail/ScmCollectionrebateCheckapplydetailRest.java @@ -25,6 +25,7 @@ *********************************************************/ package com.yxt.anrui.scm.biz.scmcollectionrebatecheckapplydetail; +import com.yxt.anrui.scm.api.scmcollectionrebate.ScmCollectionRebateDetailsVo; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; @@ -62,15 +63,6 @@ public class ScmCollectionrebateCheckapplydetailRest implements ScmCollectionreb @Autowired private ScmCollectionrebateCheckapplydetailService scmCollectionrebateCheckapplydetailService; - @Override - @ApiOperation("根据条件分页查询数据的列表") - @PostMapping("/listPage") - public ResultBean> listPage(@RequestBody PagerQuery pq){ - ResultBean rb = ResultBean.fireFail(); - PagerVo pv = scmCollectionrebateCheckapplydetailService.listPageVo(pq); - return rb.success().setData(pv); - } - @Override @ApiOperation("新增或修改") @PostMapping("/save") @@ -97,4 +89,9 @@ public class ScmCollectionrebateCheckapplydetailRest implements ScmCollectionreb ScmCollectionrebateCheckapplydetailDetailsVo vo = scmCollectionrebateCheckapplydetailService.fetchDetailsVoBySid(sid); return rb.success().setData(vo); } + + @Override + public ResultBean> collectionRebateCheckDetails(String sid) { + return scmCollectionrebateCheckapplydetailService.collectionRebateCheckDetails(sid); + } } 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 4f310cbf46..50fa214e51 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 @@ -28,6 +28,8 @@ package com.yxt.anrui.scm.biz.scmcollectionrebatecheckapplydetail; import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.yxt.anrui.scm.api.scmcollectionrebate.ScmCollectionRebate; +import com.yxt.anrui.scm.api.scmcollectionrebate.ScmCollectionRebateDetailsVo; import org.apache.commons.lang3.StringUtils; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.PagerUtil; @@ -43,6 +45,7 @@ import com.yxt.anrui.scm.api.scmcollectionrebatecheckapplydetail.ScmCollectionre import org.springframework.stereotype.Service; +import java.util.ArrayList; import java.util.List; /** @@ -60,19 +63,6 @@ import java.util.List; */ @Service public class ScmCollectionrebateCheckapplydetailService extends MybatisBaseService { - private QueryWrapper createQueryWrapper(ScmCollectionrebateCheckapplydetailQuery query) { - QueryWrapper qw = new QueryWrapper<>(); - return qw; - } - - public PagerVo listPageVo(PagerQuery pq) { - ScmCollectionrebateCheckapplydetailQuery query = pq.getParams(); - QueryWrapper qw = createQueryWrapper(query); - IPage page = PagerUtil.queryToPage(pq); - IPage pagging = baseMapper.selectPageVo(page, qw); - PagerVo p = PagerUtil.pageToVo(pagging, null); - return p; - } public void saveOrUpdateDto(ScmCollectionrebateCheckapplydetailDto dto) { String dtoSid = dto.getSid(); @@ -117,4 +107,23 @@ public class ScmCollectionrebateCheckapplydetailService extends MybatisBaseServi public List fetchLastDetailsVoBySid(String sid) { return baseMapper.fetchLastDetailsVoBySid(sid); } + + public ResultBean> collectionRebateCheckDetails(String sid) { + ResultBean rb = ResultBean.fireFail(); + List scmCollectionRebateDetailsVos = new ArrayList<>(); + String[] sids = sid.split(","); + for (String s : sids) { + ScmCollectionRebate scmCollectionRebate = baseMapper.selByCollectionRebateSid(s); + if (scmCollectionRebate != null){ + ScmCollectionRebateDetailsVo scmCollectionRebateDetailsVo = new ScmCollectionRebateDetailsVo(); + BeanUtil.copyProperties(scmCollectionRebate,scmCollectionRebateDetailsVo); + scmCollectionRebateDetailsVos.add(scmCollectionRebateDetailsVo); + } + } + return rb.success().setData(scmCollectionRebateDetailsVos); + } + + public List selByMainSid(String sid) { + return baseMapper.selByMainSid(sid); + } } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewith/ScmCollectionRebateWithMapper.xml b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewith/ScmCollectionRebateWithMapper.xml index e868974d42..6b78a01381 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewith/ScmCollectionRebateWithMapper.xml +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewith/ScmCollectionRebateWithMapper.xml @@ -20,18 +20,17 @@ \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyMapper.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyMapper.java index 7041d6cdf7..f3074a1062 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyMapper.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyMapper.java @@ -38,28 +38,11 @@ import com.yxt.anrui.scm.api.scmcollectionrebatewithapply.ScmCollectionRebateWit import java.util.List; import java.util.Map; -/** - * Project: anrui-scm(回款返利)
- * File: ScmCollectionRebateWithApplyMapper.java
- * Class: com.yxt.anrui.scm.biz.scmcollectionrebatewithapply.ScmCollectionRebateWithApplyMapper
- * Description: 回款返利预提申请表.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2022-09-27 15:14:19
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ @Mapper public interface ScmCollectionRebateWithApplyMapper extends BaseMapper { IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); - List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); - - List selectListVo(); - int selectBySid(String join); int updateFlowFiled(Map beanToMap); diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyMapper.xml b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyMapper.xml index edf70cc390..31b17ca2c6 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyMapper.xml +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyMapper.xml @@ -7,7 +7,7 @@ resultType="com.yxt.anrui.scm.api.scmcollectionrebatewithapply.ScmCollectionRebateWithApplyVo"> SELECT scrwa.*, - SUM(scr.`estimateRebate`) withRebateTotal + SUM(scr.`estimateRebate`) estimateRebate FROM scm_collection_rebate_with_apply scrwa LEFT JOIN scm_collection_rebate_with scrw @@ -19,14 +19,6 @@ - - - select * - from scm_collection_rebate_with_apply - \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyRest.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyRest.java index 5cf7ac2f8f..be6e9db933 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyRest.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyRest.java @@ -50,21 +50,8 @@ import com.yxt.anrui.scm.api.scmcollectionrebatewithapply.ScmCollectionRebateWit import com.yxt.anrui.scm.api.scmcollectionrebatewithapply.ScmCollectionRebateWithApplyDto; import com.yxt.anrui.scm.api.scmcollectionrebatewithapply.ScmCollectionRebateWithApplyFeign; -/** - * Project: anrui-scm(回款返利)
- * File: ScmCollectionRebateWithApplyFeignFallback.java
- * Class: com.yxt.anrui.scm.biz.scmcollectionrebatewithapply.ScmCollectionRebateWithApplyRest
- * Description: 回款返利预提申请表.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2022-09-27 15:14:19
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ @Api(tags = "回款返利预提申请表") -@RestController("com.yxt.anrui.scm.biz.scmcollectionrebatewithapply.ScmCollectionRebateWithApplyRest") +@RestController @RequestMapping("v1/scmcollectionrebatewithapply") public class ScmCollectionRebateWithApplyRest implements ScmCollectionRebateWithApplyFeign { 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 ce6437ed71..1ac0c070af 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 @@ -26,6 +26,8 @@ package com.yxt.anrui.scm.biz.scmcollectionrebatewithapply; import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.date.DateTime; +import cn.hutool.core.date.DateUtil; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -74,19 +76,6 @@ import org.springframework.stereotype.Service; import java.util.*; import java.util.stream.Collectors; -/** - * Project: anrui-scm(回款返利)
- * File: ScmCollectionRebateWithApplyService.java
- * Class: com.yxt.anrui.scm.biz.scmcollectionrebatewithapply.ScmCollectionRebateWithApplyService
- * Description: 回款返利预提申请表 业务逻辑.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2022-09-27 15:14:19
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ @Service public class ScmCollectionRebateWithApplyService extends MybatisBaseService { @@ -109,13 +98,6 @@ public class ScmCollectionRebateWithApplyService extends MybatisBaseService createQueryWrapper(ScmCollectionRebateWithApplyQuery query) { - // todo: 这里根据具体业务调整查询条件 - // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); - QueryWrapper qw = new QueryWrapper<>(); - return qw; - } - public PagerVo listPageVo(PagerQuery pq) { ScmCollectionRebateWithApplyQuery query = pq.getParams(); QueryWrapper qw = new QueryWrapper<>(); @@ -159,8 +141,14 @@ public class ScmCollectionRebateWithApplyService extends MybatisBaseService= date_format('" + createStartTime + "','%Y-%m-%d')"). apply(StringUtils.isNotBlank(createEndTime), "date_format (scrwa.createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')" ); + String finishTimeStart = query.getFinishTimeStart(); + String finishTimeEnd = query.getFinishTimeEnd(); + qw.apply(StringUtils.isNotEmpty(finishTimeStart), "date_format (scrwa.finishTime,'%Y-%m-%d') >= date_format('" + finishTimeStart + "','%Y-%m-%d')"). + apply(StringUtils.isNotEmpty(finishTimeEnd), "date_format (scrwa.finishTime,'%Y-%m-%d') <= date_format('" + finishTimeEnd + "','%Y-%m-%d')" + ); qw.groupBy("scrwa.sid"); qw.orderByDesc("scrwa.createTime"); IPage page = PagerUtil.queryToPage(pq); @@ -322,7 +315,7 @@ public class ScmCollectionRebateWithApplyService extends MybatisBaseService collectionRebateSids = scmCollectionRebateWith.getCollectionRebateSids(); for (String collectionRebateSid : collectionRebateSids) { - scmCollectionRebateService.updateWithholdingDateBySid(collectionRebateSid); + scmCollectionRebateService.updateState(collectionRebateSid, 1); } } if (r == 1) { @@ -389,13 +382,17 @@ public class ScmCollectionRebateWithApplyService extends MybatisBaseService scmCollectionRebateVehDetailsVos = scmCollectionRebateVehService.fetchByMainSid(collectionRebateSid); - if (scmCollectionRebateVehDetailsVos.isEmpty()){ + if (scmCollectionRebateVehDetailsVos.isEmpty()) { ScmCollectionRebate scmCollectionRebate = scmCollectionRebateService.fetchBySid(collectionRebateSid); ScmCollectionRebateDistribution scmCollectionRebateDistribution = new ScmCollectionRebateDistribution(); String sid = scmCollectionRebateDistribution.getSid(); - BeanUtil.copyProperties(scmCollectionRebate,scmCollectionRebateDistribution); + BeanUtil.copyProperties(scmCollectionRebate, scmCollectionRebateDistribution); scmCollectionRebateDistribution.setSid(sid); scmCollectionRebateDistribution.setDistributionState("未分配"); scmCollectionRebateDistribution.setCollRebateSid(scmCollectionRebate.getSid()); @@ -403,7 +400,6 @@ public class ScmCollectionRebateWithApplyService extends MybatisBaseService qw = new QueryWrapper<>(); //========================================数据授权开始 - if (StringUtils.isBlank(query.getOrgPath())){ - qw.eq("createOrgSid", query.getCreateOrgSid()); - }else if (StringUtils.isNotBlank(query.getMenuUrl())) { + if (StringUtils.isNotBlank(query.getMenuUrl())) { PrivilegeQuery privilegeQuery = new PrivilegeQuery(); privilegeQuery.setOrgPath(query.getOrgPath()); privilegeQuery.setMenuUrl(query.getMenuUrl());