处理新增保洁订单的问题
This commit is contained in:
parent
850b312820
commit
7bd6aa9977
@ -44,7 +44,7 @@ public class CleanOrderBo extends BaseEntity {
|
|||||||
/**
|
/**
|
||||||
* 保洁id
|
* 保洁id
|
||||||
*/
|
*/
|
||||||
@NotNull(message = "保洁id不能为空", groups = { AddGroup.class, EditGroup.class })
|
// @NotNull(message = "保洁id不能为空", groups = { AddGroup.class, EditGroup.class })
|
||||||
private List<Long> cleanIds;
|
private List<Long> cleanIds;
|
||||||
|
|
||||||
// /**
|
// /**
|
||||||
@ -56,7 +56,6 @@ public class CleanOrderBo extends BaseEntity {
|
|||||||
/**
|
/**
|
||||||
* 单价
|
* 单价
|
||||||
*/
|
*/
|
||||||
@NotNull(message = "单价不能为空", groups = { AddGroup.class, EditGroup.class })
|
|
||||||
private Long prices;
|
private Long prices;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -74,6 +74,7 @@ public class CleanOrderVo implements Serializable {
|
|||||||
private Long sumPeices;
|
private Long sumPeices;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
*
|
||||||
* 支付状态
|
* 支付状态
|
||||||
*/
|
*/
|
||||||
@ExcelProperty(value = "支付状态")
|
@ExcelProperty(value = "支付状态")
|
||||||
|
@ -48,7 +48,7 @@ public class CleanOrderServiceImpl implements ICleanOrderService {
|
|||||||
* @return 保洁订单
|
* @return 保洁订单
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public CleanOrderVo queryById(Long id){
|
public CleanOrderVo queryById(Long id) {
|
||||||
return baseMapper.selectVoById(id);
|
return baseMapper.selectVoById(id);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -77,6 +77,7 @@ public class CleanOrderServiceImpl implements ICleanOrderService {
|
|||||||
LambdaQueryWrapper<CleanOrder> lqw = buildQueryWrapper(bo);
|
LambdaQueryWrapper<CleanOrder> lqw = buildQueryWrapper(bo);
|
||||||
return baseMapper.selectVoList(lqw);
|
return baseMapper.selectVoList(lqw);
|
||||||
}
|
}
|
||||||
|
|
||||||
private LambdaQueryWrapper<CleanOrder> buildQueryWrapper(CleanOrderBo bo) {
|
private LambdaQueryWrapper<CleanOrder> buildQueryWrapper(CleanOrderBo bo) {
|
||||||
Map<String, Object> params = bo.getParams();
|
Map<String, Object> params = bo.getParams();
|
||||||
LambdaQueryWrapper<CleanOrder> lqw = Wrappers.lambdaQuery();
|
LambdaQueryWrapper<CleanOrder> lqw = Wrappers.lambdaQuery();
|
||||||
@ -115,13 +116,23 @@ public class CleanOrderServiceImpl implements ICleanOrderService {
|
|||||||
if (flag) {
|
if (flag) {
|
||||||
bo.setId(add.getId());
|
bo.setId(add.getId());
|
||||||
ArrayList<CleanserverOrder> cleanserverOrders = new ArrayList<>();
|
ArrayList<CleanserverOrder> cleanserverOrders = new ArrayList<>();
|
||||||
for (Long cleanId : bo.getCleanIds()) {
|
LambdaQueryWrapper<CleanserverOrder> queryWrapper = new LambdaQueryWrapper<>();
|
||||||
CleanserverOrder cleanserverOrder = new CleanserverOrder();
|
// 查询cleanserver_order表中的所有记录
|
||||||
cleanserverOrder.setCleanServerId(cleanId);
|
List<CleanserverOrder> cleanserverOrderList = cleanserverOrderMapper.selectList(queryWrapper);
|
||||||
cleanserverOrder.setOrderId(add.getId());
|
//判断是否有cleanserver表中的数据
|
||||||
CleanserverOrder convert = MapstructUtils.convert(cleanserverOrder, CleanserverOrder.class);
|
if (!cleanserverOrderList.isEmpty()) {
|
||||||
cleanserverOrders.add(convert);
|
// 循环插入cleanserver_order表
|
||||||
|
for (CleanserverOrder order : cleanserverOrderList) {
|
||||||
|
Long cleanId = order.getCleanServerId();
|
||||||
|
CleanserverOrder cleanserverOrder = new CleanserverOrder();
|
||||||
|
cleanserverOrder.setCleanServerId(cleanId);
|
||||||
|
cleanserverOrder.setOrderId(add.getId());
|
||||||
|
// CleanserverOrder convert = MapstructUtils.convert(cleanserverOrder, CleanserverOrder.class);
|
||||||
|
cleanserverOrders.add(cleanserverOrder);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
cleanserverOrderMapper.insert(cleanserverOrders);
|
cleanserverOrderMapper.insert(cleanserverOrders);
|
||||||
|
|
||||||
}
|
}
|
||||||
@ -144,7 +155,7 @@ public class CleanOrderServiceImpl implements ICleanOrderService {
|
|||||||
/**
|
/**
|
||||||
* 保存前的数据校验
|
* 保存前的数据校验
|
||||||
*/
|
*/
|
||||||
private void validEntityBeforeSave(CleanOrder entity){
|
private void validEntityBeforeSave(CleanOrder entity) {
|
||||||
//TODO 做一些数据校验,如唯一约束
|
//TODO 做一些数据校验,如唯一约束
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -157,7 +168,7 @@ public class CleanOrderServiceImpl implements ICleanOrderService {
|
|||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
|
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
|
||||||
if(isValid){
|
if (isValid) {
|
||||||
//TODO 做一些业务上的校验,判断是否需要校验
|
//TODO 做一些业务上的校验,判断是否需要校验
|
||||||
}
|
}
|
||||||
return baseMapper.deleteByIds(ids) > 0;
|
return baseMapper.deleteByIds(ids) > 0;
|
||||||
|
Loading…
Reference in New Issue
Block a user