Skip to content

R
rs-cloud-platform
Commit cb4974c5 authored by unset's avatar unset
Browse files
Options

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

parents 5f319e3b 65909eff
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 1 deletion
rs-website/rs-website-server/src/main/java/com/upyuns/platform/rs/website/biz/ShoppingCartInfoBiz.java
View file @ cb4974c5
...@@ -134,6 +134,7 @@ public class ShoppingCartInfoBiz extends BaseBiz<ShoppingCartInfoMapper, Shoppin ...@@ -134,6 +134,7 @@ public class ShoppingCartInfoBiz extends BaseBiz<ShoppingCartInfoMapper, Shoppin
//return ObjectRestResponse.createFailedResult(ResultCode.ORDER_GOODS_EXIST, ResultCode.getMsg(ResultCode.ORDER_GOODS_EXIST)); //return ObjectRestResponse.createFailedResult(ResultCode.ORDER_GOODS_EXIST, ResultCode.getMsg(ResultCode.ORDER_GOODS_EXIST));
} else { } else {
ShoppingCartInfo shoppingCartInfo = new ShoppingCartInfo(); ShoppingCartInfo shoppingCartInfo = new ShoppingCartInfo();
shoppingCartInfo.setName(imageDataVO.getName());
shoppingCartInfo.setDetailId(Long.valueOf(imageDataVO.getId())); shoppingCartInfo.setDetailId(Long.valueOf(imageDataVO.getId()));
shoppingCartInfo.setDetailJson(JSONObject.toJSONString(imageDataVO)); shoppingCartInfo.setDetailJson(JSONObject.toJSONString(imageDataVO));
shoppingCartInfo.setPrice(imageDataVO.getPrice()); shoppingCartInfo.setPrice(imageDataVO.getPrice());
...@@ -235,7 +236,8 @@ public class ShoppingCartInfoBiz extends BaseBiz<ShoppingCartInfoMapper, Shoppin ...@@ -235,7 +236,8 @@ public class ShoppingCartInfoBiz extends BaseBiz<ShoppingCartInfoMapper, Shoppin
public ShoppingCartInfo selectByUser(Integer userId, Long detailId) { public ShoppingCartInfo selectByUser(Integer userId, Long detailId) {
Example example = new Example(ShoppingCartInfo.class); 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); return mapper.selectOneByExample(example);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment