Merge remote-tracking branch 'origin/dev' into dev

rs-website/rs-website-server/src/main/java/com/upyuns/platform/rs/website/biz/ShoppingCartInfoBiz.java

@@ -361,8 +361,9 @@ public class ShoppingCartInfoBiz extends BaseBiz<ShoppingCartInfoMapper, Shoppin
 		Example example = new Example(ShoppingCartInfo.class);
 		example.createCriteria().andEqualTo("detailId", detailId)
 				.andEqualTo("status", 1).andEqualTo("isDel", 0);
-		ShoppingCartInfo shoppingCartInfo = mapper.selectOneByExample(example);
-		if (shoppingCartInfo != null) {
+		List<ShoppingCartInfo> shoppingCartInfoList = mapper.selectByExample(example);
+		if (shoppingCartInfoList != null && shoppingCartInfoList.size() > 0) {
+			shoppingCartInfoList.parallelStream().forEach(shoppingCartInfo -> {
 				if (status != null) {
 					shoppingCartInfo.setStatus(status);
 				}
@@ -370,6 +371,7 @@ public class ShoppingCartInfoBiz extends BaseBiz<ShoppingCartInfoMapper, Shoppin
 					shoppingCartInfo.setIsDel(1);
 				}
 				updateSelectiveByIdRe(shoppingCartInfo);
+			});
 		}
 	}