Commit 7831ed2d by huiyang.chen

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

parents 6422026d 8f23b811
...@@ -861,10 +861,11 @@ public class ShoppingCartMCoffeeServiceImpl { ...@@ -861,10 +861,11 @@ public class ShoppingCartMCoffeeServiceImpl {
comboxGoods.setOriginalPrice(orderItemResp.getProductPrice().longValue()); comboxGoods.setOriginalPrice(orderItemResp.getProductPrice().longValue());
comboxGoods.setFinalPrice(orderItemResp.getSalePrice().longValue()); comboxGoods.setFinalPrice(orderItemResp.getSalePrice().longValue());
comboxGoods.setName(null != orderItemResp.getProductName() ? orderItemResp.getProductName() :""); comboxGoods.setName(StringUtils.isNotEmpty(orderItemResp.getProductName()) ? orderItemResp.getProductName() :"");
comboxGoods.setSpuName(null != orderItemResp.getProductName() ? orderItemResp.getProductName() :""); comboxGoods.setSpuName(StringUtils.isNotEmpty(orderItemResp.getProductName()) ? orderItemResp.getProductName() :"");
comboxGoods.setSkuName(null != orderItemResp.getProductName() ? orderItemResp.getProductName() :""); comboxGoods.setSkuName(StringUtils.isNotEmpty(orderItemResp.getProductName()) ? orderItemResp.getProductName() :"");
comboxGoods.setSubName(null != orderItemResp.getProductSpecName() ? orderItemResp.getProductSpecName() : ""); comboxGoods.setSubName(StringUtils.isNotEmpty(orderItemResp.getProductSpecName()) ? orderItemResp.getProductSpecName() : "");
comboxGoods.setPic(StringUtils.isNotEmpty(orderItemResp.getProductPicUrl()) ? orderItemResp.getProductPicUrl() :"");
if (!"".equals(orderItemResp.getProductProperty())) { if (!"".equals(orderItemResp.getProductProperty())) {
List<CartGoods.CartGoodsExtra> extra = new ArrayList<>(); List<CartGoods.CartGoodsExtra> extra = new ArrayList<>();
String[] split = orderItemResp.getProductProperty().split("/"); String[] split = orderItemResp.getProductProperty().split("/");
......
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