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

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

@@ -134,6 +134,7 @@ public class ShoppingCartInfoBiz extends BaseBiz<ShoppingCartInfoMapper, Shoppin
 					//return ObjectRestResponse.createFailedResult(ResultCode.ORDER_GOODS_EXIST, ResultCode.getMsg(ResultCode.ORDER_GOODS_EXIST));
 				} else {
 					ShoppingCartInfo shoppingCartInfo = new ShoppingCartInfo();
+					shoppingCartInfo.setName(imageDataVO.getName());
 					shoppingCartInfo.setDetailId(Long.valueOf(imageDataVO.getId()));
 					shoppingCartInfo.setDetailJson(JSONObject.toJSONString(imageDataVO));
 					shoppingCartInfo.setPrice(imageDataVO.getPrice());
@@ -235,7 +236,8 @@ public class ShoppingCartInfoBiz extends BaseBiz<ShoppingCartInfoMapper, Shoppin
 
 	public ShoppingCartInfo selectByUser(Integer userId, Long detailId) {
 		Example example = new Example(ShoppingCartInfo.class);
-		example.createCriteria().andEqualTo("detailId", detailId).andEqualTo("userId", userId);
+		example.createCriteria().andEqualTo("detailId", detailId)
+				.andEqualTo("userId", userId).andEqualTo("isDel", 0);
 		return mapper.selectOneByExample(example);
 	}