|
@@ -300,7 +300,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
|
|
this.updateById(order);
|
|
this.updateById(order);
|
|
}
|
|
}
|
|
|
|
|
|
-
|
|
|
|
|
|
+ @Transactional(rollbackFor = Exception.class)
|
|
@Override
|
|
@Override
|
|
public String exportDetail(OrderRequest orderRequest) {
|
|
public String exportDetail(OrderRequest orderRequest) {
|
|
LoginUser loginUser = SecurityUtils.getLoginUser();
|
|
LoginUser loginUser = SecurityUtils.getLoginUser();
|
|
@@ -419,7 +419,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
|
|
List<OrderReport> orderReports = JSON.parseArray(jsonStr, OrderReport.class);
|
|
List<OrderReport> orderReports = JSON.parseArray(jsonStr, OrderReport.class);
|
|
return new CommonPage<>(orderReports,page.getTotal(),page.getCurrent(),page.getSize());
|
|
return new CommonPage<>(orderReports,page.getTotal(),page.getCurrent(),page.getSize());
|
|
}
|
|
}
|
|
-
|
|
|
|
|
|
+ @Transactional(rollbackFor = Exception.class)
|
|
@Override
|
|
@Override
|
|
public String reportExport(Date startTime, Date endTime, Integer type) {
|
|
public String reportExport(Date startTime, Date endTime, Integer type) {
|
|
LoginUser loginUser = SecurityUtils.getLoginUser();
|
|
LoginUser loginUser = SecurityUtils.getLoginUser();
|