|
@@ -100,14 +100,16 @@ public class ProductNewService extends CrudService<ProductNewDao, Product> {
|
|
List<Product> list = dao.findList(entity);
|
|
List<Product> list = dao.findList(entity);
|
|
list.forEach(p -> {
|
|
list.forEach(p -> {
|
|
CmSku sku = productDao.findSku(p.getProductID());
|
|
CmSku sku = productDao.findSku(p.getProductID());
|
|
- p.setPrice(sku.getPrice());
|
|
|
|
- p.setNormalPrice(sku.getNormalPrice());
|
|
|
|
- Integer costCheckFlag = sku.getCostCheckFlag();
|
|
|
|
- p.setCostCheckFlag(costCheckFlag.toString());
|
|
|
|
- if(1==costCheckFlag){
|
|
|
|
- p.setCostPrice(sku.getCostPrice().toString());
|
|
|
|
- }else{
|
|
|
|
- p.setSqlCostProportional(sku.getCostProportional());
|
|
|
|
|
|
+ if(null!=sku){
|
|
|
|
+ p.setPrice(sku.getPrice());
|
|
|
|
+ p.setNormalPrice(sku.getNormalPrice());
|
|
|
|
+ Integer costCheckFlag = sku.getCostCheckFlag();
|
|
|
|
+ p.setCostCheckFlag(costCheckFlag.toString());
|
|
|
|
+ if(1==costCheckFlag){
|
|
|
|
+ p.setCostPrice(sku.getCostPrice().toString());
|
|
|
|
+ }else{
|
|
|
|
+ p.setSqlCostProportional(sku.getCostProportional());
|
|
|
|
+ }
|
|
}
|
|
}
|
|
});
|
|
});
|
|
page.setList(list);
|
|
page.setList(list);
|