更改

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<BaseVehicleMapper, Ba
                     .or().eq("bv.vehicleState", VehicleState.StockEnum.DC_STOCK.getCode())
                     .or().eq("bv.vehicleState", VehicleState.StockEnum.NX_STOCK.getCode())
                     .or().eq("bv.vehicleState", VehicleState.StockEnum.DCZ_STOCK.getCode())
+                    .or().eq("bv.vehicleState", VehicleState.StockEnum.RETURN_STOCK.getCode())
             );
         }
         return qw;

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatewith/ScmSpecialRebateWithFeign.java

@@ -58,7 +58,7 @@ import java.util.List;
 public interface ScmSpecialRebateWithFeign {
 
     @ApiOperation("专项返利预提查看详情")
-    @GetMapping("/specialRebateWithDetails/{sid}")
+    @PostMapping("/specialRebateWithDetails")
     @ResponseBody
-    public ResultBean<List<ScmSpecialRebateDetailsVo>> specialRebateWithDetails(@PathVariable("sid") String sid);
+    public ResultBean<List<ScmSpecialRebateDetailsVo>> specialRebateWithDetails(@RequestBody String[] sids);
 }

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(专项返利) <br/>
- * File: ScmSpecialRebateWithFeignFallback.java <br/>
- * Class: com.yxt.anrui.scm.api.scmspecialrebatewith.ScmSpecialRebateWithFeignFallback <br/>
- * Description: 专项返利预提表. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2022-09-09 09:14:10 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
 @Component
 public class ScmSpecialRebateWithFeignFallback implements ScmSpecialRebateWithFeign {
 
 	@Override
-	public ResultBean<List<ScmSpecialRebateDetailsVo>> specialRebateWithDetails(String sid) {
+	public ResultBean<List<ScmSpecialRebateDetailsVo>> specialRebateWithDetails(String[] sids) {
 		return null;
 	}
 }

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<ScmVehRebateWithDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
 
     @ApiOperation("单车返利预提查看详情")
-    @GetMapping("/vehRebateWithDetails/{sid}")
+    @PostMapping("/vehRebateWithDetails")
     @ResponseBody
-    public ResultBean<List<ScmVehRebateDetailsVo>> vehRebateWithDetails(@PathVariable("sid") String sid);
+    public ResultBean<List<ScmVehRebateDetailsVo>> vehRebateWithDetails(@RequestBody String[] sids);
 }

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(单车返利预提申请) <br/>
- * File: ScmVehRebateWithFeignFallback.java <br/>
- * Class: com.yxt.anrui.scm.api.scmvehrebatewith.ScmVehRebateWithFeignFallback <br/>
- * Description: 单车返利预提表. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2022-08-25 09:04:38 <br/>
- *
- * @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<List<ScmVehRebateDetailsVo>> vehRebateWithDetails(String sid) {
+	public ResultBean<List<ScmVehRebateDetailsVo>> vehRebateWithDetails(String[] sids) {
 		return null;
 	}
 }

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<ScmSpecialRebate
             return rb.setMsg("返利信息已存在");
         }
         dto.setStayDetermineMoneyNew(dto.getStayDetermineMoney());
+        if (StringUtils.isBlank(dto.getSecondaryUploadDate())){
+            dto.setSecondaryUploadDate("");
+        }
         this.updateBySid(dto, dtoSid);
         return rb.success();
     }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatewith/ScmSpecialRebateWithRest.java

@@ -70,16 +70,15 @@ public class ScmSpecialRebateWithRest implements ScmSpecialRebateWithFeign {
 	HttpServletResponse response;
 
 	@Override
-	public ResultBean<List<ScmSpecialRebateDetailsVo>> specialRebateWithDetails(String sid) {
-		return scmSpecialRebateWithService.specialRebateWithDetails(sid);
+	public ResultBean<List<ScmSpecialRebateDetailsVo>> specialRebateWithDetails(String[] sids) {
+		return scmSpecialRebateWithService.specialRebateWithDetails(sids);
 	}
 
 	@ApiOperation("导出")
 	@PostMapping("/excelList")
 	public void excelList(@RequestParam("sid") String sid) {
 		List<String> strings = scmSpecialRebateWithService.fetchSpecialReBateSidByMainSid(sid);
-		String specialSid = String.join(",", strings);
-		List<ScmSpecialRebateDetailsVo> data = scmSpecialRebateWithService.specialRebateWithDetails(specialSid).getData();
+		List<ScmSpecialRebateDetailsVo> data = scmSpecialRebateWithService.specialRebateWithDetails(strings.toArray(new String[0])).getData();
 		List<SpectalRebateWithExcelVo> excelVos = new ArrayList<>();
 		Integer i = 1;
 		for (ScmSpecialRebateDetailsVo datum : data) {

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<ScmSpecialRe
         return baseMapper.fetchSpecialReBateSidByMainSid(businessSid);
     }
 
-    public ResultBean<List<ScmSpecialRebateDetailsVo>> specialRebateWithDetails(String sid) {
+    public ResultBean<List<ScmSpecialRebateDetailsVo>> specialRebateWithDetails(String[] sids) {
         ResultBean rb = ResultBean.fireFail();
         List<ScmSpecialRebateDetailsVo> scmSpecialRebateDetailsVos = new ArrayList<>();
-        String[] sids = sid.split(",");
         for (String s : sids) {
             ScmSpecialRebate scmSpecialRebate = scmSpecialRebateService.fetchBySid(s);
             ScmSpecialRebateDetailsVo scmSpecialRebateDetailsVo = new ScmSpecialRebateDetailsVo();

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("修改成功");
     }

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,

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<List<ScmVehRebateDetailsVo>> vehRebateWithDetails(String sid) {
-        return scmVehRebateWithService.vehRebateWithDetails(sid);
+    public ResultBean<List<ScmVehRebateDetailsVo>> vehRebateWithDetails(String[] sids) {
+        return scmVehRebateWithService.vehRebateWithDetails(sids);
     }
 
     @ApiOperation("导出")
     @PostMapping("/excelList")
     public void excelList(@RequestParam("sid") String sid) {
         List<String> strings = scmVehRebateWithService.fetchVehReBateSidByMainSid(sid);
-        String vehRebateSid = String.join(",", strings);
-        List<ScmVehRebateDetailsVo> data = scmVehRebateWithService.vehRebateWithDetails(vehRebateSid).getData();
+        List<ScmVehRebateDetailsVo> data = scmVehRebateWithService.vehRebateWithDetails(strings.toArray(new String[0])).getData();
         List<ExcelVo> excelVos = new ArrayList<>();
         Integer i = 1;
         for (ScmVehRebateDetailsVo datum : data) {

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<ScmVehRebateWith
         return baseMapper.fetchByMainSid(sid);
     }
 
-    public ResultBean<List<ScmVehRebateDetailsVo>> vehRebateWithDetails(String sid) {
+    public ResultBean<List<ScmVehRebateDetailsVo>> vehRebateWithDetails(String[] sids) {
         ResultBean rb = ResultBean.fireFail();
         List<ScmVehRebateDetailsVo> scmVehRebateDetailsVos = new ArrayList<>();
-        String[] sids = sid.split(",");
         for (String s : sids) {
             ScmVehRebate scmVehRebate = scmVehRebateService.fetchBySid(s);
             ScmVehRebateDetailsVo scmVehRebateDetailsVo = new ScmVehRebateDetailsVo();

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<List<AppSpecialRebateDetailsVo>> specialRebateWithDetails(String sid) {
         ResultBean rb = ResultBean.fireFail();
         List<AppSpecialRebateDetailsVo> appSpecialRebateDetailsVos = new ArrayList<>();
-        List<ScmSpecialRebateDetailsVo> data = scmSpecialRebateWithFeign.specialRebateWithDetails(sid).getData();
+        String[] sids = sid.split(",");
+        List<ScmSpecialRebateDetailsVo> data = scmSpecialRebateWithFeign.specialRebateWithDetails(sids).getData();
         for (ScmSpecialRebateDetailsVo datum : data) {
             AppSpecialRebateDetailsVo appSpecialRebateDetailsVo = new AppSpecialRebateDetailsVo();
             BeanUtil.copyProperties(datum,appSpecialRebateDetailsVo);

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<List<AppVehRebateDetailsVo>> specialRebateWithDetails(String sid) {
         ResultBean rb = ResultBean.fireFail();
         List<AppVehRebateDetailsVo> appVehRebateDetailsVos = new ArrayList<>();
-        List<ScmVehRebateDetailsVo> data = scmVehRebateWithFeign.vehRebateWithDetails(sid).getData();
+        String[] sids = sid.split(",");
+        List<ScmVehRebateDetailsVo> data = scmVehRebateWithFeign.vehRebateWithDetails(sids).getData();
         for (ScmVehRebateDetailsVo datum : data) {
             AppVehRebateDetailsVo appVehRebateDetailsVo = new AppVehRebateDetailsVo();
             BeanUtil.copyProperties(datum,appVehRebateDetailsVo);