czg_team
/
cashier-admin-java
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

商品编辑问题1

This commit is contained in:
wangw 2024-03-14 17:10:01 +08:00
parent f42257ece5
commit 3023c11442
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
eladmin-system/src/main/java/cn/ysk/cashier/controller/order/TbOrderInfoController.java
View File

@ -49,7 +49,7 @@ public class TbOrderInfoController {
@Log("导出数据") @Log("导出数据")
@ApiOperation("导出数据") @ApiOperation("导出数据")
@GetMapping(value = "/download") @PostMapping(value = "/download")
public void exportTbOrderInfo(HttpServletResponse response, TbOrderInfoQueryCriteria criteria) throws IOException { public void exportTbOrderInfo(HttpServletResponse response, TbOrderInfoQueryCriteria criteria) throws IOException {
tbOrderInfoService.download(tbOrderInfoService.queryAll(criteria), response); tbOrderInfoService.download(tbOrderInfoService.queryAll(criteria), response);
} }

5
eladmin-system/src/main/java/cn/ysk/cashier/service/impl/order/TbOrderInfoServiceImpl.java
View File

@ -82,6 +82,11 @@ public class TbOrderInfoServiceImpl implements TbOrderInfoService {
@Override @Override
public List<TbOrderInfoDto> queryAll(TbOrderInfoQueryCriteria criteria) { public List<TbOrderInfoDto> queryAll(TbOrderInfoQueryCriteria criteria) {
if(criteria!=null){
if (criteria.getOrderType().equals("0")) {
criteria.setOrderType(null);
}
}
List<TbOrderInfoDto> dto = tbOrderInfoMapper.toDto(tbOrderInfoRepository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root, criteria, criteriaBuilder))); List<TbOrderInfoDto> dto = tbOrderInfoMapper.toDto(tbOrderInfoRepository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root, criteria, criteriaBuilder)));
for (TbOrderInfoDto tbOrderInfo : dto) { for (TbOrderInfoDto tbOrderInfo : dto) {
List<TbOrderDetail> details = tbOrderDetailRepository.searchDetailByOrderId(tbOrderInfo.getId()); List<TbOrderDetail> details = tbOrderDetailRepository.searchDetailByOrderId(tbOrderInfo.getId());

4
eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/TbProductServiceImpl.java
View File

@ -323,11 +323,11 @@ public class TbProductServiceImpl implements TbProductService {
for (TbProductSku sku : resources.getSkuList()) { for (TbProductSku sku : resources.getSkuList()) {
sku.setProductId(String.valueOf(save.getId())); sku.setProductId(String.valueOf(save.getId()));
sku.setShopId(save.getShopId()); sku.setShopId(save.getShopId());
product.setUpdatedAt(Instant.now().toEpochMilli()); sku.setCreatedAt(Instant.now().toEpochMilli());
sku.setUpdatedAt(Instant.now().toEpochMilli());
skuList.add(sku); skuList.add(sku);
} }
tbProductSkuRepository.saveAll(skuList); tbProductSkuRepository.saveAll(skuList);
} }
//保存到sku_result //保存到sku_result
if ("sku".equals(resources.getTypeEnum())) { if ("sku".equals(resources.getTypeEnum())) {