sgb/zsw-farm
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

👍 增加NPE防御

Browse Source
This commit is contained in:
Loki
2022-12-07 10:38:29 +08:00
parent d84528ee14
commit baedf074be
2 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
yudao-server/src/main/java/cn/iocoder/yudao/server/YudaoServerApplication.java
-10
View File
@@ -16,16 +16,6 @@ import java.io.File;
public class YudaoServerApplication { public class YudaoServerApplication {
public static void main(String[] args) { public static void main(String[] args) {
ApplicationHome home = new ApplicationHome(YudaoServerApplication.class);
File jarFile = home.getSource();
String dirPath = jarFile.getParentFile().toString();
String filePath = dirPath + File.separator + ".dubbo";
System.out.println(filePath);
System.setProperty("dubbo.meta.cache.filePath", filePath);
System.setProperty("dubbo.mapping.cache.filePath",filePath);
SpringApplication.run(YudaoServerApplication.class, args); SpringApplication.run(YudaoServerApplication.class, args);
} }
zsw-bxg/src/main/java/co/yixiang/modules/order/service/impl/YxStoreOrderServiceImpl.java
+13 -2
View File
@@ -2773,6 +2773,12 @@ public class YxStoreOrderServiceImpl extends BaseServiceImpl<StoreOrderMapper, Y
StringBuilder pBrand=new StringBuilder(); StringBuilder pBrand=new StringBuilder();
StringBuilder pCate=new StringBuilder(); StringBuilder pCate=new StringBuilder();
yxStoreOrder.getCartInfoList().forEach(c->{ yxStoreOrder.getCartInfoList().forEach(c->{
if (ObjectUtil.isEmpty(c.getCartInfoMap())){
return;
}
if (!c.getCartInfoMap().containsKey("productInfo")){
return;
}
Object info = c.getCartInfoMap().get("productInfo"); Object info = c.getCartInfoMap().get("productInfo");
YxStoreProductQueryVo vo = JSONUtil.toBean(info.toString(), YxStoreProductQueryVo.class); YxStoreProductQueryVo vo = JSONUtil.toBean(info.toString(), YxStoreProductQueryVo.class);
if (ObjectUtil.isNotEmpty(vo)) { if (ObjectUtil.isNotEmpty(vo)) {
@@ -2783,15 +2789,20 @@ public class YxStoreOrderServiceImpl extends BaseServiceImpl<StoreOrderMapper, Y
.append(" ,\r\n"); .append(" ,\r\n");
} }
if (!c.getCartInfoMap().containsKey("productId")){
return;
}
Integer productId=Integer.valueOf(c.getCartInfoMap().get("productId").toString()); Integer productId=Integer.valueOf(c.getCartInfoMap().get("productId").toString());
YxStoreProduct yxStoreProduct=yxStoreProductService.getById(productId); YxStoreProduct yxStoreProduct=yxStoreProductService.getById(productId);
if (ObjectUtil.isNotNull(yxStoreBrandService.getById(yxStoreProduct.getBrandId()))){ if (ObjectUtil.isNotEmpty(yxStoreProduct)){
if (ObjectUtil.isNotNull(yxStoreBrandService.getById(yxStoreProduct.getBrandId()))) {
pBrand.append(yxStoreBrandService.getById(yxStoreProduct.getBrandId()).getBrandName()); pBrand.append(yxStoreBrandService.getById(yxStoreProduct.getBrandId()).getBrandName());
} }
if (ObjectUtil.isNotNull(yxStoreCategoryService.getById(yxStoreProduct.getCateId()))){ if (ObjectUtil.isNotNull(yxStoreCategoryService.getById(yxStoreProduct.getCateId()))) {
// YxStoreCategory yxStoreCategory=yxStoreCategoryService.getById(yxStoreProduct.getCateId()); // YxStoreCategory yxStoreCategory=yxStoreCategoryService.getById(yxStoreProduct.getCateId());
pCate.append(yxStoreCategoryService.getById(yxStoreProduct.getCateId()).getCateName()); pCate.append(yxStoreCategoryService.getById(yxStoreProduct.getCateId()).getCateName());
} }
}
}); });
map.put("商品名称",pname); map.put("商品名称",pname);
map.put("商品品牌",pBrand); map.put("商品品牌",pBrand);