修改车辆利润相关

anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/carsSoldProfit/CarsSoldProfitFeign.java

@@ -4,10 +4,9 @@ import com.yxt.anrui.reportcenter.api.dailyreport.DailyReportFeignFallback;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.ResponseBody;
 
 import java.util.List;
 
@@ -25,9 +24,16 @@ public interface CarsSoldProfitFeign {
 
     @PostMapping("saveOrUpdate")
     @ResponseBody
+    @ApiOperation("保存或修改")
     ResultBean saveOrUpdate(@RequestBody List<CarsSoldProfitDto> dtoList);
 
     @PostMapping("list")
     @ResponseBody
+    @ApiOperation("车辆利润报表分页")
     ResultBean<PagerVo<CarsSoldProfitVo>> list(@RequestBody PagerQuery<CarsSoldProfitQuery> pagerQuery);
+
+    @GetMapping("rebates")
+    @ResponseBody
+    @ApiOperation("返利明细")
+    ResultBean<CarsSoldProfitRebateAllVo> rebates(@RequestParam("sid")String sid);
 }

anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/carsSoldProfit/CarsSoldProfitRebateAllVo.java

@@ -0,0 +1,23 @@
+package com.yxt.anrui.reportcenter.api.carsSoldProfit;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2025/5/15
+ **/
+@Data
+public class CarsSoldProfitRebateAllVo implements Vo {
+    private static final long serialVersionUID = -9016391824372444422L;
+
+    private List<CarsSoldProfitRebateDetailsVo> list;
+    @ApiModelProperty("预提返利合计")
+    private String expectedRebateTotal;
+    @ApiModelProperty("调整返利合计")
+    private String adjustedRebateTotal;
+}

anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/carsSoldProfit/CarsSoldProfitRebateDetailsVo.java

@@ -0,0 +1,28 @@
+package com.yxt.anrui.reportcenter.api.carsSoldProfit;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2025/5/15
+ **/
+@Data
+public class CarsSoldProfitRebateDetailsVo implements Vo {
+    private static final long serialVersionUID = -2059450221052046209L;
+
+    @ApiModelProperty("政策方")
+    private String policy;
+    @ApiModelProperty("所属年月")
+    private String yearAndMonth;
+    @ApiModelProperty("返利类型")
+    private String rebateType;
+    @ApiModelProperty("返利名称")
+    private String rebateName;
+    @ApiModelProperty("预提返利")
+    private String expectedRebate;
+    @ApiModelProperty("返利调整")
+    private String rebatesAdjust;
+}

anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/carsSoldProfit/CarsSoldProfitRest.java

@@ -1,9 +1,6 @@
 package com.yxt.anrui.reportcenter.biz.carsSoldProfit;
 
-import com.yxt.anrui.reportcenter.api.carsSoldProfit.CarsSoldProfitDto;
+import com.yxt.anrui.reportcenter.api.carsSoldProfit.*;
-import com.yxt.anrui.reportcenter.api.carsSoldProfit.CarsSoldProfitFeign;
-import com.yxt.anrui.reportcenter.api.carsSoldProfit.CarsSoldProfitQuery;
-import com.yxt.anrui.reportcenter.api.carsSoldProfit.CarsSoldProfitVo;
 import com.yxt.anrui.reportcenter.api.dailyreport.DailyReportVo;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
@@ -39,4 +36,9 @@ public class CarsSoldProfitRest implements CarsSoldProfitFeign {
         PagerVo<CarsSoldProfitVo> pv = carsSoldProfitService.listPage(pagerQuery);
         return rb.success().setData(pv);
     }
+
+    @Override
+    public ResultBean<CarsSoldProfitRebateAllVo> rebates(String sid) {
+        return carsSoldProfitService.rebates(sid);
+    }
 }

anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/carsSoldProfit/CarsSoldProfitService.java

@@ -5,10 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery;
 import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
-import com.yxt.anrui.reportcenter.api.carsSoldProfit.CarsSoldProfit;
+import com.yxt.anrui.reportcenter.api.carsSoldProfit.*;
-import com.yxt.anrui.reportcenter.api.carsSoldProfit.CarsSoldProfitDto;
-import com.yxt.anrui.reportcenter.api.carsSoldProfit.CarsSoldProfitQuery;
-import com.yxt.anrui.reportcenter.api.carsSoldProfit.CarsSoldProfitVo;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.PagerUtil;
 import com.yxt.common.base.utils.StringUtils;
@@ -139,4 +136,8 @@ public class CarsSoldProfitService extends MybatisBaseService<CarsSoldProfitMapp
         PagerVo<CarsSoldProfitVo> p = PagerUtil.pageToVo(pagging, null);
         return p;
     }
+
+    public ResultBean<CarsSoldProfitRebateAllVo> rebates(String sid) {
+        return null;
+    }
 }

doc/databases/统计报表/车辆利润报表.sql

@@ -23,7 +23,6 @@ CREATE TABLE `cars_sold_profit`
     `division`              varchar(64)          DEFAULT NULL COMMENT '事业部名称',
     `divisionSid`           varchar(64)          DEFAULT NULL COMMENT '事业部sid',
     `vehModelSid`           varchar(64)          DEFAULT NULL COMMENT '车型sid',
-    `vehModel`              varchar(64)          DEFAULT NULL COMMENT '车型',
     `vehMConfigSid`         varchar(64)          DEFAULT NULL COMMENT '车型配置sid',
     `purchaseSystemSid`     varchar(64)          DEFAULT NULL COMMENT '采购系统sid',
     `purchaseSystemName`    varchar(64)          DEFAULT NULL COMMENT '采购系统名称',
@@ -31,7 +30,6 @@ CREATE TABLE `cars_sold_profit`
     `vinSid`                varchar(200)         DEFAULT NULL COMMENT '车辆sid',
     `locationSid`           varchar(200)         DEFAULT NULL COMMENT '存放地点sid',
     `locationName`          varchar(200)         DEFAULT NULL COMMENT '存放地点',
-    `type`                  varchar(200)         DEFAULT NULL COMMENT '类型',
     `exStockPrice`          decimal(10, 2)       DEFAULT NULL COMMENT '出库价',
     `expectedMaori`         decimal(10, 2)       DEFAULT NULL COMMENT '预计毛利',
     `rebatesAdjust`         decimal(10, 2)       DEFAULT NULL COMMENT '返利调整',
@@ -44,7 +42,6 @@ CREATE TABLE `cars_sold_profit`
     `moveCarPrice`          decimal(10, 2)       DEFAULT NULL COMMENT '调车费',
     `costPrice`             decimal(10, 2)       DEFAULT NULL COMMENT '入库价',
     `schedulingId`          varchar(500)         DEFAULT NULL COMMENT '排产订单编号',
-    `gearbox`               varchar(500)         DEFAULT NULL COMMENT '变速箱',
     `createDate`            date                 DEFAULT NULL COMMENT '数据日期',
     `updateDate`            date                 DEFAULT NULL COMMENT '更新日期',
     PRIMARY KEY (`id`),