From 3786df4fa6c5a2a1aec0dcb196cbe6ffa4bd7556 Mon Sep 17 00:00:00 2001 From: fanzongzhe <285169773@qq.com> Date: Tue, 12 Mar 2024 17:49:23 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=94=AE=E5=90=8E=E6=9C=8D?= =?UTF-8?q?=E5=8A=A1=E5=A5=97=E9=A4=90=E6=A8=A1=E5=9D=97=E3=80=81=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E8=B4=B7=E5=90=8E=E5=B7=A5=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LoanMortgageInformationTransact.java | 3 + ...nMortgageInformationTransactDetailsVo.java | 3 + .../LoanMortgageInformationTransactFeign.java | 2 +- ...tgageInformationTransactFeignFallback.java | 2 +- .../LoanMortgageInformationTransactVo.java | 4 + .../LoanRepaymentHistoryFeign.java | 6 + .../LoanRepaymentHistoryFeignFallback.java | 5 + .../loanrepaymenthistory/NoImportQuery.java | 16 ++ .../api/loanrepaymenthistory/NoImportVo.java | 16 ++ .../CheckPayStateVo.java | 14 ++ .../LoanRepaymentPlanDetails.java | 1 + .../LoanBuckleApplyService.java | 16 +- .../LoanMortgageInformationTransactMapper.xml | 9 +- .../LoanMortgageInformationTransactRest.java | 4 +- ...oanMortgageInformationTransactService.java | 14 +- .../LoanRepaymentHistoryMapper.java | 6 +- .../LoanRepaymentHistoryMapper.xml | 110 +++++++--- .../LoanRepaymentHistoryRest.java | 5 + .../LoanRepaymentHistoryService.java | 86 ++++++-- .../LoanRepaymentPlanDetailsMapper.java | 2 + .../LoanRepaymentPlanDetailsMapper.xml | 177 ++++++++++++---- .../LoanRepaymentPlanDetailsService.java | 4 + ...pMortgageInformationTransactDetailsVo.java | 4 + .../AppMortgageInformationTransactDto.java | 3 + .../AppMortgageInformationTransactVo.java | 4 + .../api/risk/mortgage/MortgageFeign.java | 2 +- .../risk/mortgage/MortgageFeignFallback.java | 2 +- .../biz/risk/mortgage/MortgageRest.java | 4 +- .../biz/risk/mortgage/MortgageService.java | 4 +- .../AsServicePackageDetailsVo.java | 2 +- .../asservicepackage/AsServicePackageDto.java | 21 +- .../asservicepackage/PackageAttachItemVo.java | 10 +- .../asservicepackage/PackageGoodsQuery.java | 15 ++ .../api/asservicepackage/PackageGoodsVo.java | 37 +++- .../api/asservicepackage/PackageItemVo.java | 11 +- .../AsServicePackageAitem.java | 2 +- .../AsServicePackageGoods.java | 2 + .../AsServicePackageMapper.java | 6 + .../AsServicePackageMapper.xml | 39 +++- .../AsServicePackageRest.java | 38 +++- .../AsServicePackageService.java | 192 +++++++++++++++++- .../AsServicePackageAitemMapper.java | 7 + .../AsServicePackageAitemService.java | 12 +- .../AsServicePackageGoodsMapper.java | 26 ++- .../AsServicePackageGoodsService.java | 10 + .../AsServicePackageSitemMapper.java | 7 + .../AsServicePackageSitemService.java | 9 + .../as/feign/wms/wmsgoods/WmsGoodsFeign.java | 31 +++ .../wms/wmsgoods/WmsGoodsFeignFallback.java | 56 +++++ .../wms/wmsgoods/WmsGoodsPackageQuery.java | 15 ++ .../feign/wms/wmsgoods/WmsGoodsPackageVo.java | 48 +++++ 51 files changed, 970 insertions(+), 154 deletions(-) create mode 100644 anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymenthistory/NoImportQuery.java create mode 100644 anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymenthistory/NoImportVo.java create mode 100644 anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentplandetails/CheckPayStateVo.java create mode 100644 yxt-as/src/main/java/com/yxt/anrui/as/api/asservicepackage/PackageGoodsQuery.java create mode 100644 yxt-as/src/main/java/com/yxt/anrui/as/feign/wms/wmsgoods/WmsGoodsFeign.java create mode 100644 yxt-as/src/main/java/com/yxt/anrui/as/feign/wms/wmsgoods/WmsGoodsFeignFallback.java create mode 100644 yxt-as/src/main/java/com/yxt/anrui/as/feign/wms/wmsgoods/WmsGoodsPackageQuery.java create mode 100644 yxt-as/src/main/java/com/yxt/anrui/as/feign/wms/wmsgoods/WmsGoodsPackageVo.java diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanmortgageinformationtransact/LoanMortgageInformationTransact.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanmortgageinformationtransact/LoanMortgageInformationTransact.java index 7eaf82e2a1..cd779f1ce9 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanmortgageinformationtransact/LoanMortgageInformationTransact.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanmortgageinformationtransact/LoanMortgageInformationTransact.java @@ -43,5 +43,8 @@ public class LoanMortgageInformationTransact extends BaseEntity { private String staffSid; //销售专员sid private String borrowerName; //贷款人 private String borrowerSid; //贷款人sid + private String auditName; //审核人 + private String auditSid; //审核人sid + private Date auditDate; //审核日期 } diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanmortgageinformationtransact/LoanMortgageInformationTransactDetailsVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanmortgageinformationtransact/LoanMortgageInformationTransactDetailsVo.java index 6db5d7c567..be90d36953 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanmortgageinformationtransact/LoanMortgageInformationTransactDetailsVo.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanmortgageinformationtransact/LoanMortgageInformationTransactDetailsVo.java @@ -36,4 +36,7 @@ public class LoanMortgageInformationTransactDetailsVo implements Vo { private List taxiFiles = new ArrayList<>(); @ApiModelProperty("行驶证") private List drivingFiles = new ArrayList<>(); + private String auditName; //审核人 + private String auditSid; //审核人sid + private String auditDate; //审核日期 } diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanmortgageinformationtransact/LoanMortgageInformationTransactFeign.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanmortgageinformationtransact/LoanMortgageInformationTransactFeign.java index abb31dff42..c0d0d63af5 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanmortgageinformationtransact/LoanMortgageInformationTransactFeign.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanmortgageinformationtransact/LoanMortgageInformationTransactFeign.java @@ -62,7 +62,7 @@ public interface LoanMortgageInformationTransactFeign { @ApiOperation("初始化详情") @GetMapping("/getMortgageInfo") @ResponseBody - public ResultBean getMortgageInfo(@RequestParam("busVinSid") String busVinSid); + public ResultBean getMortgageInfo(@RequestParam("busVinSid") String busVinSid,@RequestParam("userSid") String userSid); @ApiOperation("手机端-查询本分公司下代办数量:切换机构") diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanmortgageinformationtransact/LoanMortgageInformationTransactFeignFallback.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanmortgageinformationtransact/LoanMortgageInformationTransactFeignFallback.java index 2498ea6152..4b2ff8e3c9 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanmortgageinformationtransact/LoanMortgageInformationTransactFeignFallback.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanmortgageinformationtransact/LoanMortgageInformationTransactFeignFallback.java @@ -30,7 +30,7 @@ public class LoanMortgageInformationTransactFeignFallback implements LoanMortgag } @Override - public ResultBean getMortgageInfo(String busVinSid) { + public ResultBean getMortgageInfo(String busVinSid,String userSid) { return null; } diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanmortgageinformationtransact/LoanMortgageInformationTransactVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanmortgageinformationtransact/LoanMortgageInformationTransactVo.java index e7d077c533..8cda84f159 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanmortgageinformationtransact/LoanMortgageInformationTransactVo.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanmortgageinformationtransact/LoanMortgageInformationTransactVo.java @@ -40,4 +40,8 @@ public class LoanMortgageInformationTransactVo implements Vo { @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") private Date createTime; private boolean showHandleBtn; + @ApiModelProperty("审核人") + private String auditName; + @ApiModelProperty("审核日期") + private String auditDate; } diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymenthistory/LoanRepaymentHistoryFeign.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymenthistory/LoanRepaymentHistoryFeign.java index 1f67690164..96261be760 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymenthistory/LoanRepaymentHistoryFeign.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymenthistory/LoanRepaymentHistoryFeign.java @@ -84,6 +84,12 @@ public interface LoanRepaymentHistoryFeign { @ResponseBody public ResultBean updateState(@RequestParam("orgPath") String orgPath); + @ApiOperation("非导入数据更新") + @PostMapping("/noImportUpdate") + @ResponseBody + public ResultBean noImportUpdate(@RequestBody NoImportQuery query); + + @ApiOperation("划扣申请初始化") @GetMapping("/buckleNewInit") @ResponseBody diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymenthistory/LoanRepaymentHistoryFeignFallback.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymenthistory/LoanRepaymentHistoryFeignFallback.java index 8a501521f8..155b966f6d 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymenthistory/LoanRepaymentHistoryFeignFallback.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymenthistory/LoanRepaymentHistoryFeignFallback.java @@ -76,6 +76,11 @@ public class LoanRepaymentHistoryFeignFallback implements LoanRepaymentHistoryFe return null; } + @Override + public ResultBean noImportUpdate(NoImportQuery query) { + return null; + } + @Override public ResultBean buckleNewInit(String orgPath) { return null; diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymenthistory/NoImportQuery.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymenthistory/NoImportQuery.java new file mode 100644 index 0000000000..6af9d943b1 --- /dev/null +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymenthistory/NoImportQuery.java @@ -0,0 +1,16 @@ +package com.yxt.anrui.riskcenter.api.loanrepaymenthistory; + +import lombok.Data; + +/** + * @author Fan + * @description + * @date 2024/3/12 14:14 + */ +@Data +public class NoImportQuery { + + private String bankSid; + private String orgPath; + +} diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymenthistory/NoImportVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymenthistory/NoImportVo.java new file mode 100644 index 0000000000..a85232e1a5 --- /dev/null +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymenthistory/NoImportVo.java @@ -0,0 +1,16 @@ +package com.yxt.anrui.riskcenter.api.loanrepaymenthistory; + +import lombok.Data; + +/** + * @author Fan + * @description + * @date 2024/3/12 14:17 + */ +@Data +public class NoImportVo { + private String sid; + private String bankSid; + private String bankShortName; + private String useOrgSid; +} diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentplandetails/CheckPayStateVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentplandetails/CheckPayStateVo.java new file mode 100644 index 0000000000..0b5c769408 --- /dev/null +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentplandetails/CheckPayStateVo.java @@ -0,0 +1,14 @@ +package com.yxt.anrui.riskcenter.api.loanrepaymentplandetails; + +import lombok.Data; + +/** + * @author Fan + * @description + * @date 2024/3/12 16:16 + */ +@Data +public class CheckPayStateVo { + private String actualMoney; + private String checkState; +} diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentplandetails/LoanRepaymentPlanDetails.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentplandetails/LoanRepaymentPlanDetails.java index 791cc555a4..e11564f88b 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentplandetails/LoanRepaymentPlanDetails.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentplandetails/LoanRepaymentPlanDetails.java @@ -78,6 +78,7 @@ public class LoanRepaymentPlanDetails extends BaseEntity { private BigDecimal fund; //资金占用费 private Integer overdue; //是否曾逾期（0是，1否） private Integer oweState; //是否转累欠状态（0是，1否） + private Integer payState; //还款状态（0正常还款，1逾期还款） private Date updateTime; //更新日期 } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbuckleapply/LoanBuckleApplyService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbuckleapply/LoanBuckleApplyService.java index 9781b26e4d..2bce44be35 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbuckleapply/LoanBuckleApplyService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbuckleapply/LoanBuckleApplyService.java @@ -694,12 +694,18 @@ public class LoanBuckleApplyService extends MybatisBaseService ${ew.sqlSegment} @@ -47,7 +49,10 @@ date_format(mortgageDate, '%Y-%m-%d') as mortgageDate, borrowerName as borrowerName, vinNo, - loanContractNo as contractId + loanContractNo as contractId, + auditName, + auditSid, + date_format(auditDate, '%Y-%m-%d') as auditDate from loan_mortgage_information_transact where busVinSid = #{busVinSid} diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanmortgageinformationtransact/LoanMortgageInformationTransactRest.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanmortgageinformationtransact/LoanMortgageInformationTransactRest.java index b43ae2fe1b..4d83b1aa18 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanmortgageinformationtransact/LoanMortgageInformationTransactRest.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanmortgageinformationtransact/LoanMortgageInformationTransactRest.java @@ -43,8 +43,8 @@ public class LoanMortgageInformationTransactRest implements LoanMortgageInformat } @Override - public ResultBean getMortgageInfo(String busVinSid) { - return loanMortgageInformationTransactService.getMortgageInfo(busVinSid); + public ResultBean getMortgageInfo(String busVinSid,String userSid) { + return loanMortgageInformationTransactService.getMortgageInfo(busVinSid,userSid); } @Override diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanmortgageinformationtransact/LoanMortgageInformationTransactService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanmortgageinformationtransact/LoanMortgageInformationTransactService.java index 64274b554d..2d5135f054 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanmortgageinformationtransact/LoanMortgageInformationTransactService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanmortgageinformationtransact/LoanMortgageInformationTransactService.java @@ -1,6 +1,7 @@ package com.yxt.anrui.riskcenter.biz.loanmortgageinformationtransact; import cn.hutool.core.bean.BeanUtil; +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.base.api.basevehiclestate.BaseVehicleState; @@ -19,6 +20,7 @@ import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery; import com.yxt.anrui.portal.api.sysuser.SysUserFeign; +import com.yxt.anrui.portal.api.sysuser.SysUserVo; import com.yxt.anrui.riskcenter.api.loancustomerrecord.LoanCustomerRecord; import com.yxt.anrui.riskcenter.api.loancustomerrecord.app.AppCustomerRecordQuery; import com.yxt.anrui.riskcenter.api.loancustomerrecord.app.AppCustomerRecordVo; @@ -620,9 +622,19 @@ public class LoanMortgageInformationTransactService extends MybatisBaseService getMortgageInfo(String busVinSid) { + public ResultBean getMortgageInfo(String busVinSid, String userSid) { ResultBean rb = ResultBean.fireFail(); LoanMortgageInformationTransactDetailsVo vo = baseMapper.getMortgageInfo(busVinSid); + if (null != vo) { + if (StringUtils.isNotBlank(vo.getAuditSid())) { + vo.setAuditDate(DateUtil.today()); + vo.setAuditSid(userSid); + SysUserVo userVo = sysUserFeign.fetchBySid(userSid).getData(); + if (null != userVo) { + vo.setAuditName(userVo.getName()); + } + } + } //登记证 1-2页 List fileList = loanFileService.selectByLinkSid(busVinSid, LoanFileEnum.REGISTRATION_FILES_ONE.getAttachType()); fileList.removeAll(Collections.singleton(null)); diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryMapper.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryMapper.java index afa5959052..ef1f1d27cd 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryMapper.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryMapper.java @@ -54,5 +54,9 @@ public interface LoanRepaymentHistoryMapper extends BaseMapper histories); + String getUpdateMoneyBySid(@Param("pSid") String pSid, @Param("histories") List histories); + + List selPlanDetailsByBank(@Param("bankSid") String bankSid, @Param("useOrgSid") String useOrgSid); + + int updateTimeByPlanSids(@Param("stringList") List stringList, @Param("formatDate") String formatDate); } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryMapper.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryMapper.xml index d97532c0ec..b56bf7eb94 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryMapper.xml +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryMapper.xml @@ -1,6 +1,14 @@ + + update loan_repayment_plan_details + set updateTime = #{formatDate}, + where sid in + + #{sid} + + + \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryRest.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryRest.java index ac528790c3..2259215f24 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryRest.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryRest.java @@ -102,6 +102,11 @@ public class LoanRepaymentHistoryRest implements LoanRepaymentHistoryFeign { return loanRepaymentHistoryService.updateState(orgPath); } + @Override + public ResultBean noImportUpdate(NoImportQuery query) { + return loanRepaymentHistoryService.noImportUpdate(query); + } + @Override public ResultBean buckleNewInit(String orgPath) { return loanRepaymentHistoryService.buckleNewInit(orgPath); diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryService.java index a62f55b179..a075784ebd 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryService.java @@ -41,6 +41,7 @@ import com.yxt.anrui.riskcenter.api.loanparameter.LoanParameterQuery; import com.yxt.anrui.riskcenter.api.loanparameter.LoanParameterVo; import com.yxt.anrui.riskcenter.api.loanrepaymenthistory.*; import com.yxt.anrui.riskcenter.api.loanrepaymenthistory.utils.CollectorsUtil; +import com.yxt.anrui.riskcenter.api.loanrepaymentplandetails.CheckPayStateVo; import com.yxt.anrui.riskcenter.api.loanrepaymentplandetails.LoanPlanDetailsVoForLateVoucher; import com.yxt.anrui.riskcenter.api.loanrepaymentplandetails.LoanRepaymentPlanDetails; import com.yxt.anrui.riskcenter.api.loanrepaymentplandetails.LoanRepaymentPlanDetailsDto; @@ -72,6 +73,8 @@ import java.io.InputStream; import java.math.BigDecimal; import java.text.ParseException; import java.text.SimpleDateFormat; +import java.time.LocalDate; +import java.time.format.DateTimeFormatter; import java.util.*; import java.util.concurrent.*; import java.util.function.Predicate; @@ -758,6 +761,22 @@ public class LoanRepaymentHistoryService extends MybatisBaseService 0) { + details.setPayState(1); + loanRepaymentPlanDetailsService.updateById(details); + } + } + } + } + } String reAdvances = loanRepaymentPlanDetailsService.reAdvancesOrPaymentMoney(pSid); if (StringUtils.isNotBlank(reAdvances)) { if (reAdvances.equals("0")) { @@ -767,7 +786,7 @@ public class LoanRepaymentHistoryService extends MybatisBaseService 0) { //查询更新金额 - String money = baseMapper.getUpdateMoneyBySid(pSid,histories); + String money = baseMapper.getUpdateMoneyBySid(pSid, histories); BigDecimal decimalMoney = new BigDecimal(money); LoanRepaymentPlanDetails planDetails = loanRepaymentPlanDetailsService.fetchBySid(pSid); BigDecimal paymentMoney = planDetails.getPaymentMoney(); @@ -796,21 +815,7 @@ public class LoanRepaymentHistoryService extends MybatisBaseService(1024), namedThreadFactory, new org.apache.tomcat.util.threads.ThreadPoolExecutor.AbortPolicy()); -// //推送财务当月逾期转累欠凭证 -// Future future = pool.submit(() -> { -// pushLateVoucher(pushUseOrgSid); -// }); -// } catch (Exception e) { -// e.printStackTrace(); -// log.error("推送数据失败=========================" + e.getMessage()); -// return rb.setMsg("推送数据失败"); -// } + } else { return rb.setMsg("暂无可更新的还款记录"); } @@ -1632,4 +1637,53 @@ public class LoanRepaymentHistoryService extends MybatisBaseService orgSidByPath = sysStaffOrgFeign.getOrgSidByPath(query.getOrgPath()); + if (orgSidByPath.getSuccess()) { + String useOrgSid = orgSidByPath.getData(); + List voList = baseMapper.selPlanDetailsByBank(query.getBankSid(), useOrgSid); + if (!voList.isEmpty()) { + List stringList = + voList.stream().map(NoImportVo::getSid).collect(Collectors.toList()); + LocalDate localDate = LocalDate.now().minusDays(1); + String formatDate = localDate.format(DateTimeFormatter.ofPattern("yyyy-MM-dd")); + int i = baseMapper.updateTimeByPlanSids(stringList, formatDate); + for (String pSid : stringList) { + //判断当前期数是正常还款还是逾期还款 + LoanRepaymentPlanDetails details = loanRepaymentPlanDetailsService.fetchBySid(pSid); + if (null != details) { + if (details.getPayState() == 0) { + CheckPayStateVo checkPayStateVo = loanRepaymentPlanDetailsService.checkPayState(pSid); + if (null != checkPayStateVo) { + if (checkPayStateVo.getCheckState().equals("0")) { + BigDecimal money = new BigDecimal(checkPayStateVo.getActualMoney()); + if (money.compareTo(BigDecimal.ZERO) > 0) { + details.setPayState(1); + loanRepaymentPlanDetailsService.updateById(details); + } + } + } + } + } + } + } + //判断当期是否逾期 + List overDueVoList = loanRepaymentPlanDetailsService.overDueVoList(useOrgSid); + if (!overDueVoList.isEmpty()) { + List planSids = new ArrayList<>(); + overDueVoList.stream().forEach(v -> { + if (v.getOverdueState().equals("0")) { + planSids.add(v.getPlanSid()); + } + }); + if (!planSids.isEmpty()) { + int i = loanRepaymentPlanDetailsService.updateOverDueState(planSids); + } + } + pushLateVoucher(useOrgSid); + } + return rb.success(); + } } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsMapper.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsMapper.java index c5c0bf78d2..43767d426c 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsMapper.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsMapper.java @@ -71,4 +71,6 @@ public interface LoanRepaymentPlanDetailsMapper extends BaseMapper selUseOrgSidListForLateVoucher(); LoanRepaymentPlanDetails selOneByBankNoAndBusVinSid(@Param("bankContractNo") String bankContractNo,@Param("saleVehSid") String saleVehSid); + + CheckPayStateVo checkPayState(@Param("pSid") String pSid); } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsMapper.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsMapper.xml index d4d084f4bc..3b16fd0928 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsMapper.xml +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsMapper.xml @@ -142,16 +142,16 @@ END AS overdueState FROM ( SELECT a.*, - (SELECT (fjj.reveivableMoney - fjj.m) - FROM (SELECT IFNULL((SELECT SUM(subscriptionMoney) - FROM anrui_fin.fin_selected_receivables_detailed as s - WHERE s.auditState = '3' - and s.receivablesSid = fj.sid), 0) as m, - fj.* - FROM (SELECT j.busSid, j.sid, j.reveivableMoney - FROM anrui_fin.fin_uncollected_receivables_detailed_jr as j - WHERE j.payCostTitleKey = '006') as fj) as fjj - WHERE fjj.busSid = a.sid) as fund + IFNULL((SELECT (fjj.reveivableMoney - fjj.m) + FROM (SELECT IFNULL((SELECT SUM(subscriptionMoney) + FROM anrui_fin.fin_selected_receivables_detailed as s + WHERE s.auditState = '3' + and s.receivablesSid = fj.sid), 0) as m, + fj.* + FROM (SELECT j.busSid, j.sid, j.reveivableMoney + FROM anrui_fin.fin_uncollected_receivables_detailed_jr as j + WHERE j.payCostTitleKey = '006') as fj) as fjj + WHERE fjj.busSid = a.sid),0) as fund FROM ( SELECT pd.dueDate, pd.useOrgSid, @@ -270,16 +270,16 @@ b.salesOrderSid FROM ( SELECT a.*, - (SELECT (fjj.reveivableMoney - fjj.m) - FROM (SELECT IFNULL((SELECT SUM(subscriptionMoney) - FROM anrui_fin.fin_selected_receivables_detailed as s - WHERE s.auditState = '3' - and s.receivablesSid = fj.sid), 0) as m, - fj.* - FROM (SELECT j.busSid, j.sid, j.reveivableMoney - FROM anrui_fin.fin_uncollected_receivables_detailed_jr as j - WHERE j.payCostTitleKey = '006') as fj) as fjj - WHERE fjj.busSid = a.sid) as fund + IFNULL((SELECT (fjj.reveivableMoney - fjj.m) + FROM (SELECT IFNULL((SELECT SUM(subscriptionMoney) + FROM anrui_fin.fin_selected_receivables_detailed as s + WHERE s.auditState = '3' + and s.receivablesSid = fj.sid), 0) as m, + fj.* + FROM (SELECT j.busSid, j.sid, j.reveivableMoney + FROM anrui_fin.fin_uncollected_receivables_detailed_jr as j + WHERE j.payCostTitleKey = '006') as fj) as fjj + WHERE fjj.busSid = a.sid),0) as fund FROM ( SELECT pd.loanContractNo, pd.oweState, @@ -357,16 +357,16 @@ b.salesOrderSid FROM ( SELECT a.*, - (SELECT (fjj.reveivableMoney - fjj.m) - FROM (SELECT IFNULL((SELECT SUM(subscriptionMoney) - FROM anrui_fin.fin_selected_receivables_detailed as s - WHERE s.auditState = '3' - and s.receivablesSid = fj.sid), 0) as m, - fj.* - FROM (SELECT j.busSid, j.sid, j.reveivableMoney - FROM anrui_fin.fin_uncollected_receivables_detailed_jr as j - WHERE j.payCostTitleKey = '006') as fj) as fjj - WHERE fjj.busSid = a.sid) as fund + IFNULL((SELECT (fjj.reveivableMoney - fjj.m) + FROM (SELECT IFNULL((SELECT SUM(subscriptionMoney) + FROM anrui_fin.fin_selected_receivables_detailed as s + WHERE s.auditState = '3' + and s.receivablesSid = fj.sid), 0) as m, + fj.* + FROM (SELECT j.busSid, j.sid, j.reveivableMoney + FROM anrui_fin.fin_uncollected_receivables_detailed_jr as j + WHERE j.payCostTitleKey = '006') as fj) as fjj + WHERE fjj.busSid = a.sid),0) as fund FROM ( SELECT pd.paymentMoney, pd.oweState, @@ -457,16 +457,16 @@ b.salesOrderSid FROM ( SELECT a.*, - (SELECT (fjj.reveivableMoney - fjj.m) - FROM (SELECT IFNULL((SELECT SUM(subscriptionMoney) - FROM anrui_fin.fin_selected_receivables_detailed as s - WHERE s.auditState = '3' - and s.receivablesSid = fj.sid), 0) as m, - fj.* - FROM (SELECT j.busSid, j.sid, j.reveivableMoney - FROM anrui_fin.fin_uncollected_receivables_detailed_jr as j - WHERE j.payCostTitleKey = '006') as fj) as fjj - WHERE fjj.busSid = a.sid) as fund + IFNULL((SELECT (fjj.reveivableMoney - fjj.m) + FROM (SELECT IFNULL((SELECT SUM(subscriptionMoney) + FROM anrui_fin.fin_selected_receivables_detailed as s + WHERE s.auditState = '3' + and s.receivablesSid = fj.sid), 0) as m, + fj.* + FROM (SELECT j.busSid, j.sid, j.reveivableMoney + FROM anrui_fin.fin_uncollected_receivables_detailed_jr as j + WHERE j.payCostTitleKey = '006') as fj) as fjj + WHERE fjj.busSid = a.sid),0) as fund FROM ( SELECT pd.paymentMoney, pd.oweState, @@ -578,4 +578,101 @@ WHERE bankContractNo = #{bankContractNo} AND busVinSid = #{saleVehSid} LIMIT 1 + \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsService.java index 89d29502d7..b1d716032c 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsService.java @@ -208,4 +208,8 @@ public class LoanRepaymentPlanDetailsService extends MybatisBaseService taxiFiles = new ArrayList<>(); @ApiModelProperty("行驶证") private List drivingFiles = new ArrayList<>(); + private String auditName; //审核人 + private String auditSid; //审核人sid + private String auditDate; //审核日期 } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/mortgage/AppMortgageInformationTransactDto.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/mortgage/AppMortgageInformationTransactDto.java index 28379d1b6c..32ec1cca28 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/mortgage/AppMortgageInformationTransactDto.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/mortgage/AppMortgageInformationTransactDto.java @@ -32,4 +32,7 @@ public class AppMortgageInformationTransactDto implements Dto { private List taxiFiles = new ArrayList<>(); @ApiModelProperty("行驶证") private List drivingFiles = new ArrayList<>(); + private String auditName; //审核人 + private String auditSid; //审核人sid + private String auditDate; //审核日期 } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/mortgage/AppMortgageInformationTransactVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/mortgage/AppMortgageInformationTransactVo.java index 2fa9445f00..a41dad7048 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/mortgage/AppMortgageInformationTransactVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/mortgage/AppMortgageInformationTransactVo.java @@ -31,4 +31,8 @@ public class AppMortgageInformationTransactVo implements Vo { @ApiModelProperty("资方") private String bankName; private boolean showHandleBtn; + @ApiModelProperty("审核人") + private String auditName; + @ApiModelProperty("审核日期") + private String auditDate; } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/mortgage/MortgageFeign.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/mortgage/MortgageFeign.java index 4cfe945c98..7e40f55a80 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/mortgage/MortgageFeign.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/mortgage/MortgageFeign.java @@ -62,5 +62,5 @@ public interface MortgageFeign { @ApiOperation("初始化详情") @GetMapping("/getMortgageInfo") @ResponseBody - public ResultBean getMortgageInfo(@RequestParam("sid") String sid); + public ResultBean getMortgageInfo(@RequestParam("sid") String sid, @RequestParam("userSid") String userSid); } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/mortgage/MortgageFeignFallback.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/mortgage/MortgageFeignFallback.java index c88c8d8293..56c28c9c57 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/mortgage/MortgageFeignFallback.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/mortgage/MortgageFeignFallback.java @@ -29,7 +29,7 @@ public class MortgageFeignFallback implements MortgageFeign { } @Override - public ResultBean getMortgageInfo(String busVinSid) { + public ResultBean getMortgageInfo(String busVinSid,String userSid) { return null; } } diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/mortgage/MortgageRest.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/mortgage/MortgageRest.java index ede798ed37..258638be5d 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/mortgage/MortgageRest.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/mortgage/MortgageRest.java @@ -39,7 +39,7 @@ public class MortgageRest implements MortgageFeign { } @Override - public ResultBean getMortgageInfo(String sid) { - return mortgageService.getMortgageInfo(sid); + public ResultBean getMortgageInfo(String sid,String userSid) { + return mortgageService.getMortgageInfo(sid,userSid); } } diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/mortgage/MortgageService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/mortgage/MortgageService.java index dd32af068f..c7fc60bc4f 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/mortgage/MortgageService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/mortgage/MortgageService.java @@ -58,10 +58,10 @@ public class MortgageService { return rb.success(); } - public ResultBean getMortgageInfo(String sid) { + public ResultBean getMortgageInfo(String sid,String userSid) { ResultBean rb = ResultBean.fireFail(); AppMortgageInformationTransactDetailsVo vo = new AppMortgageInformationTransactDetailsVo(); - ResultBean resultBean = loanMortgageInformationTransactFeign.getMortgageInfo(sid); + ResultBean resultBean = loanMortgageInformationTransactFeign.getMortgageInfo(sid,userSid); if (!resultBean.getSuccess()) { return rb.setMsg(resultBean.getMsg()); } diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicepackage/AsServicePackageDetailsVo.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicepackage/AsServicePackageDetailsVo.java index c6d2d06042..0abbabd7ef 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicepackage/AsServicePackageDetailsVo.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicepackage/AsServicePackageDetailsVo.java @@ -53,7 +53,7 @@ import java.util.List; public class AsServicePackageDetailsVo implements Vo { private String sid; // sid - + private String createBySid; @ApiModelProperty("套餐名称") private String packageName; // 套餐名称 @ApiModelProperty("备注") diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicepackage/AsServicePackageDto.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicepackage/AsServicePackageDto.java index f50ec655e6..8326c14d95 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicepackage/AsServicePackageDto.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicepackage/AsServicePackageDto.java @@ -32,6 +32,9 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.ArrayList; +import java.util.List; + /** * Project: yxt-as(售后服务)
* File: AsServicePackageDto.java
@@ -50,16 +53,18 @@ import lombok.Data; public class AsServicePackageDto implements Dto { private String sid; // sid - - @ApiModelProperty("套餐名称") + private String createBySid; + @ApiModelProperty("套餐名称") private String packageName; // 套餐名称 - @ApiModelProperty("套餐编码") - private String packageCode; // 套餐编码 - @ApiModelProperty("排序号") - private Integer sortNo; // 排序号 - @ApiModelProperty("使用组织sid") + @ApiModelProperty("备注") + private String remarks; // 备注 + @ApiModelProperty("使用组织sid") private String useOrgSid; // 使用组织sid - @ApiModelProperty("创建组织sid") + @ApiModelProperty("创建组织sid") private String createOrgSid; // 创建组织sid + private String orgPath; + private List itemVos = new ArrayList<>(); + private List goodsVos = new ArrayList<>(); + private List attachItemVos = new ArrayList<>(); } \ No newline at end of file diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicepackage/PackageAttachItemVo.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicepackage/PackageAttachItemVo.java index 3491cc7dea..4b9019f1bb 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicepackage/PackageAttachItemVo.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicepackage/PackageAttachItemVo.java @@ -1,7 +1,10 @@ package com.yxt.anrui.as.api.asservicepackage; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.math.BigDecimal; + /** * @author Fan * @description @@ -10,6 +13,11 @@ import lombok.Data; @Data public class PackageAttachItemVo { - + @ApiModelProperty("附加项目sid") + private String aitemSid; // 附加项目sid + @ApiModelProperty("附加项目名称") + private String aitemName; // 附加项目名称 + @ApiModelProperty("销售价") + private String price; // 销售价 } diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicepackage/PackageGoodsQuery.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicepackage/PackageGoodsQuery.java new file mode 100644 index 0000000000..ca66c94e01 --- /dev/null +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicepackage/PackageGoodsQuery.java @@ -0,0 +1,15 @@ +package com.yxt.anrui.as.api.asservicepackage; + +import com.yxt.common.core.query.Query; +import lombok.Data; + +/** + * @author Fan + * @description + * @date 2024/3/12 15:41 + */ +@Data +public class PackageGoodsQuery implements Query { + private String orgPath; + private String goodsName; +} diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicepackage/PackageGoodsVo.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicepackage/PackageGoodsVo.java index f4b1d966fd..195c7f42e2 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicepackage/PackageGoodsVo.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicepackage/PackageGoodsVo.java @@ -1,7 +1,10 @@ package com.yxt.anrui.as.api.asservicepackage; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.math.BigDecimal; + /** * @author Fan * @description @@ -10,6 +13,36 @@ import lombok.Data; @Data public class PackageGoodsVo { - - + @ApiModelProperty("商品sid") + private String goodsSid; // 商品sid + @ApiModelProperty("商品名称") + private String goodsName; // 商品名称 + @ApiModelProperty("商品编码（图号）") + private String goodsCode; // 商品编码（图号） + @ApiModelProperty("车型sid") + private String goodsModelSid; // 车型sid + @ApiModelProperty("车型") + private String goodsModel; // 车型 + @ApiModelProperty("单位") + private String unit; // 单位 + @ApiModelProperty("仓库sid") + private String warehouseSid; // 仓库sid + @ApiModelProperty("仓库名称") + private String warehouse; // 仓库名称 + @ApiModelProperty("科目sid") + private String subjectSid; // 科目sid + @ApiModelProperty("科目") + private String subject; // 科目 + @ApiModelProperty("销售价") + private String price; // 销售价 + @ApiModelProperty("数量") + private String count; // 数量 + @ApiModelProperty("折扣（0-10，0免费，10不打折）") + private String discount; // 折扣（0-10，0免费，10不打折） + @ApiModelProperty("优惠金额（=销售价*(折扣*0.1））") + private String discountAmount; // 优惠金额（=销售价*(折扣*0.1）） + @ApiModelProperty("金额（销售价-优惠金额）") + private String amount; // 金额（销售价-优惠金额） + @ApiModelProperty("规格") + private String specification; // 规格 } diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicepackage/PackageItemVo.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicepackage/PackageItemVo.java index 581ff2cfa6..d3276310de 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicepackage/PackageItemVo.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicepackage/PackageItemVo.java @@ -16,8 +16,6 @@ public class PackageItemVo { private String sitemSid; @ApiModelProperty("项目名称") private String sitemName; - @ApiModelProperty("项目名称") - private String sitemCode; @ApiModelProperty("工种sid（分类）") private String serviceTypeSid; @ApiModelProperty("工种（分类）") @@ -26,11 +24,18 @@ public class PackageItemVo { private String hourPrice; @ApiModelProperty("工时数") private String hours; + @ApiModelProperty("考核工时(考核价）") + private String examineHourPrice; // 考核工时(考核价） @ApiModelProperty("销售价(工时费)=工时单价*工时数") private String price; @ApiModelProperty("科目sid") private String subjectSid; @ApiModelProperty("科目名称") private String subjectName; - + @ApiModelProperty("折扣（0-10，0免费，10不打折）") + private String discount; // 折扣（0-10，0免费，10不打折） + @ApiModelProperty("优惠金额（=销售价*(折扣*0.1））") + private String discountAmount; // 优惠金额（=销售价*(折扣*0.1）） + @ApiModelProperty("金额（销售价-优惠金额）") + private String amount; // 金额（销售价-优惠金额） } diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicepackageaitem/AsServicePackageAitem.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicepackageaitem/AsServicePackageAitem.java index e55579afcc..16f227ad84 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicepackageaitem/AsServicePackageAitem.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicepackageaitem/AsServicePackageAitem.java @@ -57,7 +57,7 @@ public class AsServicePackageAitem extends BaseEntity { @ApiModelProperty("附加项目sid") private String aitemSid; // 附加项目sid @ApiModelProperty("附加项目名称") - private String aitmeName; // 附加项目名称 + private String aitemName; // 附加项目名称 @ApiModelProperty("销售价") private BigDecimal price; // 销售价 diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicepackagegoods/AsServicePackageGoods.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicepackagegoods/AsServicePackageGoods.java index 4a6d7cc296..2ff7d96f25 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicepackagegoods/AsServicePackageGoods.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicepackagegoods/AsServicePackageGoods.java @@ -84,5 +84,7 @@ public class AsServicePackageGoods extends BaseEntity { private BigDecimal discountAmount; // 优惠金额（=销售价*(折扣*0.1）） @ApiModelProperty("金额（销售价-优惠金额）") private BigDecimal amount; // 金额（销售价-优惠金额） + @ApiModelProperty("规格") + private String specification; // 规格 } diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicepackage/AsServicePackageMapper.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicepackage/AsServicePackageMapper.java index 9cf6143168..35a474a6de 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicepackage/AsServicePackageMapper.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicepackage/AsServicePackageMapper.java @@ -29,6 +29,8 @@ 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.as.api.asservicepackage.PackageAttachItemVo; +import com.yxt.anrui.as.api.asservicepackage.PackageItemVo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; @@ -62,4 +64,8 @@ public interface AsServicePackageMapper extends BaseMapper { @Select("select * from as_service_package") List selectListVo(); + + List selItemInfo(@Param("useOrgSid") String useOrgSid); + + List selAttItemInfo(@Param("useOrgSid") String useOrgSid); } \ No newline at end of file diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicepackage/AsServicePackageMapper.xml b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicepackage/AsServicePackageMapper.xml index d6d8913fd6..fd0a5d0c29 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicepackage/AsServicePackageMapper.xml +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicepackage/AsServicePackageMapper.xml @@ -1,13 +1,34 @@ - - - - - + + + + + + + \ No newline at end of file diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicepackage/AsServicePackageRest.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicepackage/AsServicePackageRest.java index 10e2b9c216..6a98e364ac 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicepackage/AsServicePackageRest.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicepackage/AsServicePackageRest.java @@ -25,6 +25,7 @@ *********************************************************/ package com.yxt.anrui.as.biz.asservicepackage; +import com.yxt.anrui.as.api.asservicepackage.*; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; @@ -33,10 +34,7 @@ import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import com.yxt.anrui.as.api.asservicepackage.AsServicePackageQuery; -import com.yxt.anrui.as.api.asservicepackage.AsServicePackageVo; -import com.yxt.anrui.as.api.asservicepackage.AsServicePackageDetailsVo; -import com.yxt.anrui.as.api.asservicepackage.AsServicePackageDto; +import java.util.List; /** * Project: yxt-as(售后服务)
@@ -59,7 +57,6 @@ public class AsServicePackageRest { @Autowired private AsServicePackageService asServicePackageService; - @ApiOperation("根据条件分页查询数据的列表") @PostMapping("/listPage") public ResultBean> listPage(@RequestBody PagerQuery pq){ @@ -70,19 +67,20 @@ public class AsServicePackageRest { @ApiOperation("新增或修改") - @PostMapping("/save") - public ResultBean save(@RequestBody AsServicePackageDto dto){ + @PostMapping("/savePackage") + public ResultBean savePackage(@RequestBody AsServicePackageDto dto){ ResultBean rb = ResultBean.fireFail(); - asServicePackageService.saveOrUpdateDto(dto); + asServicePackageService.savePackage(dto); return rb.success(); } @ApiOperation("根据sid批量删除") - @PostMapping("/delBySids") + @DeleteMapping("/delBySids") public ResultBean delBySids(@RequestBody String[] sids){ ResultBean rb = ResultBean.fireFail(); asServicePackageService.delBySids(sids); + asServicePackageService.delOtherInfo(sids); return rb.success(); } @@ -94,4 +92,26 @@ public class AsServicePackageRest { AsServicePackageDetailsVo vo = asServicePackageService.fetchDetailsVoBySid(sid); return rb.success().setData(vo); } + + @ApiOperation("查询分公司服务项目") + @GetMapping("/selItemInfo") + public ResultBean> selItemInfo(@RequestParam("orgPath") String orgPath){ + ResultBean rb = ResultBean.fireFail(); + List voList = asServicePackageService.selItemInfo(orgPath); + return rb.success().setData(voList); + } + @ApiOperation("查询分公司附加项目") + @GetMapping("/selAttItemInfo") + public ResultBean> selAttItemInfo(@RequestParam("orgPath") String orgPath){ + ResultBean rb = ResultBean.fireFail(); + List voList = asServicePackageService.selAttItemInfo(orgPath); + return rb.success().setData(voList); + } + @ApiOperation("查询分公司商品信息") + @PostMapping("/selGoodsInfo") + public ResultBean> selGoodsInfo(@RequestBody PagerQuery pq){ + ResultBean rb = ResultBean.fireFail(); + PagerVo pagerVo = asServicePackageService.selGoodsInfo(pq); + return rb.success().setData(pagerVo); + } } diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicepackage/AsServicePackageService.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicepackage/AsServicePackageService.java index 89aea0d91c..0b34b55f15 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicepackage/AsServicePackageService.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicepackage/AsServicePackageService.java @@ -28,21 +28,31 @@ package com.yxt.anrui.as.biz.asservicepackage; 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.as.api.asservicepackage.*; +import com.yxt.anrui.as.api.asservicepackageaitem.AsServicePackageAitem; +import com.yxt.anrui.as.api.asservicepackagegoods.AsServicePackageGoods; +import com.yxt.anrui.as.api.asservicepackagesitem.AsServicePackageSitem; +import com.yxt.anrui.as.biz.asservicepackageaitem.AsServicePackageAitemService; +import com.yxt.anrui.as.biz.asservicepackagegoods.AsServicePackageGoodsService; +import com.yxt.anrui.as.biz.asservicepackagesitem.AsServicePackageSitemService; import com.yxt.anrui.as.feign.portal.sysstafforg.SysStaffOrgFeign; +import com.yxt.anrui.as.feign.wms.wmsgoods.WmsGoodsFeign; +import com.yxt.anrui.as.feign.wms.wmsgoods.WmsGoodsPackageQuery; +import com.yxt.anrui.as.feign.wms.wmsgoods.WmsGoodsPackageVo; import com.yxt.common.core.result.ResultBean; import org.apache.commons.lang3.StringUtils; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.PagerUtil; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.vo.PagerVo; -import com.yxt.anrui.as.api.asservicepackage.AsServicePackage; -import com.yxt.anrui.as.api.asservicepackage.AsServicePackageQuery; -import com.yxt.anrui.as.api.asservicepackage.AsServicePackageVo; -import com.yxt.anrui.as.api.asservicepackage.AsServicePackageDetailsVo; -import com.yxt.anrui.as.api.asservicepackage.AsServicePackageDto; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.List; /** * Project: yxt-as(售后服务)
@@ -61,6 +71,14 @@ import org.springframework.stereotype.Service; public class AsServicePackageService extends MybatisBaseService { @Autowired private SysStaffOrgFeign sysStaffOrgFeign; + @Autowired + private AsServicePackageGoodsService asServicePackageGoodsService; + @Autowired + private AsServicePackageAitemService asServicePackageAitemService; + @Autowired + private AsServicePackageSitemService asServicePackageSitemService; + @Resource + private WmsGoodsFeign wmsGoodsFeign; private QueryWrapper createQueryWrapper(AsServicePackageQuery query) { // todo: 这里根据具体业务调整查询条件 @@ -73,6 +91,7 @@ public class AsServicePackageService extends MybatisBaseService itemVos = new ArrayList<>(); + List goodsVos = new ArrayList<>(); + List attachItemVos = new ArrayList<>(); + List sitemList = asServicePackageSitemService.getByMainSid(sid); + List goodsList = asServicePackageGoodsService.getByMainSid(sid); + List asList = asServicePackageAitemService.getByMainSid(sid); + if (!sitemList.isEmpty()) { + for (AsServicePackageSitem packageSitem : sitemList) { + PackageItemVo itemVo = new PackageItemVo(); + BeanUtil.copyProperties(packageSitem, itemVo); + itemVos.add(itemVo); + } + vo.setItemVos(itemVos); + } + if (!goodsList.isEmpty()) { + for (AsServicePackageGoods goods : goodsList) { + PackageGoodsVo goodsVo = new PackageGoodsVo(); + BeanUtil.copyProperties(goods, goodsVo); + goodsVos.add(goodsVo); + } + vo.setGoodsVos(goodsVos); + } + if (!asList.isEmpty()) { + for (AsServicePackageAitem aitem : asList) { + PackageAttachItemVo attachItemVo = new PackageAttachItemVo(); + BeanUtil.copyProperties(aitem, attachItemVo); + attachItemVos.add(attachItemVo); + } + vo.setAttachItemVos(attachItemVos); + } + return vo; + } + + @Transactional(rollbackFor = Exception.class) + public void savePackage(AsServicePackageDto dto) { + String orgPath = dto.getOrgPath(); + if (StringUtils.isNotBlank(dto.getSid())) { + String sid = dto.getSid(); + AsServicePackage asServicePackage = fetchBySid(sid); + BeanUtil.copyProperties(dto, asServicePackage, "id", "sid"); + baseMapper.updateById(asServicePackage); + asServicePackageAitemService.delByMainSid(sid); + asServicePackageSitemService.delByMainSid(sid); + asServicePackageGoodsService.delByMainSid(sid); + //保存服务项目信息 + List itemVos = dto.getItemVos(); + if (!itemVos.isEmpty()) { + for (PackageItemVo itemVo : itemVos) { + AsServicePackageSitem packageSitem = new AsServicePackageSitem(); + packageSitem.setPackageSid(sid); + BeanUtil.copyProperties(itemVo, packageSitem, "id", "sid"); + asServicePackageSitemService.insert(packageSitem); + } + } + //保存商品信息 + List goodsVos = dto.getGoodsVos(); + if (!goodsVos.isEmpty()) { + for (PackageGoodsVo goodsVo : goodsVos) { + AsServicePackageGoods goods = new AsServicePackageGoods(); + goods.setPackageSid(sid); + BeanUtil.copyProperties(goodsVo, goods, "id", "sid"); + asServicePackageGoodsService.insert(goods); + } + } + //保存附加项目 + List attachItemVos = dto.getAttachItemVos(); + if (!attachItemVos.isEmpty()) { + for (PackageAttachItemVo attachItemVo : attachItemVos) { + AsServicePackageAitem aitem = new AsServicePackageAitem(); + aitem.setPackageSid(sid); + BeanUtil.copyProperties(attachItemVo, aitem, "id", "sid"); + asServicePackageAitemService.insert(aitem); + } + } + } else { + //保存套餐信息 + AsServicePackage entity = new AsServicePackage(); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + ResultBean orgSidByPath = sysStaffOrgFeign.getOrgSidByPath(orgPath); + if (orgSidByPath.getSuccess()) { + String useOrgSid = orgSidByPath.getData(); + entity.setUseOrgSid(useOrgSid); + entity.setCreateOrgSid(useOrgSid); + } + baseMapper.insert(entity); + //保存服务项目信息 + List itemVos = dto.getItemVos(); + if (!itemVos.isEmpty()) { + for (PackageItemVo itemVo : itemVos) { + AsServicePackageSitem packageSitem = new AsServicePackageSitem(); + packageSitem.setPackageSid(entity.getSid()); + BeanUtil.copyProperties(itemVo, packageSitem, "id", "sid"); + asServicePackageSitemService.insert(packageSitem); + } + } + //保存商品信息 + List goodsVos = dto.getGoodsVos(); + if (!goodsVos.isEmpty()) { + for (PackageGoodsVo goodsVo : goodsVos) { + AsServicePackageGoods goods = new AsServicePackageGoods(); + goods.setPackageSid(entity.getSid()); + BeanUtil.copyProperties(goodsVo, goods, "id", "sid"); + asServicePackageGoodsService.insert(goods); + } + } + //保存附加项目 + List attachItemVos = dto.getAttachItemVos(); + if (!attachItemVos.isEmpty()) { + for (PackageAttachItemVo attachItemVo : attachItemVos) { + AsServicePackageAitem aitem = new AsServicePackageAitem(); + aitem.setPackageSid(entity.getSid()); + BeanUtil.copyProperties(attachItemVo, aitem, "id", "sid"); + asServicePackageAitemService.insert(aitem); + } + } + } + } + + public void delOtherInfo(String[] sids) { + for (String sid : sids) { + asServicePackageAitemService.delByMainSid(sid); + asServicePackageSitemService.delByMainSid(sid); + asServicePackageGoodsService.delByMainSid(sid); + } + } + + public List selItemInfo(String orgPath) { + List list = new ArrayList<>(); + ResultBean orgSidByPath = sysStaffOrgFeign.getOrgSidByPath(orgPath); + if (orgSidByPath.getSuccess()) { + String useOrgSid = orgSidByPath.getData(); + list = baseMapper.selItemInfo(useOrgSid); + } + return list; + } + + + public List selAttItemInfo(String orgPath) { + List list = new ArrayList<>(); + ResultBean orgSidByPath = sysStaffOrgFeign.getOrgSidByPath(orgPath); + if (orgSidByPath.getSuccess()) { + String useOrgSid = orgSidByPath.getData(); + list = baseMapper.selAttItemInfo(useOrgSid); + } + return list; + } + + public PagerVo selGoodsInfo(PagerQuery pq) { + PagerQuery query = new PagerQuery<>(); + BeanUtil.copyProperties(pq, query); + AsServicePackageQuery params = pq.getParams(); + ResultBean orgSidByPath = sysStaffOrgFeign.getOrgSidByPath(params.getOrgPath()); + if (orgSidByPath.getSuccess()) { + String useOrgSid = orgSidByPath.getData(); + WmsGoodsPackageQuery queryParams = query.getParams(); + queryParams.setUseOrgSid(useOrgSid); + } + ResultBean> voResultBean = wmsGoodsFeign.getPackageGoodsVo(query); + PagerVo vo = new PagerVo<>(); + if (voResultBean.getSuccess()) { + PagerVo data = voResultBean.getData(); + BeanUtil.copyProperties(data, vo); + } return vo; } } \ No newline at end of file diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicepackageaitem/AsServicePackageAitemMapper.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicepackageaitem/AsServicePackageAitemMapper.java index d3b797dbae..9cf326f779 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicepackageaitem/AsServicePackageAitemMapper.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicepackageaitem/AsServicePackageAitemMapper.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 org.apache.ibatis.annotations.Delete; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; @@ -62,4 +63,10 @@ public interface AsServicePackageAitemMapper extends BaseMapper selectListVo(); + + @Delete("DELETE FROM as_service_package_aitem WHERE packageSid = #{sid}") + void delByMainSid(String sid); + + @Select("select * from as_service_package_aitem WHERE packageSid = #{sid}") + List getByMainSid(String sid); } \ No newline at end of file diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicepackageaitem/AsServicePackageAitemService.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicepackageaitem/AsServicePackageAitemService.java index c103b66404..24e55577db 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicepackageaitem/AsServicePackageAitemService.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicepackageaitem/AsServicePackageAitemService.java @@ -41,6 +41,8 @@ import com.yxt.anrui.as.api.asservicepackageaitem.AsServicePackageAitemDto; import org.springframework.stereotype.Service; +import java.util.List; + /** * Project: yxt-as(售后服务)
* File: AsServicePackageAitemService.java
@@ -62,7 +64,11 @@ public class AsServicePackageAitemService extends MybatisBaseService qw = new QueryWrapper<>(); return qw; } - + + public void delByMainSid(String sid) { + baseMapper.delByMainSid(sid); + } + public PagerVo listPageVo(PagerQuery pq) { AsServicePackageAitemQuery query = pq.getParams(); QueryWrapper qw = createQueryWrapper(query); @@ -103,4 +109,8 @@ public class AsServicePackageAitemService extends MybatisBaseService getByMainSid(String sid) { + return baseMapper.getByMainSid(sid); + } } \ No newline at end of file diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicepackagegoods/AsServicePackageGoodsMapper.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicepackagegoods/AsServicePackageGoodsMapper.java index 28b4ca1d65..bf6a257bc4 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicepackagegoods/AsServicePackageGoodsMapper.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicepackagegoods/AsServicePackageGoodsMapper.java @@ -29,11 +29,13 @@ 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 org.apache.ibatis.annotations.Delete; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; import com.yxt.anrui.as.api.asservicepackagegoods.AsServicePackageGoods; import com.yxt.anrui.as.api.asservicepackagegoods.AsServicePackageGoodsVo; +import org.springframework.web.bind.annotation.DeleteMapping; import java.util.List; @@ -53,13 +55,19 @@ import java.util.List; @Mapper public interface AsServicePackageGoodsMapper extends BaseMapper { - //@Update("update as_service_package_goods 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 as_service_package_goods") - List selectListVo(); + //@Update("update as_service_package_goods 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 as_service_package_goods") + List selectListVo(); + + @Delete("DELETE FROM as_service_package_goods WHERE packageSid = #{sid}") + void delByMainSid(@Param("sid") String sid); + + @Select("select * from as_service_package_goods WHERE packageSid = #{sid}") + List getByMainSid(String sid); } \ No newline at end of file diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicepackagegoods/AsServicePackageGoodsService.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicepackagegoods/AsServicePackageGoodsService.java index c8cb3d7114..19d13ab147 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicepackagegoods/AsServicePackageGoodsService.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicepackagegoods/AsServicePackageGoodsService.java @@ -41,6 +41,8 @@ import com.yxt.anrui.as.api.asservicepackagegoods.AsServicePackageGoodsDto; import org.springframework.stereotype.Service; +import java.util.List; + /** * Project: yxt-as(售后服务)
* File: AsServicePackageGoodsService.java
@@ -103,4 +105,12 @@ public class AsServicePackageGoodsService extends MybatisBaseService getByMainSid(String sid) { + return baseMapper.getByMainSid(sid); + } } \ No newline at end of file diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicepackagesitem/AsServicePackageSitemMapper.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicepackagesitem/AsServicePackageSitemMapper.java index 1e9761c2e3..fbfc5413c1 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicepackagesitem/AsServicePackageSitemMapper.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicepackagesitem/AsServicePackageSitemMapper.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 org.apache.ibatis.annotations.Delete; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; @@ -62,4 +63,10 @@ public interface AsServicePackageSitemMapper extends BaseMapper selectListVo(); + + @Delete("DELETE FROM as_service_package_sitem WHERE packageSid = #{sid}") + void delByMainSid(String sid); + + @Select("select * from as_service_package_sitem WHERE packageSid = #{sid}") + List getByMainSid(String sid); } \ No newline at end of file diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicepackagesitem/AsServicePackageSitemService.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicepackagesitem/AsServicePackageSitemService.java index 907753ed29..723b3e31d2 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicepackagesitem/AsServicePackageSitemService.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicepackagesitem/AsServicePackageSitemService.java @@ -41,6 +41,8 @@ import com.yxt.anrui.as.api.asservicepackagesitem.AsServicePackageSitemDto; import org.springframework.stereotype.Service; +import java.util.List; + /** * Project: yxt-as(售后服务)
* File: AsServicePackageSitemService.java
@@ -103,4 +105,11 @@ public class AsServicePackageSitemService extends MybatisBaseService getByMainSid(String sid) { + return baseMapper.getByMainSid(sid); + } } \ No newline at end of file diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/feign/wms/wmsgoods/WmsGoodsFeign.java b/yxt-as/src/main/java/com/yxt/anrui/as/feign/wms/wmsgoods/WmsGoodsFeign.java new file mode 100644 index 0000000000..799e244f9d --- /dev/null +++ b/yxt-as/src/main/java/com/yxt/anrui/as/feign/wms/wmsgoods/WmsGoodsFeign.java @@ -0,0 +1,31 @@ +package com.yxt.anrui.as.feign.wms.wmsgoods; + +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.ApiOperation; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestParam; + +import java.util.List; + +/** + * @description: 商品基础信息 + * @author: fzz + * @date: 2024/3/7 + **/ +@FeignClient( + contextId = "yxt-wms-WmsGoods", + name = "yxt-wms", + path = "apiadmin/base/wmsgoods", + fallback = WmsGoodsFeignFallback.class +) +public interface WmsGoodsFeign { + + @ApiOperation("查询分公司下所有的商品信息") + @PostMapping("/getPackageGoodsVo") + public ResultBean> getPackageGoodsVo(@RequestBody PagerQuery pq); +} diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/feign/wms/wmsgoods/WmsGoodsFeignFallback.java b/yxt-as/src/main/java/com/yxt/anrui/as/feign/wms/wmsgoods/WmsGoodsFeignFallback.java new file mode 100644 index 0000000000..7d72e00b2e --- /dev/null +++ b/yxt-as/src/main/java/com/yxt/anrui/as/feign/wms/wmsgoods/WmsGoodsFeignFallback.java @@ -0,0 +1,56 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.as.feign.wms.wmsgoods; + +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-fin(安瑞财务)
+ * File: FinManufacturerBankFeignFallback.java
+ * Class: com.yxt.anrui.fin.api.finmanufacturerbank.FinManufacturerBankFeignFallback
+ * Description: 公司开户账号表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-08-03 15:00:11
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Component +public class WmsGoodsFeignFallback implements WmsGoodsFeign { + + + @Override + public ResultBean> getPackageGoodsVo(PagerQuery pq) { + return null; + } +} \ No newline at end of file diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/feign/wms/wmsgoods/WmsGoodsPackageQuery.java b/yxt-as/src/main/java/com/yxt/anrui/as/feign/wms/wmsgoods/WmsGoodsPackageQuery.java new file mode 100644 index 0000000000..c2c09c86dd --- /dev/null +++ b/yxt-as/src/main/java/com/yxt/anrui/as/feign/wms/wmsgoods/WmsGoodsPackageQuery.java @@ -0,0 +1,15 @@ +package com.yxt.anrui.as.feign.wms.wmsgoods; + +import com.yxt.common.core.query.Query; +import lombok.Data; + +/** + * @author Fan + * @description + * @date 2024/3/12 15:33 + */ +@Data +public class WmsGoodsPackageQuery implements Query { + private String useOrgSid; + private String goodsName; +} diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/feign/wms/wmsgoods/WmsGoodsPackageVo.java b/yxt-as/src/main/java/com/yxt/anrui/as/feign/wms/wmsgoods/WmsGoodsPackageVo.java new file mode 100644 index 0000000000..4f8c00fe3c --- /dev/null +++ b/yxt-as/src/main/java/com/yxt/anrui/as/feign/wms/wmsgoods/WmsGoodsPackageVo.java @@ -0,0 +1,48 @@ +package com.yxt.anrui.as.feign.wms.wmsgoods; + +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +/** + * @author Fan + * @description + * @date 2024/3/7 14:29 + */ +@Data +public class WmsGoodsPackageVo { + @ApiModelProperty("商品sid") + private String goodsSid; // 商品sid + @ApiModelProperty("商品名称") + private String goodsName; // 商品名称 + @ApiModelProperty("商品编码（图号）") + private String goodsCode; // 商品编码（图号） + @ApiModelProperty("车型sid") + private String goodsModelSid; // 车型sid + @ApiModelProperty("车型") + private String goodsModel; // 车型 + @ApiModelProperty("单位") + private String unit; // 单位 +// @ApiModelProperty("仓库sid") +// private String warehouseSid; // 仓库sid +// @ApiModelProperty("仓库名称") +// private String warehouse; // 仓库名称 +// @ApiModelProperty("科目sid") +// private String subjectSid; // 科目sid +// @ApiModelProperty("科目") +// private String subject; // 科目 +// @ApiModelProperty("销售价") +// private String price; // 销售价 +// @ApiModelProperty("数量") +// private String count; // 数量 +// @ApiModelProperty("折扣（0-10，0免费，10不打折）") +// private String discount; // 折扣（0-10，0免费，10不打折） +// @ApiModelProperty("优惠金额（=销售价*(折扣*0.1））") +// private String discountAmount; // 优惠金额（=销售价*(折扣*0.1）） +// @ApiModelProperty("金额（销售价-优惠金额）") +// private String amount; // 金额（销售价-优惠金额） + @ApiModelProperty("规格") + private String specification; // 规格 +}