diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java index cbd13f36b2..764f32305d 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java @@ -3416,6 +3416,7 @@ public class BaseVehicleService extends MybatisBaseService> specialRebateWithDetails(@PathVariable("sid") String sid); + public ResultBean> specialRebateWithDetails(@RequestBody String[] sids); } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatewith/ScmSpecialRebateWithFeignFallback.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatewith/ScmSpecialRebateWithFeignFallback.java index 11d672a958..85f3a8c6f4 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatewith/ScmSpecialRebateWithFeignFallback.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatewith/ScmSpecialRebateWithFeignFallback.java @@ -26,31 +26,15 @@ package com.yxt.anrui.scm.api.scmspecialrebatewith; import com.yxt.anrui.scm.api.scmspecialrebate.ScmSpecialRebateDetailsVo; -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-scm(专项返利)
- * File: ScmSpecialRebateWithFeignFallback.java
- * Class: com.yxt.anrui.scm.api.scmspecialrebatewith.ScmSpecialRebateWithFeignFallback
- * Description: 专项返利预提表.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2022-09-09 09:14:10
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ @Component public class ScmSpecialRebateWithFeignFallback implements ScmSpecialRebateWithFeign { @Override - public ResultBean> specialRebateWithDetails(String sid) { + public ResultBean> specialRebateWithDetails(String[] sids) { return null; } } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatewith/ScmVehRebateWithFeign.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatewith/ScmVehRebateWithFeign.java index 6431b091c3..3c21b6a278 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatewith/ScmVehRebateWithFeign.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatewith/ScmVehRebateWithFeign.java @@ -81,7 +81,7 @@ public interface ScmVehRebateWithFeign { public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid); @ApiOperation("单车返利预提查看详情") - @GetMapping("/vehRebateWithDetails/{sid}") + @PostMapping("/vehRebateWithDetails") @ResponseBody - public ResultBean> vehRebateWithDetails(@PathVariable("sid") String sid); + public ResultBean> vehRebateWithDetails(@RequestBody String[] sids); } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatewith/ScmVehRebateWithFeignFallback.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatewith/ScmVehRebateWithFeignFallback.java index f08d5a4ba1..1ba501e34c 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatewith/ScmVehRebateWithFeignFallback.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatewith/ScmVehRebateWithFeignFallback.java @@ -25,28 +25,13 @@ *********************************************************/ package com.yxt.anrui.scm.api.scmvehrebatewith; -import com.yxt.anrui.scm.api.scmvehrebate.ScmVehRebate; import com.yxt.anrui.scm.api.scmvehrebate.ScmVehRebateDetailsVo; 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-scm(单车返利预提申请)
- * File: ScmVehRebateWithFeignFallback.java
- * Class: com.yxt.anrui.scm.api.scmvehrebatewith.ScmVehRebateWithFeignFallback
- * Description: 单车返利预提表.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2022-08-25 09:04:38
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ @Component public class ScmVehRebateWithFeignFallback implements ScmVehRebateWithFeign { @@ -73,7 +58,7 @@ public class ScmVehRebateWithFeignFallback implements ScmVehRebateWithFeign { } @Override - public ResultBean> vehRebateWithDetails(String sid) { + public ResultBean> vehRebateWithDetails(String[] sids) { return null; } } \ No newline at end of file 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 4b990a3dd5..21365754e1 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 @@ -368,6 +368,9 @@ public class ScmSpecialRebateService extends MybatisBaseService> specialRebateWithDetails(String sid) { - return scmSpecialRebateWithService.specialRebateWithDetails(sid); + public ResultBean> specialRebateWithDetails(String[] sids) { + return scmSpecialRebateWithService.specialRebateWithDetails(sids); } @ApiOperation("导出") @PostMapping("/excelList") public void excelList(@RequestParam("sid") String sid) { List strings = scmSpecialRebateWithService.fetchSpecialReBateSidByMainSid(sid); - String specialSid = String.join(",", strings); - List data = scmSpecialRebateWithService.specialRebateWithDetails(specialSid).getData(); + List data = scmSpecialRebateWithService.specialRebateWithDetails(strings.toArray(new String[0])).getData(); List excelVos = new ArrayList<>(); Integer i = 1; for (ScmSpecialRebateDetailsVo datum : data) { diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatewith/ScmSpecialRebateWithService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatewith/ScmSpecialRebateWithService.java index 62b835e0b1..ae760b8b71 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatewith/ScmSpecialRebateWithService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatewith/ScmSpecialRebateWithService.java @@ -80,10 +80,9 @@ public class ScmSpecialRebateWithService extends MybatisBaseService> specialRebateWithDetails(String sid) { + public ResultBean> specialRebateWithDetails(String[] sids) { ResultBean rb = ResultBean.fireFail(); List scmSpecialRebateDetailsVos = new ArrayList<>(); - String[] sids = sid.split(","); for (String s : sids) { ScmSpecialRebate scmSpecialRebate = scmSpecialRebateService.fetchBySid(s); ScmSpecialRebateDetailsVo scmSpecialRebateDetailsVo = new ScmSpecialRebateDetailsVo(); diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateRest.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateRest.java index cad5954d44..42b32d7eb6 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateRest.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateRest.java @@ -27,6 +27,7 @@ package com.yxt.anrui.scm.biz.scmvehrebate; import com.yxt.anrui.scm.api.scmvehrebate.*; import com.yxt.common.base.utils.ExportExcelUtils; +import com.yxt.common.base.utils.StringUtils; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; @@ -335,6 +336,9 @@ public class ScmVehRebateRest implements ScmVehRebateFeign { public ResultBean update(ScmVehRebateVehDto dto) { ResultBean rb = ResultBean.fireFail(); dto.setStayDetermineMoneyNew(dto.getStayDetermineMoney()); + if (StringUtils.isBlank(dto.getSecondaryUploadDate())){ + dto.setSecondaryUploadDate(""); + } scmVehRebateService.updateBySid(dto, dto.getSid()); return rb.success().setMsg("修改成功"); } diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapplydetail/ScmVehrebateCheckapplydetailMapper.xml b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapplydetail/ScmVehrebateCheckapplydetailMapper.xml index 7cebc07ce1..b274517a7c 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapplydetail/ScmVehrebateCheckapplydetailMapper.xml +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapplydetail/ScmVehrebateCheckapplydetailMapper.xml @@ -25,7 +25,7 @@ svc.brandName, svc.rebateTypeKey, svc.rebateTypeValue, - SUM(svc.estimateRebate) withRebate, + SUM(CAST(svc.estimateRebate AS DECIMAL(10, 2))) withRebate, COUNT(*) num, GROUP_CONCAT(svc.vehRebateSid) vehRebateSid, SUM(IF(svc.onceCheckState = 1, svc.secondaryUploadMoney, @@ -49,7 +49,7 @@ svc.brandName, svc.palceGenDate, svc.withholdingDate, - SUM(svc.estimateRebate) withRebate, + SUM(CAST(svc.estimateRebate AS DECIMAL(10, 2))) withRebate, COUNT(*) num, GROUP_CONCAT(svc.vehRebateSid) vehRebateSid, SUM(IF(svc.onceCheckState = 1, svc.secondaryUploadMoney, @@ -80,7 +80,7 @@ svc.brandName, CONCAT(svc.purchaseSystemName, svc.brandName, '本月上传返利核对及调整金额合计') title, COUNT(*) numTotal, - SUM(svc.estimateRebate) withRebateTotal, + SUM(CAST(svc.estimateRebate AS DECIMAL(10, 2))) withRebateTotal, SUM(svc.expectTreatCost + svc.expectSuppCost) withholdCostTotal, SUM(IF(svc.onceCheckState = 1, svc.secondaryUploadMoney, svc.uploadMoney + @@ -103,7 +103,7 @@ CONCAT(svc.purchaseSystemName, svc.brandName, svc.rebateTypeValue, '明细') title, svc.rebateTypeValue, COUNT(*) num, - SUM(svc.estimateRebate) withRebate, + SUM(CAST(svc.estimateRebate AS DECIMAL(10, 2))) withRebate, SUM(svc.expectTreatCost + svc.expectSuppCost) withholdCost, SUM(IF(svc.onceCheckState = 1, svc.secondaryUploadMoney, svc.uploadMoney + svc.secondaryUploadMoney)) uploadMoney, @@ -127,7 +127,7 @@ CONCAT(svc.purchaseSystemName, svc.brandName, svc.withholdingDate, '预提明细') title, svc.withholdingDate, COUNT(*) num, - SUM(svc.estimateRebate) withRebate, + SUM(CAST(svc.estimateRebate AS DECIMAL(10, 2))) withRebate, SUM(svc.expectTreatCost + svc.expectSuppCost) withholdCost, SUM(IF(svc.onceCheckState = 1, svc.secondaryUploadMoney, svc.uploadMoney + svc.secondaryUploadMoney)) uploadMoney, diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewith/ScmVehRebateWithRest.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewith/ScmVehRebateWithRest.java index 49e240cf01..9f37df06b4 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewith/ScmVehRebateWithRest.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewith/ScmVehRebateWithRest.java @@ -105,16 +105,15 @@ public class ScmVehRebateWithRest implements ScmVehRebateWithFeign { } @Override - public ResultBean> vehRebateWithDetails(String sid) { - return scmVehRebateWithService.vehRebateWithDetails(sid); + public ResultBean> vehRebateWithDetails(String[] sids) { + return scmVehRebateWithService.vehRebateWithDetails(sids); } @ApiOperation("导出") @PostMapping("/excelList") public void excelList(@RequestParam("sid") String sid) { List strings = scmVehRebateWithService.fetchVehReBateSidByMainSid(sid); - String vehRebateSid = String.join(",", strings); - List data = scmVehRebateWithService.vehRebateWithDetails(vehRebateSid).getData(); + List data = scmVehRebateWithService.vehRebateWithDetails(strings.toArray(new String[0])).getData(); List excelVos = new ArrayList<>(); Integer i = 1; for (ScmVehRebateDetailsVo datum : data) { diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewith/ScmVehRebateWithService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewith/ScmVehRebateWithService.java index 61e9da0e2b..e3fea34994 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewith/ScmVehRebateWithService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewith/ScmVehRebateWithService.java @@ -140,10 +140,9 @@ public class ScmVehRebateWithService extends MybatisBaseService> vehRebateWithDetails(String sid) { + public ResultBean> vehRebateWithDetails(String[] sids) { ResultBean rb = ResultBean.fireFail(); List scmVehRebateDetailsVos = new ArrayList<>(); - String[] sids = sid.split(","); for (String s : sids) { ScmVehRebate scmVehRebate = scmVehRebateService.fetchBySid(s); ScmVehRebateDetailsVo scmVehRebateDetailsVo = new ScmVehRebateDetailsVo(); diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/specialrebatewithapply/AppSpecialRebateWithApplyService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/specialrebatewithapply/AppSpecialRebateWithApplyService.java index 19af05c61c..b32c8e2a7d 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/specialrebatewithapply/AppSpecialRebateWithApplyService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/specialrebatewithapply/AppSpecialRebateWithApplyService.java @@ -77,7 +77,8 @@ public class AppSpecialRebateWithApplyService { public ResultBean> specialRebateWithDetails(String sid) { ResultBean rb = ResultBean.fireFail(); List appSpecialRebateDetailsVos = new ArrayList<>(); - List data = scmSpecialRebateWithFeign.specialRebateWithDetails(sid).getData(); + String[] sids = sid.split(","); + List data = scmSpecialRebateWithFeign.specialRebateWithDetails(sids).getData(); for (ScmSpecialRebateDetailsVo datum : data) { AppSpecialRebateDetailsVo appSpecialRebateDetailsVo = new AppSpecialRebateDetailsVo(); BeanUtil.copyProperties(datum,appSpecialRebateDetailsVo); diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/vehrebatewithapply/AppVehRebateWithApplyService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/vehrebatewithapply/AppVehRebateWithApplyService.java index dff73d6951..35bc2d71ce 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/vehrebatewithapply/AppVehRebateWithApplyService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/vehrebatewithapply/AppVehRebateWithApplyService.java @@ -79,7 +79,8 @@ public class AppVehRebateWithApplyService { public ResultBean> specialRebateWithDetails(String sid) { ResultBean rb = ResultBean.fireFail(); List appVehRebateDetailsVos = new ArrayList<>(); - List data = scmVehRebateWithFeign.vehRebateWithDetails(sid).getData(); + String[] sids = sid.split(","); + List data = scmVehRebateWithFeign.vehRebateWithDetails(sids).getData(); for (ScmVehRebateDetailsVo datum : data) { AppVehRebateDetailsVo appVehRebateDetailsVo = new AppVehRebateDetailsVo(); BeanUtil.copyProperties(datum,appVehRebateDetailsVo);