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

Merge branch 'ww' into test

This commit is contained in:
wangw 2024-09-23 14:44:24 +08:00
parent 7c589b74af e3845071a3
commit 55ead8507b
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -276,7 +276,7 @@ public class TbProductServiceImpl implements TbProductService {
TbProductNewVo.TbProductSkuVos skuVo2 = new TbProductNewVo.TbProductSkuVos(); TbProductNewVo.TbProductSkuVos skuVo2 = new TbProductNewVo.TbProductSkuVos();
skuVo2.setId(skuVo1.getId()); skuVo2.setId(skuVo1.getId());
skuVo2.setName(skuVo1.getSpecSnap()); skuVo2.setName(skuVo1.getSpecSnap());
skuVo2.setLowPrice("￥"+skuVo1.getSalePrice().toString()); skuVo2.setLowPrice(skuVo1.getSalePrice().toString());
skuVo2.setIsPauseSale(skuVo1.getIsPauseSale()); skuVo2.setIsPauseSale(skuVo1.getIsPauseSale());
skuVo2.setIsGrounding(skuVo1.getIsGrounding()); skuVo2.setIsGrounding(skuVo1.getIsGrounding());
return skuVo2; return skuVo2;
@ -317,6 +317,7 @@ public class TbProductServiceImpl implements TbProductService {
tbProductVo.setGroupSnap(ListUtil.stringChangeList(tbProduct.getGroupSnap())); tbProductVo.setGroupSnap(ListUtil.stringChangeList(tbProduct.getGroupSnap()));
} }
BeanUtils.copyProperties(tbProduct, tbProductVo); BeanUtils.copyProperties(tbProduct, tbProductVo);
tbProductVo.setStockNumber(Double.valueOf(tbProduct.getStockNumber()));
if (!org.apache.commons.lang3.StringUtils.isBlank(tbProduct.getImages())) { if (!org.apache.commons.lang3.StringUtils.isBlank(tbProduct.getImages())) {
tbProductVo.setImages(ListUtil.stringChangeList(tbProduct.getImages())); tbProductVo.setImages(ListUtil.stringChangeList(tbProduct.getImages()));
} else { } else {