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