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

Merge branch 'ww' into test

Browse Source
This commit is contained in:
wangw
2024-10-08 16:16:19 +08:00
parent 1a9310ef83 12cc56aada
commit b20996355c
4 changed files with 25 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
eladmin-system/src/main/java/cn/ysk/cashier/cons/rest/TbProskuConController.java
View File

@@ -66,9 +66,8 @@ public class TbProskuConController {
tbProskuConService.upV2(resources); tbProskuConService.upV2(resources);
return new ResponseEntity<>(HttpStatus.CREATED); return new ResponseEntity<>(HttpStatus.CREATED);
} catch (BadRequestException be) { } catch (BadRequestException be) {
throw new Exception(be.getMessage()); throw new BadRequestException(be.getMessage());
}catch (Exception e){ }catch (Exception e){
e.printStackTrace();
throw new Exception(e.getMessage()); throw new Exception(e.getMessage());
} }
} }

31
eladmin-system/src/main/java/cn/ysk/cashier/cons/service/impl/TbProskuConServiceImpl.java
View File

@@ -198,29 +198,28 @@ public class TbProskuConServiceImpl implements TbProskuConService {
} }
TbProductSku sku = null; TbProductSku sku = null;
if (resource.getProductSkuId() != 0) { if (resource.getProductSkuId() != 0) {
sku = tbProductSkuRepository.findById(resource.getProductSkuId()).orElseGet(TbProductSku::new); sku = tbProductSkuRepository.findById(resource.getProductSkuId()).orElseGet(TbProductSku::new);
if (ObjectUtil.isNull(sku) || ObjectUtil.isNull(sku.getId())) { if (ObjectUtil.isNull(sku) || ObjectUtil.isNull(sku.getId())) {
throw new BadRequestException("规格信息不存在"); throw new BadRequestException("规格信息不存在");
} }
} }
TbProskuCon tbConsInfo1 = new TbProskuCon(); TbProskuCon tbConsInfo1 = new TbProskuCon();
if (resource.getId() == null) {
int count = tbProskuConRepository.countByConInfoIdAndProductSkuIdAndShopId(resource.getConInfoId(), resource.getProductSkuId(), resource.getShopId(), resource.getProductId()); int count = tbProskuConRepository.countByConInfoIdAndProductSkuIdAndShopId(resource.getConInfoId(), resource.getProductSkuId(), resource.getShopId(), resource.getProductId());
if (count <= 0) { if (count <= 0) {
BeanUtil.copyProperties(resource, tbConsInfo1, CopyOptions.create().setIgnoreNullValue(true)); BeanUtil.copyProperties(resource, tbConsInfo1, CopyOptions.create().setIgnoreNullValue(true));
newCons.add(tbConsInfo1);
} else {
StringBuilder strResult = new StringBuilder(product.getName());
if (sku != null) {
strResult.append(" 规格" + sku.getSpecSnap());
}
strResult.append("与耗材 " + tbConsInfo.getConName() + " 的对应关系已存在");
throw new BadRequestException(product.getName().concat("对应的").concat(Objects.nonNull(sku.getSpecSnap())?sku.getSpecSnap():"").concat("规格已存在"));
}
}else {
BeanUtil.copyProperties(resource,tbConsInfo1, CopyOptions.create().setIgnoreNullValue(true));
newCons.add(tbConsInfo1); newCons.add(tbConsInfo1);
} else {
StringBuilder strResult = new StringBuilder(product.getName());
if (sku != null) {
strResult.append(" 规格" + sku.getSpecSnap());
}
strResult.append("与耗材 " + tbConsInfo.getConName() + " 的对应关系已存在");
throw new BadRequestException(strResult.toString());
} }
BeanUtil.copyProperties(resource, tbConsInfo1, CopyOptions.create().setIgnoreNullValue(true));
newCons.add(tbConsInfo1);
} }
if (!CollectionUtils.isEmpty(newCons)) { if (!CollectionUtils.isEmpty(newCons)) {
tbProskuConRepository.saveAll(newCons); tbProskuConRepository.saveAll(newCons);

2
eladmin-system/src/main/java/cn/ysk/cashier/controller/product/TbProductController.java
View File

@@ -35,7 +35,7 @@ public class TbProductController {
return new ResponseEntity<>(tbProductService.queryAll(criteria, false),HttpStatus.OK); return new ResponseEntity<>(tbProductService.queryAll(criteria, false),HttpStatus.OK);
} }
@GetMapping("/list/v2") @PostMapping("/list/v2")
@ApiOperation("查询商品列表 新") @ApiOperation("查询商品列表 新")
public ResponseEntity<Object> queryTbProductV2(TbProductQueryV2Criteria criteria, Pageable pageable){ public ResponseEntity<Object> queryTbProductV2(TbProductQueryV2Criteria criteria, Pageable pageable){
return new ResponseEntity<>(tbProductService.queryAllV2(criteria,pageable),HttpStatus.OK); return new ResponseEntity<>(tbProductService.queryAllV2(criteria,pageable),HttpStatus.OK);

8
eladmin-system/src/main/java/cn/ysk/cashier/dto/product/TbProductStockCountQueryCriteria.java
View File

@@ -2,6 +2,7 @@ package cn.ysk.cashier.dto.product;
import cn.ysk.cashier.dto.BaseQueryDto; import cn.ysk.cashier.dto.BaseQueryDto;
import lombok.Data; import lombok.Data;
import org.apache.commons.lang3.StringUtils;
/** /**
* @website https://eladmin.vip * @website https://eladmin.vip
@@ -20,4 +21,11 @@ public class TbProductStockCountQueryCriteria extends BaseQueryDto {
private Integer page = 0; private Integer page = 0;
private Integer size = 10; private Integer size = 10;
public String getProductName() {
if(StringUtils.isNotBlank(productName)){
return productName;
}
return null;
}
} }