From bc88e1d52b27d12e9ce05abb0e90f296ffdec643 Mon Sep 17 00:00:00 2001 From: ligaode Date: Thu, 29 May 2025 15:22:49 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ScmSpecialRebateFeign.java | 6 +++++ .../ScmSpecialRebateRest.java | 16 ++++++------- .../ScmSpecialRebateService.java | 24 +++++++++++++++++++ 3 files changed, 38 insertions(+), 8 deletions(-) diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateFeign.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateFeign.java index 9ed1a3c108..ef62aded0c 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateFeign.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateFeign.java @@ -25,6 +25,7 @@ *********************************************************/ package com.yxt.anrui.scm.api.scmspecialrebate; +import com.yxt.anrui.scm.api.scmvehrebate.ScmVehRebateDetailsVo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import com.yxt.common.core.query.PagerQuery; @@ -77,6 +78,11 @@ public interface ScmSpecialRebateFeign { @ResponseBody public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid); + @ApiOperation("清空") + @GetMapping("/clear/{sid}") + @ResponseBody + public ResultBean clear(@PathVariable("sid") String sid); + @ApiOperation("专项返利未预提申请选择专项返利信息") @PostMapping("/withApplyGetSpecialRebate") @ResponseBody diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateRest.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateRest.java index e66023aa45..ee31d6688b 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateRest.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateRest.java @@ -25,14 +25,8 @@ *********************************************************/ package com.yxt.anrui.scm.biz.scmspecialrebate; -import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.date.DateUtil; import com.yxt.anrui.scm.api.scmspecialrebate.*; -import com.yxt.anrui.scm.api.scmspecialrebatecheckapply.SpecialRebateCheckExcelVo; -import com.yxt.anrui.scm.api.scmspecialrebatewithapply.ScmSpecialRebateWithApply; -import com.yxt.anrui.scm.api.scmvehrebate.ScmVehRebateExcelVo; -import com.yxt.anrui.scm.biz.scmspecialrebatewith.ScmSpecialRebateWithService; -import com.yxt.anrui.scm.biz.scmspecialrebatewithapply.ScmSpecialRebateWithApplyService; +import com.yxt.anrui.scm.api.scmvehrebate.ScmVehRebateDetailsVo; import com.yxt.common.base.utils.ExportExcelUtils; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; @@ -55,7 +49,6 @@ import java.io.OutputStream; import java.io.UnsupportedEncodingException; import java.net.URLEncoder; import java.text.ParseException; -import java.util.ArrayList; import java.util.List; @Api(tags = "专项返利表") @@ -256,6 +249,13 @@ public class ScmSpecialRebateRest implements ScmSpecialRebateFeign { return rb.success().setData(vo); } + @Override + public ResultBean clear(String sid) { + ResultBean rb = ResultBean.fireFail(); + ScmSpecialRebateDetailsVo vo = scmSpecialRebateService.clear(sid); + return rb.success().setData(vo); + } + @Override public ResultBean> withApplyGetSpecialRebate(PagerQuery pq) { ResultBean rb = ResultBean.fireFail(); diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateService.java index 1fa3cf2968..0ed252b098 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateService.java @@ -2496,4 +2496,28 @@ public class ScmSpecialRebateService extends MybatisBaseService getTypeDetail(List sids) { return baseMapper.getTypeDetail(sids); } + + public ScmSpecialRebateDetailsVo clear(String sid) { + ScmSpecialRebate scmSpecialRebate = fetchBySid(sid); + scmSpecialRebate.setUploadDate(""); + scmSpecialRebate.setUploadMoney("0"); + scmSpecialRebate.setStayDetermineMoney("0"); + scmSpecialRebate.setStayDetermineMoneyNew("0"); + scmSpecialRebate.setOnceItureCost(BigDecimal.ZERO); + scmSpecialRebate.setOnceTreatCost(BigDecimal.ZERO); + scmSpecialRebate.setOnceSuppCost(BigDecimal.ZERO); + scmSpecialRebate.setOnceSuppRemark(""); + scmSpecialRebate.setSecondaryUploadDate(""); + scmSpecialRebate.setSecondaryUploadMoney("0"); + scmSpecialRebate.setSecondItureCost(BigDecimal.ZERO); + scmSpecialRebate.setSecondTreatCost(BigDecimal.ZERO); + scmSpecialRebate.setSecondSuppCost(BigDecimal.ZERO); + scmSpecialRebate.setSecondSuppRemark(""); + scmSpecialRebate.setIsAdjustment(""); + scmSpecialRebate.setAdjustmentMoney("0"); + scmSpecialRebate.setAdjustmentRemarks(""); + updateById(scmSpecialRebate); + ScmSpecialRebateDetailsVo scmSpecialRebateDetailsVo = fetchDetailsVoBySid(sid); + return scmSpecialRebateDetailsVo; + } } \ No newline at end of file From 9fbaa0cdaf8a1cb79f51385239dbe43a3271705b Mon Sep 17 00:00:00 2001 From: ligaode Date: Thu, 29 May 2025 15:30:50 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LoanSecondarySalesNotApplyService.java | 7 - .../ScmSpecialRebateFeign.java | 3 +- .../ScmSpecialRebateFeignFallback.java | 141 ------------------ 3 files changed, 1 insertion(+), 150 deletions(-) delete mode 100644 anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateFeignFallback.java diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesnotapply/LoanSecondarySalesNotApplyService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesnotapply/LoanSecondarySalesNotApplyService.java index 4c1906c5ab..f44a412637 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesnotapply/LoanSecondarySalesNotApplyService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesnotapply/LoanSecondarySalesNotApplyService.java @@ -38,15 +38,10 @@ import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder; import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign; import com.yxt.anrui.buscenter.api.bussalesorderborrower.BusSalesOrderBorrowerDetailsVo; import com.yxt.anrui.buscenter.api.bussalesorderborrower.BusSalesOrderBorrowerFeign; -import com.yxt.anrui.buscenter.api.bussalesorderreturnveh.BusSalesOrderReturnVehDetailsVo; -import com.yxt.anrui.buscenter.api.bussalesorderreturnvehapply.BusSalesOrderReturnVehApplyDetailsVo; -import com.yxt.anrui.buscenter.api.bussalesorderreturnvehapply.BusSalesOrderReturnVehPdfVo; import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle; import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleFeign; -import com.yxt.anrui.fin.api.finpaymentapplydetailsbelow.FinPaymentapplyDetailsBelowDetailsVo; import com.yxt.anrui.fin.api.finpaymentrecord.FinPaymentrecordSourceLCVo; import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailed; -import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedDto; import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedFeign; import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailedjr.FinUncollectedReceivablesDetailedJR; import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailedjr.FinUncollectedReceivablesDetailedJRFeign; @@ -72,7 +67,6 @@ import com.yxt.anrui.portal.api.sysuser.SysUserFeign; import com.yxt.anrui.portal.api.sysuser.SysUserVo; import com.yxt.anrui.riskcenter.api.loanfile.LoanFile; import com.yxt.anrui.riskcenter.api.loanfile.LoanFileEnum; -import com.yxt.anrui.riskcenter.api.loanoutboundapply.LoanOutboundApply; import com.yxt.anrui.riskcenter.api.loanrepaymentplandetails.LoanRepaymentPlanDetails; import com.yxt.anrui.riskcenter.api.loanrepurchaseapply.LoanRepurchaseApply; import com.yxt.anrui.riskcenter.api.loanrepurchasecost.LoanRepurchaseCost; @@ -157,7 +151,6 @@ public class LoanSecondarySalesNotApplyService extends MybatisBaseService_/___.' >' "". * - * | | : `- \`.;`\ _ /`;.`/ - ` : | | * - * \ \ `_. \_ __\ /__ _/ .-` / / * - * =====`-.____`.___ \_____/___.-`___.-'===== * - * `=---=' * - * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * - *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* - *********************************************************/ -package com.yxt.anrui.scm.api.scmspecialrebate; - -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 org.springframework.web.multipart.MultipartFile; - -import javax.servlet.http.HttpServletRequest; -import java.io.IOException; -import java.text.ParseException; -import java.util.List; - -/** - * Project: anrui-scm(专项返利管理)
- * File: ScmSpecialRebateFeignFallback.java
- * Class: com.yxt.anrui.scm.api.scmspecialrebate.ScmSpecialRebateFeignFallback
- * Description: 专项返利表.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2022-09-08 16:11:43
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ -@Component -public class ScmSpecialRebateFeignFallback implements ScmSpecialRebateFeign { - - @Override - public ResultBean> listPage(PagerQuery pq){ - ResultBean rb = ResultBean.fireFail(); - return rb.setMsg("接口anrui-scm/scmspecialrebate/listPage无法访问"); - } - - @Override - public ResultBean> listAll(ScmSpecialRebateQuery query) { - return null; - } - - @Override - public ResultBean save(ScmSpecialRebateDto dto){ - return ResultBean.fireFail().setMsg("接口anrui-scm/scmspecialrebate/save无法访问"); - } - - @Override - public ResultBean adjustment(ScmSpecialRebateSpecialAdjDto dto) { - return null; - } - - @Override - public ResultBean delBySids( String[] sids){ - return ResultBean.fireFail().setMsg("接口anrui-scm/scmspecialrebate/delBySids无法访问"); - } - - @Override - public ResultBean fetchDetailsBySid(String sid){ - ResultBean rb = ResultBean.fireFail(); - return rb.setMsg("接口anrui-scm/scmspecialrebate/fetchDetailsBySid无法访问"); - } - - @Override - public ResultBean> withApplyGetSpecialRebate(PagerQuery pq) { - return null; - } - - @Override - public ResultBean> checkApplyGetSpecialRebate(PagerQuery pq) { - return null; - } - - @Override - public ResultBean> checkApplyGetSpecialRebateAll(ScmSpecialRebateQuery query) { - return null; - } - - @Override - public ResultBean> checkApplyGetAlreadyUploadSpecialRebate(PagerQuery pq) { - return null; - } - - @Override - public ResultBean> stayDisRebate(PagerQuery pq) { - return null; - } - - @Override - public void downloadExcel() { - - } - - @Override - public ResultBean getExcelInfo(MultipartFile file, HttpServletRequest request, String userSid, String orgPath) throws IOException, ParseException { - return null; - } - - @Override - public void excelListOne(ScmSpecialRebateQuery scmSpecialRebateQuery) { - - } - - @Override - public ResultBean getExcelOneInfo(MultipartFile file, HttpServletRequest request, String userSid, String orgPath) throws IOException, ParseException { - return null; - } - - @Override - public void excelListTwo(ScmSpecialRebateQuery scmSpecialRebateQuery) { - - } - - @Override - public ResultBean getExcelTwoInfo(MultipartFile file, HttpServletRequest request, String userSid, String orgPath) throws IOException, ParseException { - return null; - } -} \ No newline at end of file