diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackage/BaseSalesDicountQuery.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackage/BaseSalesDicountQuery.java index f53dd764d1..114740c29a 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackage/BaseSalesDicountQuery.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackage/BaseSalesDicountQuery.java @@ -4,6 +4,9 @@ import com.yxt.common.core.query.Query; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.ArrayList; +import java.util.List; + /** * @Author dimengzhe * @Date 2022/5/10 10:02 @@ -30,4 +33,6 @@ public class BaseSalesDicountQuery implements Query { @ApiModelProperty("结束有效期") private String getEffectiveEndDate; + @ApiModelProperty(value = "已选择的销售政策的sid数组") + private List sidList = new ArrayList<>(); } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackage/BaseDiscountpackageService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackage/BaseDiscountpackageService.java index 3881266b0a..47d8cbbced 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackage/BaseDiscountpackageService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackage/BaseDiscountpackageService.java @@ -299,6 +299,9 @@ public class BaseDiscountpackageService extends MybatisBaseService sidList = new ArrayList<>(); } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/pc/PcBusDepositVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/pc/PcBusDepositVo.java index 17f6013431..a08338c387 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/pc/PcBusDepositVo.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/pc/PcBusDepositVo.java @@ -17,6 +17,8 @@ public class PcBusDepositVo implements Vo { @ApiModelProperty(value = "节点状态") private String nodeState; + @ApiModelProperty(value = "sid") + private String sid; @ApiModelProperty(value = "单据类型") private String depositBillType; diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositMapper.xml index ef5d74806c..e1de5f28a7 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositMapper.xml @@ -178,7 +178,8 @@ select * - from bus_sales_order_discount + from bus_sales_order_deposit where salesOrderSid = #{sid} diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderinsurance/BusSalesOrderInsuranceService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderinsurance/BusSalesOrderInsuranceService.java index a074dfe53d..0c552e32ef 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderinsurance/BusSalesOrderInsuranceService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderinsurance/BusSalesOrderInsuranceService.java @@ -76,6 +76,7 @@ public class BusSalesOrderInsuranceService extends MybatisBaseService 0) { //删除 baseMapper.deleteBySalesOrderSid(sid); - for (int i = 0; i < list.size(); i++) { - BusSalesOrderVehicleDto busSalesOrderVehicleDto = list.get(i); - BusSalesOrderVehicle busSalesOrderVehicle = new BusSalesOrderVehicle(); - BeanUtil.copyProperties(busSalesOrderVehicleDto, busSalesOrderVehicle, "sid"); - busSalesOrderVehicle.setSalesOrderSid(sid); - save(busSalesOrderVehicle); - } + } + for (int i = 0; i < list.size(); i++) { + BusSalesOrderVehicleDto busSalesOrderVehicleDto = list.get(i); + BusSalesOrderVehicle busSalesOrderVehicle = new BusSalesOrderVehicle(); + BeanUtil.copyProperties(busSalesOrderVehicleDto, busSalesOrderVehicle, "sid"); + busSalesOrderVehicle.setSalesOrderSid(sid); + save(busSalesOrderVehicle); } }