更改

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateQuery.java

@@ -51,19 +51,21 @@ import java.util.List;
 @ApiModel(value = "单车返利表 查询条件", description = "单车返利表 查询条件")
 public class ScmVehRebateQuery implements Query {
 
-	@ApiModelProperty("品牌")
+    @ApiModelProperty("品牌")
     private String brandName;
-	@ApiModelProperty("车型名称")
+    @ApiModelProperty("车型名称")
     private String vehModelName;
-	@ApiModelProperty("车架号")
+    @ApiModelProperty("车架号")
     private String vinNo;
     @ApiModelProperty("创建开始日期")
     private String createStartTime;
     @ApiModelProperty("创建结束日期")
     private String createEndTime;
-	@ApiModelProperty("返利类型key")
+    @ApiModelProperty("返利类型key")
     private String rebateTypeKey;
-	@ApiModelProperty("返利名称")
+    @ApiModelProperty("返利类型value")
+    private String rebateTypeValue;
+    @ApiModelProperty("返利名称")
     private String rebateName;
     @ApiModelProperty("状态")
     private String state;

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateService.java

@@ -268,8 +268,8 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
         if (StringUtils.isNotBlank(query.getVinNo())) {
             qw.like("vinNo", query.getVinNo());
         }
-        if (StringUtils.isNotBlank(query.getRebateTypeKey())) {
+        if (StringUtils.isNotBlank(query.getRebateTypeValue())) {
-            qw.eq("rebateTypeKey", query.getRebateTypeKey());
+            qw.eq("rebateTypeValue", query.getRebateTypeValue());
         }
         if (StringUtils.isNotBlank(query.getRebateName())) {
             qw.like("rebateName", query.getRebateName());

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewith/ScmVehRebateWithService.java

@@ -149,6 +149,7 @@ public class ScmVehRebateWithService extends MybatisBaseService<ScmVehRebateWith
             ScmVehRebateDetailsVo scmVehRebateDetailsVo = new ScmVehRebateDetailsVo();
             BeanUtil.copyProperties(scmVehRebate, scmVehRebateDetailsVo);
             scmVehRebateDetailsVo.setMoney(scmVehRebateDetailsVo.getOnceTreatCost().add(scmVehRebateDetailsVo.getOnceSuppCost()).add(scmVehRebateDetailsVo.getSecondTreatCost()).add(scmVehRebateDetailsVo.getSecondSuppCost()).toString());
+            scmVehRebateDetailsVo.setVehRebateSid(scmVehRebate.getSid());
             scmVehRebateDetailsVos.add(scmVehRebateDetailsVo);
         }
         return rb.success().setData(scmVehRebateDetailsVos);