From a90371fc87ce040df6ae8890472ab927226ce44e Mon Sep 17 00:00:00 2001 From: fanzongzhe <285169773@qq.com> Date: Wed, 17 Jul 2024 17:34:07 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BB=B4=E4=BF=AE?= =?UTF-8?q?=E5=B7=A5=E5=8D=95=E4=BF=9D=E5=AD=98=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/asbusrepairbill/AsBusrepairBill.java | 3 +- .../AsBusrepairBillDetailsVo.java | 5 ++- .../asbusrepairbill/AsBusrepairBillDto.java | 5 ++- .../AsBusrepairBillService.java | 32 +++++++++++++++++++ .../yxt/anrui/as/feign/file/AsFileEnum.java | 1 + 5 files changed, 43 insertions(+), 3 deletions(-) diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBusrepairBill.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBusrepairBill.java index 8e41c11bd3..151f150f96 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBusrepairBill.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBusrepairBill.java @@ -125,5 +125,6 @@ public class AsBusrepairBill extends BaseEntity { private String rescueRemarks; @ApiModelProperty("外出费备注") private String outRemarks; - + @ApiModelProperty("商品登记备注") + private String registerRemarks; } diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBusrepairBillDetailsVo.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBusrepairBillDetailsVo.java index 5291fa80fd..54c3b6fea5 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBusrepairBillDetailsVo.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBusrepairBillDetailsVo.java @@ -1,5 +1,6 @@ package com.yxt.anrui.as.api.asbusrepairbill; +import com.yxt.anrui.as.api.utils.FileUrlQuery; import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -157,5 +158,7 @@ public class AsBusrepairBillDetailsVo implements Vo { private String outRemarks; @ApiModelProperty("施救费") private String rescueAmount; - private String fileName; //文件名称 + private List fileName = new ArrayList<>(); //文件名称 + @ApiModelProperty("商品登记备注") + private String registerRemarks; } diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBusrepairBillDto.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBusrepairBillDto.java index 98353a399e..f71fe31f69 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBusrepairBillDto.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBusrepairBillDto.java @@ -1,5 +1,6 @@ package com.yxt.anrui.as.api.asbusrepairbill; +import com.yxt.anrui.as.api.utils.FileUrlQuery; import com.yxt.common.core.dto.Dto; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -141,5 +142,7 @@ public class AsBusrepairBillDto implements Dto { private String outRemarks; @ApiModelProperty("施救费") private String rescueAmount; - private String fileName; //文件名称 + private List fileName = new ArrayList<>(); //文件名称 + @ApiModelProperty("商品登记备注") + private String registerRemarks; } diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillService.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillService.java index 077937ddf4..aac30e1be3 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillService.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillService.java @@ -5,6 +5,7 @@ import cn.hutool.core.date.DateTime; import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.yxt.anrui.as.api.asappendix.AsAppendix; import com.yxt.anrui.as.api.asbusrepairbill.*; import com.yxt.anrui.as.api.asbusrepairbillaitem.AsBusrepairBillAitem; import com.yxt.anrui.as.api.asbusrepairbillinsurance.AsBusrepairBillInsurance; @@ -20,7 +21,9 @@ import com.yxt.anrui.as.api.asbusrepairinventorybilldetail.SitemsVo; import com.yxt.anrui.as.api.astrackbill.AsTrackBillDto; import com.yxt.anrui.as.api.enums.AsBillTypeEnum; import com.yxt.anrui.as.api.utils.AsRule; +import com.yxt.anrui.as.api.utils.FileUrlQuery; import com.yxt.anrui.as.api.utils.domain.AsBillNo; +import com.yxt.anrui.as.biz.asappendix.AsAppendixService; import com.yxt.anrui.as.biz.asbusclaimbill.AsBusclaimBillService; import com.yxt.anrui.as.biz.asbusrepairbillaitem.AsBusrepairBillAitemService; import com.yxt.anrui.as.biz.asbusrepairbillinsurance.AsBusrepairBillInsuranceService; @@ -32,6 +35,7 @@ import com.yxt.anrui.as.biz.asbusrepairbillsitemrepairer.AsBusrepairBillSitemRep import com.yxt.anrui.as.biz.asbusrepairbillvech.AsBusrepairBillVechService; import com.yxt.anrui.as.biz.asbusrepairinventorybilldetail.AsBusrepairInventorybillDetailService; import com.yxt.anrui.as.biz.astrackbill.AsTrackBillService; +import com.yxt.anrui.as.feign.file.AsFileEnum; import com.yxt.anrui.as.feign.fin.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedDto; import com.yxt.anrui.as.feign.fin.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedFeign; import com.yxt.anrui.as.feign.fms.FmsReceivesettle; @@ -71,6 +75,8 @@ import java.util.*; @Service public class AsBusrepairBillService extends MybatisBaseService { + @Autowired + private AsAppendixService asAppendixService; @Autowired private SysUserFeign sysUserFeign; @Autowired @@ -204,6 +210,7 @@ public class AsBusrepairBillService extends MybatisBaseService fileList = dto.getFileName(); + if (!fileList.isEmpty()) { + for (FileUrlQuery query : fileList) { + String filePath = query.getUrl().replace(fileUploadComponent.getUrlPrefix(), ""); + AsAppendix asAppendix = new AsAppendix(); + asAppendix.setLinkSid(sid); + asAppendix.setAttachType(AsFileEnum.WXGD.getAttachType()); + asAppendix.setFilePath(filePath); + asAppendixService.save(asAppendix); + } + } + + } return rb.success().setData(sid); } @@ -505,6 +526,17 @@ public class AsBusrepairBillService extends MybatisBaseService file = new ArrayList<>(); + List asAppendices = asAppendixService.fetchByLinkSid(sid); + if (!asAppendices.isEmpty()) { + for (AsAppendix asAppendix : asAppendices) { + FileUrlQuery fileUrlQuery = new FileUrlQuery(); + String url = fileUploadComponent.getUrlPrefix() + asAppendix.getFilePath(); + fileUrlQuery.setUrl(url); + file.add(fileUrlQuery); + } + } + vo.setFileName(file); } return rb.success().setData(vo); } diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/feign/file/AsFileEnum.java b/yxt-as/src/main/java/com/yxt/anrui/as/feign/file/AsFileEnum.java index cd46831931..a4a5cca141 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/feign/file/AsFileEnum.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/feign/file/AsFileEnum.java @@ -11,6 +11,7 @@ public enum AsFileEnum { ASBWDIFFAPPLY("002", "保外工单应收调差附件"), ASBWDIFFAPPLYDETAIL("003", "保外工单应收调差工单附件"), ASWXXMBA("004", "维修项目备案附件"), + WXGD("005", "维修工单附件") ; From f9606dde980d58077ee4a35568eb08ca28650e8f Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Wed, 17 Jul 2024 17:40:24 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E5=AE=A2?= =?UTF-8?q?=E6=88=B7=E4=BF=A1=E6=81=AF=E7=BB=B4=E6=8A=A4=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=BC=80=E5=8F=91=E5=AE=8C=E6=88=90=20?= =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E4=BF=9D=E5=AD=98/=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E6=BD=9C=E5=9C=A8=E5=AE=A2=E6=88=B7=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=BC=80=E5=8F=91=E5=AE=8C=E6=88=90=20?= =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E8=B0=83=E8=AF=95=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bussalesorder/BusSalesOrderService.java | 5 +- .../crmcustomertemp/CrmCustomerTempFeign.java | 9 +++ .../CrmCustomerTempFeignFallback.java | 10 +++ .../crmcustomertemp/CrmCustomerTempRest.java | 11 +++ .../CrmCustomerTempService.java | 76 ++++++++++++++++++- .../BaseSupplierTypeService.java | 4 +- 6 files changed, 110 insertions(+), 5 deletions(-) diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java index e27b50ee7b..73b7249503 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java @@ -166,6 +166,7 @@ import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgVo; import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery; +import com.yxt.anrui.portal.api.sysuser.SysUser; import com.yxt.anrui.portal.api.sysuser.SysUserFeign; import com.yxt.anrui.portal.api.sysuser.SysUserVo; import com.yxt.anrui.portal.api.sysuser.app.AppUserOrgInfoVo; @@ -2161,8 +2162,8 @@ public class BusSalesOrderService extends MybatisBaseService qw = new QueryWrapper<>(); if (query != null) { if (StringUtils.isNotBlank(query.getUserSid())) { - SysUserVo sysUserVo = sysUserFeign.fetchBySid(query.getUserSid()).getData(); - CrmCustomerTempVo crmCustomerTempVo = crmCustomerTempFeign.selByMobile(sysUserVo.getMobile()).getData(); + SysUser sysUser = sysUserFeign.fetchBySidWx(query.getUserSid()).getData(); + CrmCustomerTempVo crmCustomerTempVo = crmCustomerTempFeign.selByMobile(sysUser.getMobile()).getData(); qw.eq("bo.customerSid", crmCustomerTempVo.getSid()); } qw.eq("bo.nodeState", "已办结"); diff --git a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempFeign.java b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempFeign.java index 8e73a14f7c..f463957475 100644 --- a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempFeign.java +++ b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempFeign.java @@ -160,6 +160,10 @@ public interface CrmCustomerTempFeign { @PostMapping("/saveOrUpdateAppCustomerTemp") public ResultBean saveOrUpdateAppCustomerTemp(@Valid @RequestBody AppCrmCustomerTempDto dto); + @ApiOperation("小程序保存/修改潜在客户信息") + @PostMapping("/saveOrUpdateAppCustomerTempWx") + public ResultBean saveOrUpdateAppCustomerTempWx(@Valid @RequestBody AppCrmCustomerTempDto dto); + @ApiOperation("手机端维护客户信息是否完善的状态") @ResponseBody @GetMapping("/getAppCrmCustomerTempMaintainState") @@ -182,6 +186,11 @@ public interface CrmCustomerTempFeign { @GetMapping("/customerTempDetailsBySid/{sid}") public ResultBean customerTempDetailsBySid(@PathVariable("sid") String sid); + @ApiOperation("小程序客户信息维护详情") + @ResponseBody + @GetMapping("/customerTempDetailsBySidWx/{sid}") + public ResultBean customerTempDetailsBySidWx(@PathVariable("sid") String sid); + @ApiOperation("初始化客户详情") @ResponseBody @GetMapping("/getAppCustomerTempDetails") diff --git a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempFeignFallback.java b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempFeignFallback.java index cc566b8b65..f35643b6ed 100644 --- a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempFeignFallback.java +++ b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempFeignFallback.java @@ -110,6 +110,11 @@ public class CrmCustomerTempFeignFallback implements CrmCustomerTempFeign { return rb.setMsg("接口anrui-crm/crmcustomertemp/saveOrUpdateAppCustomerTemp无法访问"); } + @Override + public ResultBean saveOrUpdateAppCustomerTempWx(AppCrmCustomerTempDto dto) { + return null; + } + @Override public ResultBean getAppCrmCustomerTempMaintainState(String sid, String userSid) { return null; @@ -140,6 +145,11 @@ public class CrmCustomerTempFeignFallback implements CrmCustomerTempFeign { return null; } + @Override + public ResultBean customerTempDetailsBySidWx(String sid) { + return null; + } + @Override public ResultBean initCustomerArchives(String customerSid, String userSid) { return null; diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempRest.java b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempRest.java index 03ea733774..45df5fb6f8 100644 --- a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempRest.java +++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempRest.java @@ -217,6 +217,11 @@ public class CrmCustomerTempRest implements CrmCustomerTempFeign { return crmCustomerTempService.saveOrUpdateAppCustomerTemp(dto); } + @Override + public ResultBean saveOrUpdateAppCustomerTempWx(AppCrmCustomerTempDto dto) { + return crmCustomerTempService.saveOrUpdateAppCustomerTempWx(dto); + } + /** * 手机端维护客户信息是否完善的状态 * @@ -301,6 +306,12 @@ public class CrmCustomerTempRest implements CrmCustomerTempFeign { return new ResultBean().success().setData(vo); } + @Override + public ResultBean customerTempDetailsBySidWx(String sid) { + AppCrmCustomerTempBasicsDetailsVo vo = crmCustomerTempService.customerTempDetailsBySidWx(sid); + return new ResultBean().success().setData(vo); + } + /** * 初始化客户档案信息 * diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java index 9953b4abae..e6088f935a 100644 --- a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java +++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java @@ -127,6 +127,7 @@ public class CrmCustomerTempService extends MybatisBaseService listPage(PagerQuery pq) { CrmCustomerTempQuery query = pq.getParams(); QueryWrapper qw = createQueryWrapper(query); @@ -372,6 +373,53 @@ public class CrmCustomerTempService extends MybatisBaseService crmFileDetailsVos = crmFileService.fetchByLinkSid(sid); + List list = new ArrayList<>(); + if (crmFileDetailsVos != null) { + for (CrmFileDetailsVo crmFileDetailsVo : crmFileDetailsVos) { + String filePath = crmFileDetailsVo.getFilePath(); + list.add(fileUploadComponent.getUrlPrefix() + filePath); + } + } + vo.setCrmVisitFileList(list); + return vo; + } + public CrmCustomerTempVo selByMobile(String mobile) { return baseMapper.selByMobile(mobile); } diff --git a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basesuppliertype/BaseSupplierTypeService.java b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basesuppliertype/BaseSupplierTypeService.java index d406771510..4c1f1b154f 100644 --- a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basesuppliertype/BaseSupplierTypeService.java +++ b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basesuppliertype/BaseSupplierTypeService.java @@ -107,14 +107,14 @@ public class BaseSupplierTypeService extends MybatisBaseService 0){ - return rb.setMsg("新增编码已存在，请重新输入"); + return rb.setMsg("类型编码已存在，请重新输入"); } this.insertByDto(dto); return rb.success(); } int i = baseMapper.checkUpdateCode(dto.getSupplierTypeCode(),dto.getUseOrgSid(),dtoSid); if (i > 0){ - return rb.setMsg("修改编码已存在，请重新输入"); + return rb.setMsg("类型编码已存在，请重新输入"); } this.updateByDto(dto); return rb.success(); From 63feaba9057826cea0d00ed9876caf8cf97f8bb4 Mon Sep 17 00:00:00 2001 From: fanzongzhe <285169773@qq.com> Date: Wed, 17 Jul 2024 17:55:18 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BB=B4=E4=BF=AE?= =?UTF-8?q?=E5=B7=A5=E5=8D=95=E4=BF=9D=E5=AD=98=E6=8E=A5=E5=8F=A3=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E5=9B=BE=E7=89=87=E4=B8=8A=E4=BC=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/yxt/anrui/as/api/utils/FileUrlQuery.java | 2 ++ .../anrui/as/biz/asbusrepairbill/AsBusrepairBillService.java | 5 ++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/utils/FileUrlQuery.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/utils/FileUrlQuery.java index a89e6dac3e..a46b63c9db 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/utils/FileUrlQuery.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/utils/FileUrlQuery.java @@ -12,5 +12,7 @@ import lombok.Data; public class FileUrlQuery { @ApiModelProperty("附件路径") private String url; // 附件路径 + @ApiModelProperty("附件名称") + private String name; // 附件路径 } diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillService.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillService.java index aac30e1be3..1bc0eee336 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillService.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillService.java @@ -533,6 +533,9 @@ public class AsBusrepairBillService extends MybatisBaseService pagging = baseMapper.pageBillList(page, qw); for (AsBusrepairPageVo record : pagging.getRecords()) { String photoss = record.getPhotoss(); - if (StringUtils.isNotBlank(photoss)){ + if (StringUtils.isNotBlank(photoss)) { String[] files = photoss.split(","); List photos = new ArrayList<>(); for (String file : files) { From 86c652004594891368cf083ddc00adfd2d94a1d7 Mon Sep 17 00:00:00 2001 From: fanzongzhe <285169773@qq.com> Date: Thu, 18 Jul 2024 08:49:27 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=B4=B7=E5=90=8E?= =?UTF-8?q?=E5=88=86=E9=85=8D=E8=B5=84=E9=87=91=E5=8D=A0=E7=94=A8=E8=B4=B9?= =?UTF-8?q?=EF=BC=8C=E8=B5=84=E6=96=B9=E9=80=BE=E6=9C=9F=E5=88=A9=E6=81=AF?= =?UTF-8?q?=E9=80=BB=E8=BE=91=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LoanRepaymentScheduleService.java | 106 ++++++++++++------ 1 file changed, 73 insertions(+), 33 deletions(-) diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleService.java index cfb2cb4d0f..4b3d6598d6 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleService.java @@ -6026,13 +6026,18 @@ public class LoanRepaymentScheduleService extends MybatisBaseService= 0 ? m1i : T1; BigDecimal L1 = BigDecimal.ZERO; - if (D1.compareTo(T) >= 0) { - L1 = L; + if (T1.subtract(D1).compareTo(BigDecimal.ZERO) == 0) { + L1 = TempL; } else { - BigDecimal bigDecimal = D1.divide(T, 2, BigDecimal.ROUND_HALF_UP); - L1 = L.multiply(bigDecimal); + if (D1.compareTo(T) >= 0) { + L1 = L; + } else { + BigDecimal bigDecimal = D1.divide(T, 2, BigDecimal.ROUND_HALF_UP); + L1 = L.multiply(bigDecimal); + } } T1 = T1.subtract(D1); + TempL = TempL.subtract(L1); p.setPaymentInterest(L1); p.setOverdue(0); p.setPaymentMoney(D1); @@ -6054,12 +6059,17 @@ public class LoanRepaymentScheduleService extends MybatisBaseService= 0 ? m1i : Q1; BigDecimal B1 = BigDecimal.ZERO; - if (temp.compareTo(Q) >= 0) { - B1 = B; + if (Q1.subtract(temp).compareTo(BigDecimal.ZERO) == 0) { + B1 = TempB; } else { - BigDecimal bigDecimal = temp.divide(Q, 2, BigDecimal.ROUND_HALF_UP); - B1 = B.multiply(bigDecimal); + if (temp.compareTo(Q) >= 0) { + B1 = B; + } else { + BigDecimal bigDecimal = temp.divide(Q, 2, BigDecimal.ROUND_HALF_UP); + B1 = B.multiply(bigDecimal); + } } + TempB = TempB.subtract(B1); if (Q1.compareTo(m1i) < 0) { //生成 i 期还款记录，月还金额 m1i - Q1 LoanRepaymentHistory history = new LoanRepaymentHistory(); @@ -6134,12 +6144,17 @@ public class LoanRepaymentScheduleService extends MybatisBaseService= 0 ? m2i : T1; BigDecimal L1 = BigDecimal.ZERO; - if (D1.compareTo(T) >= 0) { - L1 = L; + if (T1.subtract(D1).compareTo(BigDecimal.ZERO) == 0) { + L1 = TempL; } else { - BigDecimal bigDecimal = D1.divide(T, 2, BigDecimal.ROUND_HALF_UP); - L1 = L.multiply(bigDecimal); + if (D1.compareTo(T) >= 0) { + L1 = L; + } else { + BigDecimal bigDecimal = D1.divide(T, 2, BigDecimal.ROUND_HALF_UP); + L1 = L.multiply(bigDecimal); + } } + TempL = TempL.subtract(L1); T1 = T1.subtract(D1); p.setPaymentInterest(L1); p.setOverdue(0); @@ -6162,12 +6177,17 @@ public class LoanRepaymentScheduleService extends MybatisBaseService= 0 ? m2i : Q1; BigDecimal B1 = BigDecimal.ZERO; - if (temp.compareTo(Q) >= 0) { - B1 = B; + if (Q1.subtract(temp).compareTo(BigDecimal.ZERO) == 0) { + B1 = TempB; } else { - BigDecimal bigDecimal = temp.divide(Q, 2, BigDecimal.ROUND_HALF_UP); - B1 = B.multiply(bigDecimal); + if (temp.compareTo(Q) >= 0) { + B1 = B; + } else { + BigDecimal bigDecimal = temp.divide(Q, 2, BigDecimal.ROUND_HALF_UP); + B1 = B.multiply(bigDecimal); + } } + TempB = TempB.subtract(B1); if (Q1.compareTo(m2i) < 0) { //生成 i 期还款记录，月还金额 m1i - Q1 LoanRepaymentHistory history = new LoanRepaymentHistory(); @@ -6355,12 +6375,17 @@ public class LoanRepaymentScheduleService extends MybatisBaseService= 0 ? m1i : T1; BigDecimal L1 = BigDecimal.ZERO; - if (D1.compareTo(T) >= 0) { - L1 = L; + if (T1.subtract(D1).compareTo(BigDecimal.ZERO) == 0) { + L1 = TempL; } else { - BigDecimal bigDecimal = D1.divide(T, 2, BigDecimal.ROUND_HALF_UP); - L1 = L.multiply(bigDecimal); + if (D1.compareTo(T) >= 0) { + L1 = L; + } else { + BigDecimal bigDecimal = D1.divide(T, 2, BigDecimal.ROUND_HALF_UP); + L1 = L.multiply(bigDecimal); + } } + TempL = TempL.subtract(L1); T1 = T1.subtract(D1); p.setPaymentInterest(L1); p.setOverdue(0); @@ -6383,12 +6408,17 @@ public class LoanRepaymentScheduleService extends MybatisBaseService= 0 ? m1i : Q1; BigDecimal B1 = BigDecimal.ZERO; - if (temp.compareTo(Q) >= 0) { - B1 = B; + if (Q1.subtract(temp).compareTo(BigDecimal.ZERO) == 0) { + B1 = TempB; } else { - BigDecimal bigDecimal = temp.divide(Q, 2, BigDecimal.ROUND_HALF_UP); - B1 = B.multiply(bigDecimal); + if (temp.compareTo(Q) >= 0) { + B1 = B; + } else { + BigDecimal bigDecimal = temp.divide(Q, 2, BigDecimal.ROUND_HALF_UP); + B1 = B.multiply(bigDecimal); + } } + TempB = TempB.subtract(B1); if (Q1.compareTo(m1i) < 0) { //生成 i 期还款记录，月还金额 m1i - Q1 LoanRepaymentHistory history = new LoanRepaymentHistory(); @@ -6463,12 +6493,17 @@ public class LoanRepaymentScheduleService extends MybatisBaseService= 0 ? m2i : T1; BigDecimal L1 = BigDecimal.ZERO; - if (D1.compareTo(T) >= 0) { - L1 = L; - } else { - BigDecimal bigDecimal = D1.divide(T, 2, BigDecimal.ROUND_HALF_UP); - L1 = L.multiply(bigDecimal); + if (T1.subtract(D1).compareTo(BigDecimal.ZERO) == 0) { + L1 = TempL; + } else { + if (D1.compareTo(T) >= 0) { + L1 = L; + } else { + BigDecimal bigDecimal = D1.divide(T, 2, BigDecimal.ROUND_HALF_UP); + L1 = L.multiply(bigDecimal); + } } + TempL = TempL.subtract(L1); T1 = T1.subtract(D1); p.setPaymentInterest(L1); p.setOverdue(0); @@ -6491,12 +6526,17 @@ public class LoanRepaymentScheduleService extends MybatisBaseService= 0 ? m2i : Q1; BigDecimal B1 = BigDecimal.ZERO; - if (temp.compareTo(Q) >= 0) { - B1 = B; + if (Q1.subtract(temp).compareTo(BigDecimal.ZERO) == 0) { + B1 = TempB; } else { - BigDecimal bigDecimal = temp.divide(Q, 2, BigDecimal.ROUND_HALF_UP); - B1 = B.multiply(bigDecimal); + if (temp.compareTo(Q) >= 0) { + B1 = B; + } else { + BigDecimal bigDecimal = temp.divide(Q, 2, BigDecimal.ROUND_HALF_UP); + B1 = B.multiply(bigDecimal); + } } + TempB = TempB.subtract(B1); if (Q1.compareTo(m2i) < 0) { //生成 i 期还款记录，月还金额 m1i - Q1 LoanRepaymentHistory history = new LoanRepaymentHistory();