From 82acedb5ff74391a73b5cb863a92ed5284523418 Mon Sep 17 00:00:00 2001 From: yxt_mtl <2049520089@qq.com> Date: Mon, 13 Jan 2025 16:52:11 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=9B=BE=E7=89=87?= =?UTF-8?q?=E3=80=81=E9=99=84=E4=BB=B6=E3=80=81=E5=85=B3=E8=81=94=E5=AE=A1?= =?UTF-8?q?=E6=89=B9=E5=8D=95=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../biz/oamendapply/OaMendApplyService.java | 34 +++++++++++++------ 1 file changed, 23 insertions(+), 11 deletions(-) diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oamendapply/OaMendApplyService.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oamendapply/OaMendApplyService.java index e668b38c25..63f2cb0149 100644 --- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oamendapply/OaMendApplyService.java +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oamendapply/OaMendApplyService.java @@ -180,6 +180,24 @@ public class OaMendApplyService extends MybatisBaseService 0) { + return rb.setMsg("删除的数据中包含已提交或已办结审批的数据，删除失败"); + } + delBySids(sids); + return rb.success(); + } + + /** + * 提交 + * + * @param dto + * @return + */ public ResultBean submit(SubmitOaMendApplyDto dto) { ResultBean rb = ResultBean.fireFail(); ResultBean stringResultBean = saveOrUpdateDto(dto); @@ -206,17 +224,6 @@ public class OaMendApplyService extends MybatisBaseService 0) { - return rb.setMsg("删除的数据中包含已提交或已办结审批的数据，删除失败"); - } - delBySids(sids); - return rb.success(); - } - /** * 办理（同意） * @@ -278,4 +285,9 @@ public class OaMendApplyService extends MybatisBaseService Date: Mon, 13 Jan 2025 16:55:34 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=9B=BE=E7=89=87?= =?UTF-8?q?=E3=80=81=E9=99=84=E4=BB=B6=E3=80=81=E5=85=B3=E8=81=94=E5=AE=A1?= =?UTF-8?q?=E6=89=B9=E5=8D=95=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../oa/biz/oamendapply/OaMendApplyService.java | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oamendapply/OaMendApplyService.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oamendapply/OaMendApplyService.java index 63f2cb0149..40744f34d2 100644 --- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oamendapply/OaMendApplyService.java +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oamendapply/OaMendApplyService.java @@ -262,7 +262,12 @@ public class OaMendApplyService extends MybatisBaseService> getPreviousNodesForReject(NodeQuery query) { + /** + * 提交时获取下一环节 + * @param query + * @return + */ + public ResultBean> getNextNodesForSubmit(NodeQuery query) { Map formVariables = query.getFormVariables(); //添加网关 // formVariables.put("", ""); @@ -271,10 +276,15 @@ public class OaMendApplyService extends MybatisBaseService> getNextNodesForSubmit(NodeQuery query) { + /** + * 驳回时获取上一环节 + * @param query + * @return + */ + public ResultBean> getPreviousNodesForReject(NodeQuery query) { Map formVariables = query.getFormVariables(); //添加网关 // formVariables.put("", ""); @@ -283,7 +293,7 @@ public class OaMendApplyService extends MybatisBaseService Date: Mon, 13 Jan 2025 17:25:22 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E7=AB=AF=E9=87=91?= =?UTF-8?q?=E8=9E=8D=E8=B0=83=E5=B7=AE=E7=94=B3=E8=AF=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ScmFinanceAdjustApplyFeign.java | 21 ++- .../ScmFinanceAdjustApplyFeignFallback.java | 11 ++ .../app/AppDetailsVo.java | 58 ++++++ .../scmfinanceadjustapply/app/AppListVo.java | 64 +++++++ .../ScmFinanceAdjustDetailsFeign.java | 10 +- .../ScmFinanceAdjustApplyRest.java | 11 ++ .../ScmFinanceAdjustApplyService.java | 72 +++++++ .../terminal/api/base/common/CommonFeign.java | 6 + .../AdjustApplyDetailsVo.java | 62 ++++++ .../financeadjustapply/AdjustApplyFeign.java | 72 +++++++ .../AdjustApplyFeignFallback.java | 57 ++++++ .../AdjustApplyRecordVo.java | 72 +++++++ .../flow/AdjustApplyFlowableQuery.java | 21 +++ .../flow/AppAdjustApplyDelegateQuery.java | 25 +++ .../flow/AppAdjustApplyTaskQuery.java | 46 +++++ .../flow/CompleteAdjustApplyDto.java | 35 ++++ .../terminal/biz/base/common/CommonRest.java | 6 + .../biz/base/common/CommonService.java | 32 ++++ .../financeadjustapply/AdjustApplyRest.java | 67 +++++++ .../AdjustApplyService.java | 178 ++++++++++++++++++ 20 files changed, 918 insertions(+), 8 deletions(-) create mode 100644 anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmfinanceadjustapply/app/AppDetailsVo.java create mode 100644 anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmfinanceadjustapply/app/AppListVo.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/financeadjustapply/AdjustApplyDetailsVo.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/financeadjustapply/AdjustApplyFeign.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/financeadjustapply/AdjustApplyFeignFallback.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/financeadjustapply/AdjustApplyRecordVo.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/financeadjustapply/flow/AdjustApplyFlowableQuery.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/financeadjustapply/flow/AppAdjustApplyDelegateQuery.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/financeadjustapply/flow/AppAdjustApplyTaskQuery.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/financeadjustapply/flow/CompleteAdjustApplyDto.java create mode 100644 anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/financeadjustapply/AdjustApplyRest.java create mode 100644 anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/financeadjustapply/AdjustApplyService.java diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmfinanceadjustapply/ScmFinanceAdjustApplyFeign.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmfinanceadjustapply/ScmFinanceAdjustApplyFeign.java index 54ddae8c55..ec605488c5 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmfinanceadjustapply/ScmFinanceAdjustApplyFeign.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmfinanceadjustapply/ScmFinanceAdjustApplyFeign.java @@ -25,6 +25,7 @@ *********************************************************/ package com.yxt.anrui.scm.api.scmfinanceadjustapply; +import com.yxt.anrui.scm.api.scmfinanceadjustapply.app.AppDetailsVo; import com.yxt.anrui.scm.api.scmfinanceadjustapply.flow.*; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; @@ -54,8 +55,8 @@ import java.util.List; */ @Api(tags = "金融贴息差异调整申请") @FeignClient( - contextId = "scm-ScmFinanceAdjustApply", - name = "scm", + contextId = "anrui-scm-ScmFinanceAdjustApply", + name = "anrui-scm", path = "v1/scmfinanceadjustapply", fallback = ScmFinanceAdjustApplyFeignFallback.class) public interface ScmFinanceAdjustApplyFeign { @@ -135,4 +136,20 @@ public interface ScmFinanceAdjustApplyFeign { @ApiOperation(value = "加签") @PostMapping(value = "/delegate") public ResultBean delegate(@RequestBody AdjustDelegateQuery distributorDelegateQuery); + + @ApiOperation(value = "转办") + @PutMapping(value = "/assignTask") + @ResponseBody + public ResultBean assignTask(@RequestBody AdjustDelegateQuery query); + + + + //----------------------------- app ---------------------------------- + + @ApiOperation("根据SID获取一条记录") + @GetMapping("/getAppDetails/{sid}") + @ResponseBody + public ResultBean getAppDetails(@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/scmfinanceadjustapply/ScmFinanceAdjustApplyFeignFallback.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmfinanceadjustapply/ScmFinanceAdjustApplyFeignFallback.java index acc9f84136..91a68808cb 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmfinanceadjustapply/ScmFinanceAdjustApplyFeignFallback.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmfinanceadjustapply/ScmFinanceAdjustApplyFeignFallback.java @@ -25,6 +25,7 @@ *********************************************************/ package com.yxt.anrui.scm.api.scmfinanceadjustapply; +import com.yxt.anrui.scm.api.scmfinanceadjustapply.app.AppDetailsVo; import com.yxt.anrui.scm.api.scmfinanceadjustapply.flow.*; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; @@ -131,4 +132,14 @@ public class ScmFinanceAdjustApplyFeignFallback implements ScmFinanceAdjustApply public ResultBean delegate(AdjustDelegateQuery distributorDelegateQuery) { return null; } + + @Override + public ResultBean assignTask(AdjustDelegateQuery query) { + return null; + } + + @Override + public ResultBean getAppDetails(String sid) { + return null; + } } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmfinanceadjustapply/app/AppDetailsVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmfinanceadjustapply/app/AppDetailsVo.java new file mode 100644 index 0000000000..65f5a3a5f2 --- /dev/null +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmfinanceadjustapply/app/AppDetailsVo.java @@ -0,0 +1,58 @@ +package com.yxt.anrui.scm.api.scmfinanceadjustapply.app; + +import lombok.Data; + +import java.util.List; + +@Data +public class AppDetailsVo { + + private String sid; + /** + * 调整方式 + */ + private String adjustWay; + /** + * 申请编号 + */ + private String billNo; + /** + * 申请人姓名 + */ + private String createByName; + /** + * 申请日期 + */ + private String createTime; + /** + * 附件 + */ + private List files; + /** + * 明细列表 + */ + private List list; + private String procInsId; + /** + * 分公司-部门 + */ + private String publishInfo; + /** + * 备注 + */ + private String remarks; + /** + * 销售经理 + */ + private String salesManage; + /** + * 销售专员 + */ + private String staffName; + private String taskId; + /** + * 合计，订单贴息金额：100，上传贴息金额：200，差额：100，已调整金额：50，当前差额：2，本次调整金额：20 + */ + private String total; + +} diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmfinanceadjustapply/app/AppListVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmfinanceadjustapply/app/AppListVo.java new file mode 100644 index 0000000000..214f4d0c78 --- /dev/null +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmfinanceadjustapply/app/AppListVo.java @@ -0,0 +1,64 @@ +package com.yxt.anrui.scm.api.scmfinanceadjustapply.app; + +import lombok.Data; + +@Data +public class AppListVo { + + + /** + * 差额 + */ + private String adjustmentMoney; + /** + * 已调整金额 + */ + private String alreadyMoney; + /** + * 品牌 + */ + private String brandName; + /** + * 合同号 + */ + private String contractNo; + /** + * 客户 + */ + private String customerName; + /** + * 订单贴息金额 + */ + private String estimateRebate; + /** + * 本次调整金额 + */ + private String nowAdjustmentMoney; + /** + * 当前差额 + */ + private String nowDiffAmount; + + /** + * 采购系统名称 + */ + private String purchaseSystemName; + /** + * 调整说明 + */ + private String remarks; + /** + * 上传贴息金额 + */ + private String uploadMoney; + /** + * 车型 + */ + private String vehModelName; + /** + * 车架号 + */ + private String vinNo; + + private String salesOrderSid; +} diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmfinanceadjustdetails/ScmFinanceAdjustDetailsFeign.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmfinanceadjustdetails/ScmFinanceAdjustDetailsFeign.java index 4ddc615eb2..1d3ca25520 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmfinanceadjustdetails/ScmFinanceAdjustDetailsFeign.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmfinanceadjustdetails/ScmFinanceAdjustDetailsFeign.java @@ -25,16 +25,14 @@ *********************************************************/ package com.yxt.anrui.scm.api.scmfinanceadjustdetails; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; 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.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.*; -import java.util.List; - /** * Project: scm(金融贴息)
* File: ScmFinanceAdjustDetailsFeign.java
@@ -50,8 +48,8 @@ import java.util.List; */ @Api(tags = "金融贴息差异金额调整明细表") @FeignClient( - contextId = "scm-ScmFinanceAdjustDetails", - name = "scm", + contextId = "anrui-scm-ScmFinanceAdjustDetails", + name = "anrui-scm", path = "v1/scmfinanceadjustdetails", fallback = ScmFinanceAdjustDetailsFeignFallback.class) public interface ScmFinanceAdjustDetailsFeign { diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmfinanceadjustapply/ScmFinanceAdjustApplyRest.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmfinanceadjustapply/ScmFinanceAdjustApplyRest.java index 4641de8034..36e1bcbe94 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmfinanceadjustapply/ScmFinanceAdjustApplyRest.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmfinanceadjustapply/ScmFinanceAdjustApplyRest.java @@ -29,6 +29,7 @@ import cn.hutool.core.bean.BeanUtil; import com.yxt.anrui.flowable.api.utils.ProcDefEnum; import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables; import com.yxt.anrui.scm.api.scmfinanceadjustapply.*; +import com.yxt.anrui.scm.api.scmfinanceadjustapply.app.AppDetailsVo; import com.yxt.anrui.scm.api.scmfinanceadjustapply.flow.*; import com.yxt.anrui.scm.biz.scmfile.ScmFileService; import com.yxt.anrui.scm.biz.scmfinanceadjustdetails.ScmFinanceAdjustDetailsService; @@ -187,4 +188,14 @@ public class ScmFinanceAdjustApplyRest implements ScmFinanceAdjustApplyFeign { public ResultBean delegate(AdjustDelegateQuery delegateQuery) { return scmFinanceAdjustApplyService.delegate(delegateQuery); } + + @Override + public ResultBean assignTask(AdjustDelegateQuery query) { + return scmFinanceAdjustApplyService.assignTask(query); + } + + @Override + public ResultBean getAppDetails(String sid) { + return scmFinanceAdjustApplyService.getAppDetails(sid); + } } diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmfinanceadjustapply/ScmFinanceAdjustApplyService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmfinanceadjustapply/ScmFinanceAdjustApplyService.java index 13a055a3df..a52bea06ab 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmfinanceadjustapply/ScmFinanceAdjustApplyService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmfinanceadjustapply/ScmFinanceAdjustApplyService.java @@ -68,6 +68,8 @@ import com.yxt.anrui.portal.api.sysuser.SysUserVo; import com.yxt.anrui.scm.api.scmfile.ScmFileDto; import com.yxt.anrui.scm.api.scmfile.ScmFileVo; import com.yxt.anrui.scm.api.scmfinanceadjustapply.*; +import com.yxt.anrui.scm.api.scmfinanceadjustapply.app.AppDetailsVo; +import com.yxt.anrui.scm.api.scmfinanceadjustapply.app.AppListVo; import com.yxt.anrui.scm.api.scmfinanceadjustapply.flow.*; import com.yxt.anrui.scm.api.scmfinanceadjustdetails.ScmFinanceAdjustDetails; import com.yxt.anrui.scm.api.scmvehrebate.ScmVehRebate; @@ -1120,4 +1122,74 @@ public class ScmFinanceAdjustApplyService extends MybatisBaseService getAppDetails(String sid) { + ResultBean rb = ResultBean.fireFail(); + AppDetailsVo vo = new AppDetailsVo(); + ScmFinanceAdjustApply apply = fetchBySid(sid); + BigDecimal t = BigDecimal.ZERO;//订单贴息金额合计 + BigDecimal s = BigDecimal.ZERO;//上传贴息金额合计 + BigDecimal c = BigDecimal.ZERO;//差额合计 + BigDecimal y = BigDecimal.ZERO;//已调整金额合计 + BigDecimal d = BigDecimal.ZERO;//当前差额合计 + BigDecimal b = BigDecimal.ZERO;//本次调整金额合计 + if (null != apply) { + BeanUtil.copyProperties(apply, vo); + vo.setCreateTime(DateUtil.formatDate(apply.getCreateTime())); + vo.setPublishInfo(apply.getUseOrgName() + "-" + apply.getDeptName()); + if (StringUtils.isNotBlank(apply.getProcInstId())) { + vo.setProcInsId(apply.getProcInstId()); + } + List scmFileVos = scmFileService.fetchByMainSid(sid); + if (!scmFileVos.isEmpty() && scmFileVos.size() > 0) { + List files = new ArrayList<>(); + for (ScmFileVo scmFileVo : scmFileVos) { + QueryUrl url = new QueryUrl(); + String filePath = scmFileVo.getFilePath(); + String urlPrefix = fileUploadComponent.getUrlPrefix(); + filePath = urlPrefix + filePath; + files.add(filePath); + } + vo.setFiles(files); + } + List details = scmFinanceAdjustDetailsService.selByMainSid(sid); + if (!details.isEmpty() && details.size() > 0) { + List list = new ArrayList<>(); + for (ScmFinanceAdjustDetails detail : details) { + AppListVo detailsListVo = new AppListVo(); + BeanUtil.copyProperties(detail, detailsListVo); + list.add(detailsListVo); + if (null != detail.getEstimateRebate()) { + t = t.add(detail.getEstimateRebate()); + } + if (null != detail.getUploadMoney()) { + s = s.add(detail.getUploadMoney()); + } + if (null != detail.getAdjustmentMoney()) { + c = c.add(detail.getAdjustmentMoney()); + } + if (null != detail.getAlreadyMoney()) { + y = y.add(detail.getAlreadyMoney()); + } + if (null != detail.getNowDiffAmount()) { + d = d.add(detail.getNowDiffAmount()); + } + if (null != detail.getNowAdjustmentMoney()) { + b = b.add(detail.getNowAdjustmentMoney()); + } + } + vo.setList(list); + } + vo.setTotal("订单贴息金额：" + d + "，上传贴息金额：" + s + "，差额：" + c + "，已调整金额：" + y + "，当前差额：" + d + "，本次调整金额：" + b); + } + return rb.success().setData(vo); + } + + public ResultBean assignTask(AdjustDelegateQuery query) { + ResultBean rb = ResultBean.fireFail(); + FlowDelegateQuery delegateQuery = new + FlowDelegateQuery(); + BeanUtil.copyProperties(query, delegateQuery); + flowFeign.assignTask(delegateQuery); + return rb.success(); + } } \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/base/common/CommonFeign.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/base/common/CommonFeign.java index ace35100df..3afe6d5cc7 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/base/common/CommonFeign.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/base/common/CommonFeign.java @@ -9,6 +9,7 @@ import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.*; import java.util.List; +import java.util.Map; /** * @Author dimengzhe @@ -53,6 +54,11 @@ public interface CommonFeign { @GetMapping("/getOrder") ResultBean getOrder(@RequestParam("saleOrderSid") String saleOrderSid); + @ApiOperation(value = "销售订单页面") + @ResponseBody + @GetMapping("/getOrderListByOrderSids") + ResultBean> getOrderListByOrderSids(@RequestBody List orderSids); + @ApiOperation(value = "金融方案详情页面") @ResponseBody @GetMapping("/getLoanSolution") diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/financeadjustapply/AdjustApplyDetailsVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/financeadjustapply/AdjustApplyDetailsVo.java new file mode 100644 index 0000000000..b88371544f --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/financeadjustapply/AdjustApplyDetailsVo.java @@ -0,0 +1,62 @@ +package com.yxt.anrui.terminal.api.supplychain.financeadjustapply; + +import com.yxt.common.core.vo.Vo; +import lombok.Data; + +import java.util.List; + +/** + * @author Administrator + * @description + * @date 2023/11/13 15:38 + */ +@Data +public class AdjustApplyDetailsVo implements Vo { + private String sid; + /** + * 调整方式 + */ + private String adjustWay; + /** + * 申请编号 + */ + private String billNo; + /** + * 申请人姓名 + */ + private String createByName; + /** + * 申请日期 + */ + private String createTime; + /** + * 附件 + */ + private List files; + /** + * 明细列表 + */ + private List list; + private String procInsId; + /** + * 分公司-部门 + */ + private String publishInfo; + /** + * 备注 + */ + private String remarks; + /** + * 销售经理 + */ + private String salesManage; + /** + * 销售专员 + */ + private String staffName; + private String taskId; + /** + * 合计，订单贴息金额：100，上传贴息金额：200，差额：100，已调整金额：50，当前差额：2，本次调整金额：20 + */ + private String total; +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/financeadjustapply/AdjustApplyFeign.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/financeadjustapply/AdjustApplyFeign.java new file mode 100644 index 0000000000..f2c24f8ed0 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/financeadjustapply/AdjustApplyFeign.java @@ -0,0 +1,72 @@ +package com.yxt.anrui.terminal.api.supplychain.financeadjustapply; + + +import com.yxt.anrui.terminal.api.supplychain.financeadjustapply.flow.AppAdjustApplyDelegateQuery; +import com.yxt.anrui.terminal.api.supplychain.financeadjustapply.flow.AppAdjustApplyTaskQuery; +import com.yxt.anrui.terminal.api.supplychain.financeadjustapply.flow.CompleteAdjustApplyDto; +import com.yxt.anrui.terminal.api.supplychain.financeadjustapply.flow.AdjustApplyFlowableQuery; +import com.yxt.common.core.result.ResultBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.cloud.openfeign.SpringQueryMap; +import org.springframework.web.bind.annotation.*; + +import javax.validation.Valid; + +/** + * @description: + * @author: fzz + * @date: 2023/8/8 + **/ +@Api(tags = "金融贴息差异调整") +@FeignClient( + contextId = "terminal-financeadjustapply", + name = "anrui-terminal", + path = "/v1/financeadjustapply", + fallback = AdjustApplyFeignFallback.class) +public interface AdjustApplyFeign { + + + @ApiOperation("详情") + @GetMapping("/fetchDetailsBySid/{sid}") + @ResponseBody + ResultBean fetchDetailsBySid(@PathVariable("sid") String sid); + + //-------------------------流程----------------------------------------- + + @ApiOperation("办理") + @PutMapping("/agreeCreditInfo") + @ResponseBody + ResultBean agreeCreditInfo(@Valid @RequestBody CompleteAdjustApplyDto dto); + + @ApiOperation("驳回") + @PutMapping("/rejectCreditInfo") + @ResponseBody + ResultBean rejectCreditInfo(@Valid @RequestBody AppAdjustApplyTaskQuery query); + + @ApiOperation("撤回") + @PutMapping("/recallCreditInfo") + @ResponseBody + ResultBean recallCreditInfo(@Valid @RequestBody AppAdjustApplyTaskQuery query); + + @ApiOperation("终止") + @PutMapping("/stopCreditInfo") + @ResponseBody + ResultBean stopCreditInfo(@Valid @RequestBody AppAdjustApplyTaskQuery query); + + @ApiOperation("获取流程操作标题") + @GetMapping("/getFlowOperateTitle") + @ResponseBody + ResultBean getFlowOperateTitle(@Valid @SpringQueryMap AdjustApplyFlowableQuery query); + + @ApiOperation(value = "加签") + @PutMapping(value = "/delegate") + @ResponseBody + public ResultBean delegate(@RequestBody AppAdjustApplyDelegateQuery delegateQuery); + + @ApiOperation(value = "转办") + @PutMapping(value = "/assignTask") + @ResponseBody + public ResultBean assignTask(@RequestBody AppAdjustApplyDelegateQuery delegateQuery); +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/financeadjustapply/AdjustApplyFeignFallback.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/financeadjustapply/AdjustApplyFeignFallback.java new file mode 100644 index 0000000000..e2829b701f --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/financeadjustapply/AdjustApplyFeignFallback.java @@ -0,0 +1,57 @@ +package com.yxt.anrui.terminal.api.supplychain.financeadjustapply; + +import com.yxt.anrui.terminal.api.supplychain.financeadjustapply.flow.AppAdjustApplyDelegateQuery; +import com.yxt.anrui.terminal.api.supplychain.financeadjustapply.flow.AppAdjustApplyTaskQuery; +import com.yxt.anrui.terminal.api.supplychain.financeadjustapply.flow.CompleteAdjustApplyDto; +import com.yxt.anrui.terminal.api.supplychain.financeadjustapply.flow.AdjustApplyFlowableQuery; +import com.yxt.common.core.result.ResultBean; +import org.springframework.stereotype.Component; + +/** + * @description: + * @author: fzz + * @date: + **/ +@Component +public class AdjustApplyFeignFallback implements AdjustApplyFeign { + + @Override + public ResultBean fetchDetailsBySid(String sid) { + return null; + } + + @Override + public ResultBean agreeCreditInfo(CompleteAdjustApplyDto dto) { + return null; + } + + @Override + public ResultBean rejectCreditInfo(AppAdjustApplyTaskQuery query) { + return null; + } + + @Override + public ResultBean recallCreditInfo(AppAdjustApplyTaskQuery query) { + return null; + } + + @Override + public ResultBean stopCreditInfo(AppAdjustApplyTaskQuery query) { + return null; + } + + @Override + public ResultBean getFlowOperateTitle(AdjustApplyFlowableQuery query) { + return null; + } + + @Override + public ResultBean delegate(AppAdjustApplyDelegateQuery delegateQuery) { + return null; + } + + @Override + public ResultBean assignTask(AppAdjustApplyDelegateQuery delegateQuery) { + return null; + } +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/financeadjustapply/AdjustApplyRecordVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/financeadjustapply/AdjustApplyRecordVo.java new file mode 100644 index 0000000000..84612c3420 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/financeadjustapply/AdjustApplyRecordVo.java @@ -0,0 +1,72 @@ +package com.yxt.anrui.terminal.api.supplychain.financeadjustapply; + +import com.yxt.anrui.terminal.api.risk.loanhomevisitinvestigate.AppLoanHomeVisitVo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author Administrator + * @description + * @date 2023/11/13 15:45 + */ +@Data +public class AdjustApplyRecordVo { + /** + * 差额 + */ + private String adjustmentMoney; + /** + * 已调整金额 + */ + private String alreadyMoney; + /** + * 品牌 + */ + private String brandName; + /** + * 合同号 + */ + private String contractNo; + /** + * 客户 + */ + private String customerName; + /** + * 订单贴息金额 + */ + private String estimateRebate; + /** + * 本次调整金额 + */ + private String nowAdjustmentMoney; + /** + * 当前差额 + */ + private String nowDiffAmount; + + /** + * 采购系统名称 + */ + private String purchaseSystemName; + /** + * 调整说明 + */ + private String remarks; + /** + * 上传贴息金额 + */ + private String uploadMoney; + /** + * 车型 + */ + private String vehModelName; + /** + * 车架号 + */ + private String vinNo; + + private String salesOrderSid; + + @ApiModelProperty("销售订单页面") + private AppLoanHomeVisitVo orderPage; +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/financeadjustapply/flow/AdjustApplyFlowableQuery.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/financeadjustapply/flow/AdjustApplyFlowableQuery.java new file mode 100644 index 0000000000..9971ade701 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/financeadjustapply/flow/AdjustApplyFlowableQuery.java @@ -0,0 +1,21 @@ +package com.yxt.anrui.terminal.api.supplychain.financeadjustapply.flow; + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; + +@Data +public class AdjustApplyFlowableQuery implements Query { + private static final long serialVersionUID = -5879668616710833830L; + + @ApiModelProperty(value = "节点key") + private String taskDefKey; + @ApiModelProperty(value = "业务sid") + private String businessSid; + @ApiModelProperty(value = "0 上一环节 1下一环节") + @NotNull(message = "参数错误：next") + private Integer next; + +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/financeadjustapply/flow/AppAdjustApplyDelegateQuery.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/financeadjustapply/flow/AppAdjustApplyDelegateQuery.java new file mode 100644 index 0000000000..9b5ba945a6 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/financeadjustapply/flow/AppAdjustApplyDelegateQuery.java @@ -0,0 +1,25 @@ +package com.yxt.anrui.terminal.api.supplychain.financeadjustapply.flow; + +import com.fasterxml.jackson.annotation.JsonProperty; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author Administrator + * @description + * @date 2023/9/28 10:16 + */ +@Data +public class AppAdjustApplyDelegateQuery { + @ApiModelProperty + private String userSid; + @ApiModelProperty("流程实例id") + @JsonProperty("procInsId") + private String instanceId; + @ApiModelProperty("任务Id") + private String taskId; + @ApiModelProperty("审批人sid") + private String assignee; + @ApiModelProperty("填写意见") + private String views; +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/financeadjustapply/flow/AppAdjustApplyTaskQuery.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/financeadjustapply/flow/AppAdjustApplyTaskQuery.java new file mode 100644 index 0000000000..c89f67f8c6 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/financeadjustapply/flow/AppAdjustApplyTaskQuery.java @@ -0,0 +1,46 @@ +package com.yxt.anrui.terminal.api.supplychain.financeadjustapply.flow; + +import com.fasterxml.jackson.annotation.JsonProperty; +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; + +/** + * @author Administrator + * @description + * @date 2023/10/17 9:14 + */ +@Data +public class AppAdjustApplyTaskQuery implements Query { + /** + * 终止、驳回、撤回 + */ + @ApiModelProperty("任务Id") + @NotBlank(message = "参数错误：taskId") + private String taskId; + /** + * 终止、驳回、撤回 + */ + @ApiModelProperty("业务sid") + @NotBlank(message = "参数错误：businessSid") + private String businessSid; + /** + * 终止、驳回 + */ + @ApiModelProperty("任务意见") + private String comment; + /** + * 终止、撤回、驳回 + */ + @ApiModelProperty("用户Sid") + private String userSid; + /** + * 终止 + */ + @ApiModelProperty("流程实例Id") + @JsonProperty("procInsId") + private String instanceId; + +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/financeadjustapply/flow/CompleteAdjustApplyDto.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/financeadjustapply/flow/CompleteAdjustApplyDto.java new file mode 100644 index 0000000000..c2ac4aa89d --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/financeadjustapply/flow/CompleteAdjustApplyDto.java @@ -0,0 +1,35 @@ +package com.yxt.anrui.terminal.api.supplychain.financeadjustapply.flow; + +import com.fasterxml.jackson.annotation.JsonProperty; +import com.yxt.common.core.dto.Dto; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; + +/** + * @author Administrator + * @description + * @date 2023/10/17 9:13 + */ +@Data +public class CompleteAdjustApplyDto implements Dto { + @ApiModelProperty(value = "任务id") + @NotBlank(message = "参数错误：taskId") + private String taskId; + @ApiModelProperty(value = "流程id") + @NotBlank(message = "参数错误：procInsId") + @JsonProperty("procInsId") + private String instanceId; + @ApiModelProperty(value = "意见") + private String comment; + @ApiModelProperty(value = "业务sid") + @NotBlank(message = "参数错误：businessSid") + private String businessSid; + @ApiModelProperty(value = "用户sid") + @NotBlank(message = "参数错误：userSid") + private String userSid; + @ApiModelProperty(value = "节点id") + @NotBlank(message = "参数错误：taskDefKey") + private String taskDefKey; +} diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/base/common/CommonRest.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/base/common/CommonRest.java index 1d8a2c53cc..e625423554 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/base/common/CommonRest.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/base/common/CommonRest.java @@ -10,6 +10,7 @@ import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import java.util.List; +import java.util.Map; /** * @Author dimengzhe @@ -54,6 +55,11 @@ public class CommonRest implements CommonFeign { return commonService.getOrder(saleOrderSid); } + @Override + public ResultBean> getOrderListByOrderSids(List orderSids) { + return commonService.getOrderListByOrderSids(orderSids); + } + @Override public ResultBean getLoanSolution(String orderSid) { return commonService.getLoanSolution(orderSid); diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/base/common/CommonService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/base/common/CommonService.java index c059b842ed..957c577dc1 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/base/common/CommonService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/base/common/CommonService.java @@ -118,6 +118,36 @@ public class CommonService { return rb.success().setData(carModelVo); } + public ResultBean> getOrderListByOrderSids(List orderSids) { + ResultBean> rb = ResultBean.fireFail(); + String appSid = "e25e13b5-f2ed-421f-bdb3-6f2eca2a3028"; + String moduleAction = "com.anrui.android.plugin.autoservice.activity.DetailSaleOrderActivity"; + ResultBean voResultBean = appSubsetVersionFeign.getLastRiskByAppSid(appSid, moduleAction); + AppSubVersionVo appSubVersionVo = voResultBean.getData(); + Map modelMap = new HashMap<>(); + for (String saleOrderSid : orderSids) { + CarModelVo carModelVo = new CarModelVo(); + Map map = new HashMap<>(); + map.put("saleOrderSid", saleOrderSid); + appSubVersionVo.setJson(JSONObject.toJSONString(map)); + BeanUtil.copyProperties(appSubVersionVo, carModelVo); + carModelVo.setRequestCode("1002"); +// carModelVo.setPluginName("autoservice"); + carModelVo.setARouterClass("com.anrui.android.plugin.autoservice.manager.ARouterManager"); + carModelVo.setARouterMethod("DETAIL_SALE_ORDER"); + List aRouterParamType = new ArrayList<>(); + aRouterParamType.add("STRING"); + List aRouterParamValue = new ArrayList<>(); + aRouterParamValue.add(saleOrderSid); + carModelVo.setARouterParamType(aRouterParamType); + carModelVo.setARouterParamValue(aRouterParamValue); + carModelVo.setBtnName("销售订单"); + modelMap.put(saleOrderSid,carModelVo); + } + return rb.success().setData(modelMap); + } + + public ResultBean getLoanSolution(String orderSid) { ResultBean rb = ResultBean.fireFail(); String appSid = "e25e13b5-f2ed-421f-bdb3-6f2eca2a3028"; @@ -301,4 +331,6 @@ public class CommonService { carModelVo.setARouterParamValue(aRouterParamValue); return rb.success().setData(carModelVo); } + + } diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/financeadjustapply/AdjustApplyRest.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/financeadjustapply/AdjustApplyRest.java new file mode 100644 index 0000000000..10a2917002 --- /dev/null +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/financeadjustapply/AdjustApplyRest.java @@ -0,0 +1,67 @@ +package com.yxt.anrui.terminal.biz.supplychain.financeadjustapply; + + +import com.yxt.anrui.terminal.api.supplychain.financeadjustapply.AdjustApplyDetailsVo; +import com.yxt.anrui.terminal.api.supplychain.financeadjustapply.AdjustApplyFeign; +import com.yxt.anrui.terminal.api.supplychain.financeadjustapply.flow.AdjustApplyFlowableQuery; +import com.yxt.anrui.terminal.api.supplychain.financeadjustapply.flow.AppAdjustApplyDelegateQuery; +import com.yxt.anrui.terminal.api.supplychain.financeadjustapply.flow.AppAdjustApplyTaskQuery; +import com.yxt.anrui.terminal.api.supplychain.financeadjustapply.flow.CompleteAdjustApplyDto; +import com.yxt.common.core.result.ResultBean; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; + +/** + * @description: + * @author: fzz + * @date: + **/ +@Controller +@RequestMapping("/v1/financeadjustapply") +public class AdjustApplyRest implements AdjustApplyFeign { + + @Autowired + private AdjustApplyService adjustApplyService; + + + @Override + public ResultBean fetchDetailsBySid(String sid) { + return adjustApplyService.detail(sid); + } + + @Override + public ResultBean agreeCreditInfo(CompleteAdjustApplyDto dto) { + return adjustApplyService.agreeCreditInfo(dto); + } + + @Override + public ResultBean rejectCreditInfo(AppAdjustApplyTaskQuery query) { + return adjustApplyService.rejectCreditInfo(query); + } + + @Override + public ResultBean recallCreditInfo(AppAdjustApplyTaskQuery query) { + return adjustApplyService.recallCreditInfo(query); + } + + @Override + public ResultBean stopCreditInfo(AppAdjustApplyTaskQuery query) { + return adjustApplyService.stopCreditInfo(query); + } + + @Override + public ResultBean getFlowOperateTitle(AdjustApplyFlowableQuery query) { + return adjustApplyService.getFlowOperateTitle(query); + } + + @Override + public ResultBean delegate(AppAdjustApplyDelegateQuery delegateQuery) { + return adjustApplyService.delegate(delegateQuery); + } + + @Override + public ResultBean assignTask(AppAdjustApplyDelegateQuery delegateQuery) { + return adjustApplyService.assignTask(delegateQuery); + } +} diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/financeadjustapply/AdjustApplyService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/financeadjustapply/AdjustApplyService.java new file mode 100644 index 0000000000..3fd77e5618 --- /dev/null +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/financeadjustapply/AdjustApplyService.java @@ -0,0 +1,178 @@ +package com.yxt.anrui.terminal.biz.supplychain.financeadjustapply; + + +import cn.hutool.core.bean.BeanUtil; +import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg; +import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; +import com.yxt.anrui.portal.api.sysuser.SysUserFeign; +import com.yxt.anrui.portal.api.sysuser.SysUserVo; +import com.yxt.anrui.scm.api.scmfinanceadjustapply.ScmFinanceAdjustApplyFeign; +import com.yxt.anrui.scm.api.scmfinanceadjustapply.app.AppDetailsVo; +import com.yxt.anrui.scm.api.scmfinanceadjustapply.flow.*; +import com.yxt.anrui.terminal.api.base.common.CarModelVo; +import com.yxt.anrui.terminal.api.risk.loanhomevisitinvestigate.AppLoanHomeVisitVo; +import com.yxt.anrui.terminal.api.supplychain.financeadjustapply.AdjustApplyDetailsVo; +import com.yxt.anrui.terminal.api.supplychain.financeadjustapply.AdjustApplyRecordVo; +import com.yxt.anrui.terminal.api.supplychain.financeadjustapply.flow.AdjustApplyFlowableQuery; +import com.yxt.anrui.terminal.api.supplychain.financeadjustapply.flow.AppAdjustApplyDelegateQuery; +import com.yxt.anrui.terminal.api.supplychain.financeadjustapply.flow.AppAdjustApplyTaskQuery; +import com.yxt.anrui.terminal.api.supplychain.financeadjustapply.flow.CompleteAdjustApplyDto; +import com.yxt.anrui.terminal.biz.base.common.CommonService; +import com.yxt.common.core.result.ResultBean; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.Collections; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +/** + * @description: + * @author: fzz + * @date: + **/ +@Service +public class AdjustApplyService { + + @Autowired + private SysUserFeign sysUserFeign; + @Autowired + private SysStaffOrgFeign sysStaffOrgFeign; + @Autowired + private ScmFinanceAdjustApplyFeign scmFinanceAdjustApplyFeign; + @Autowired + private CommonService commonService; + public ResultBean detail(String sid) { + ResultBean rb = ResultBean.fireFail(); + AdjustApplyDetailsVo vo = new AdjustApplyDetailsVo(); + AppDetailsVo data = scmFinanceAdjustApplyFeign.getAppDetails(sid).getData(); + if (null != data) { + BeanUtil.copyProperties(data, vo); + List list = vo.getList(); + if (!list.isEmpty() && list.size() > 0) { + List orderSids = list.stream().map(AdjustApplyRecordVo::getSalesOrderSid).collect(Collectors.toList()); + Map voMap = commonService.getOrderListByOrderSids(orderSids).getData(); + if (!voMap.isEmpty()) { + for (AdjustApplyRecordVo recordVo : list) { + CarModelVo carModelVo = voMap.get(recordVo.getSalesOrderSid()); + AppLoanHomeVisitVo appOrderVo = new AppLoanHomeVisitVo(); + BeanUtil.copyProperties(carModelVo,appOrderVo); + recordVo.setOrderPage(appOrderVo); + } + } + } + } + return rb.success().setData(vo); + } + + + public ResultBean agreeCreditInfo(CompleteAdjustApplyDto dto) { + ResultBean rb = ResultBean.fireFail(); + //根据用户sid获取staffSid + ResultBean userVoResultBean = sysUserFeign.fetchBySid(dto.getUserSid()); + if (!userVoResultBean.getSuccess()) { + return rb.setMsg(userVoResultBean.getMsg()); + } + //根据staffSid获取用户的组织全路径 + ResultBean staffOrgResultBean = sysStaffOrgFeign.getOrgByStaffSid(userVoResultBean.getData().getStaffSid()); + if (!staffOrgResultBean.getSuccess()) { + return rb.setMsg(staffOrgResultBean.getMsg()); + } + //用户的组织全路径 + String orgSidPath = staffOrgResultBean.getData().getOrgSidPath(); + AdjustCompleteDto completeDto = new + AdjustCompleteDto(); + BeanUtil.copyProperties(dto, completeDto); + completeDto.setOrgSidPath(orgSidPath); + ResultBean resultBean = scmFinanceAdjustApplyFeign.complete(completeDto); + if (!resultBean.getSuccess()) { + return rb.setMsg(resultBean.getMsg()); + } + return rb.success().setData(resultBean.getData()); + } + + public ResultBean rejectCreditInfo(AppAdjustApplyTaskQuery query) { + ResultBean rb = ResultBean.fireFail(); + AdjustTaskQuery taskQuery = new + AdjustTaskQuery(); + BeanUtil.copyProperties(query, taskQuery); + ResultBean resultBean = scmFinanceAdjustApplyFeign.taskReject(taskQuery); + if (!resultBean.getSuccess()) { + return rb.setMsg(resultBean.getMsg()); + } + return rb.success().setData(resultBean.getData()); + } + + public ResultBean recallCreditInfo(AppAdjustApplyTaskQuery query) { + ResultBean rb = ResultBean.fireFail(); + AdjustTaskQuery taskQuery = new + AdjustTaskQuery(); + BeanUtil.copyProperties(query, taskQuery); + ResultBean resultBean = scmFinanceAdjustApplyFeign.revokeProcess(taskQuery); + if (!resultBean.getSuccess()) { + return rb.setMsg(resultBean.getMsg()); + } + return rb.success().setData(resultBean.getData()); + } + + public ResultBean stopCreditInfo(AppAdjustApplyTaskQuery query) { + ResultBean rb = ResultBean.fireFail(); + AdjustTaskQuery taskQuery = new + AdjustTaskQuery(); + BeanUtil.copyProperties(query, taskQuery); + ResultBean resultBean = scmFinanceAdjustApplyFeign.breakProcess(taskQuery); + if (!resultBean.getSuccess()) { + return rb.setMsg(resultBean.getMsg()); + } + return rb.success().setData(resultBean.getData()); + } + + public ResultBean getFlowOperateTitle(AdjustApplyFlowableQuery query) { + ResultBean rb = ResultBean.fireFail(); + //0 上一环节 1下一环节 + int next = query.getNext(); + AdjustGetNodeQuery getNodeQuery = new + AdjustGetNodeQuery(); + BeanUtil.copyProperties(query, getNodeQuery); + String data = ""; + if (next == 0) { + ResultBean> getPreviousNodesForReject = scmFinanceAdjustApplyFeign.getPreviousNodesForReject(getNodeQuery); + if (getPreviousNodesForReject.getSuccess()) { + getPreviousNodesForReject.getData().removeAll(Collections.singleton(null)); + data = getPreviousNodesForReject.getData().get(0).getName(); + } else { + return rb.setMsg(getPreviousNodesForReject.getMsg()); + } + } else if (next == 1) { + ResultBean> getNextNodesForSubmit = scmFinanceAdjustApplyFeign.getNextNodesForSubmit(getNodeQuery); + if (getNextNodesForSubmit.getSuccess()) { + getNextNodesForSubmit.getData().removeAll(Collections.singleton(null)); + data = getNextNodesForSubmit.getData().get(0).getName(); + } else { + return rb.setMsg(getNextNodesForSubmit.getMsg()); + } + } else { + return rb.setMsg("参数错误：next"); + } + return rb.success().setData(data); + } + + public ResultBean delegate(AppAdjustApplyDelegateQuery delegateQuery) { + ResultBean rb = ResultBean.fireFail(); + AdjustDelegateQuery delegateQuery1 = new + AdjustDelegateQuery(); + BeanUtil.copyProperties(delegateQuery, delegateQuery1); + ResultBean delegate = scmFinanceAdjustApplyFeign.delegate(delegateQuery1); + return rb.success(); + } + + public ResultBean assignTask(AppAdjustApplyDelegateQuery delegateQuery) { + ResultBean rb = ResultBean.fireFail(); + AdjustDelegateQuery delegateQuery1 = new + AdjustDelegateQuery(); + BeanUtil.copyProperties(delegateQuery, delegateQuery1); + ResultBean delegate = scmFinanceAdjustApplyFeign.assignTask(delegateQuery1); + return rb.success(); + } +} From f9ba0976b557fd0d80e3dcdb299554ab26fa969f Mon Sep 17 00:00:00 2001 From: fanzongzhe0036 Date: Mon, 13 Jan 2025 17:34:31 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E7=AB=AF=E9=87=91?= =?UTF-8?q?=E8=9E=8D=E8=B0=83=E5=B7=AE=E7=94=B3=E8=AF=B7=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/AppDetailsVo.java | 24 +++++++++++++++++-- .../ScmFinanceAdjustApplyService.java | 8 +++++-- .../AdjustApplyDetailsVo.java | 24 +++++++++++++++++-- 3 files changed, 50 insertions(+), 6 deletions(-) diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmfinanceadjustapply/app/AppDetailsVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmfinanceadjustapply/app/AppDetailsVo.java index 65f5a3a5f2..d8fe46c4aa 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmfinanceadjustapply/app/AppDetailsVo.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmfinanceadjustapply/app/AppDetailsVo.java @@ -51,8 +51,28 @@ public class AppDetailsVo { private String staffName; private String taskId; /** - * 合计，订单贴息金额：100，上传贴息金额：200，差额：100，已调整金额：50，当前差额：2，本次调整金额：20 + * 差额 */ - private String total; + private String adjustmentMoneyTotal; + /** + * 已调整金额 + */ + private String alreadyMoneyTotal; + /** + * 订单贴息金额 + */ + private String estimateRebateTotal; + /** + * 本次调整金额 + */ + private String nowAdjustmentMoneyTotal; + /** + * 当前差额 + */ + private String nowDiffAmountTotal; + /** + * 上传贴息金额 + */ + private String uploadMoneyTotal; } diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmfinanceadjustapply/ScmFinanceAdjustApplyService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmfinanceadjustapply/ScmFinanceAdjustApplyService.java index a52bea06ab..2953378ec2 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmfinanceadjustapply/ScmFinanceAdjustApplyService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmfinanceadjustapply/ScmFinanceAdjustApplyService.java @@ -1143,7 +1143,6 @@ public class ScmFinanceAdjustApplyService extends MybatisBaseService 0) { List files = new ArrayList<>(); for (ScmFileVo scmFileVo : scmFileVos) { - QueryUrl url = new QueryUrl(); String filePath = scmFileVo.getFilePath(); String urlPrefix = fileUploadComponent.getUrlPrefix(); filePath = urlPrefix + filePath; @@ -1179,7 +1178,12 @@ public class ScmFinanceAdjustApplyService extends MybatisBaseService