Browse Source

修改

master
ligaode 3 days ago
parent
commit
bc88e1d52b
  1. 6
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateFeign.java
  2. 16
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateRest.java
  3. 24
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateService.java

6
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<ScmSpecialRebateDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
@ApiOperation("清空")
@GetMapping("/clear/{sid}")
@ResponseBody
public ResultBean<ScmVehRebateDetailsVo> clear(@PathVariable("sid") String sid);
@ApiOperation("专项返利未预提申请选择专项返利信息")
@PostMapping("/withApplyGetSpecialRebate")
@ResponseBody

16
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<ScmVehRebateDetailsVo> clear(String sid) {
ResultBean rb = ResultBean.fireFail();
ScmSpecialRebateDetailsVo vo = scmSpecialRebateService.clear(sid);
return rb.success().setData(vo);
}
@Override
public ResultBean<PagerVo<ScmSpecialRebateVo>> withApplyGetSpecialRebate(PagerQuery<ScmSpecialRebateQuery> pq) {
ResultBean rb = ResultBean.fireFail();

24
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<ScmSpecialRebate
public List<ScmVehRebateTypeStatMxVo> getTypeDetail(List<String> 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;
}
}
Loading…
Cancel
Save