Merge branch 'feature/20200324_套餐商品组校验' into qa

df49371c · shuhu.hou@freemud.cn · b3ee3b9b · 7e724c4b · df49371c
Commit df49371c authored Mar 31, 2020 by shuhu.hou@freemud.cn
Show whitespace changes
Inline Side-by-side

Showing with 1 additions and 1 deletions

shopping-cart-application-service/src/main/java/cn/freemud/adapter/ShoppingCartConvertAdapter.java
+1 -1

No files found.
--- a/shopping-cart-application-service/src/main/java/cn/freemud/adapter/ShoppingCartConvertAdapter.java
+++ b/shopping-cart-application-service/src/main/java/cn/freemud/adapter/ShoppingCartConvertAdapter.java
@@ -363,7 +363,7 @@ public class ShoppingCartConvertAdapter {
                productCombox.setSkuId(vo.getSkuId());
                productCombox.setQty(vo.getQty());
                productCombox.setExtra(vo.getExtra());
-                productCombox.setProductGroupId(Long.parseLong(vo.getProductGroupId()));
+                productCombox.setProductGroupId(StringUtils.isEmpty(vo.getProductGroupId())?null: Long.parseLong(vo.getProductGroupId()));
                productGroupList.add(productCombox);
            }
        }