Commit 5a559d1c by ping.wu

Merge branches 'feature/20200915_购物车添加限制数量_wuping' and 'master' of…

Merge branches 'feature/20200915_购物车添加限制数量_wuping' and 'master' of http://gitlab.freemud.com/order-group-application/order-group
parents 6ade05dc 5ea43207
...@@ -1660,6 +1660,10 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService { ...@@ -1660,6 +1660,10 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
if (value == null) { if (value == null) {
return qty; return qty;
} else { } else {
boolean bool = value.getClass().getName().equals("java.lang.String");
if(bool){
return qty;
}
JSONArray jsonArray = (JSONArray)value; JSONArray jsonArray = (JSONArray)value;
int cartLimitFlag = 0; int cartLimitFlag = 0;
int cartLimitCount = 0; int cartLimitCount = 0;
...@@ -1706,6 +1710,10 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService { ...@@ -1706,6 +1710,10 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
if (value == null) { if (value == null) {
return ; return ;
} else { } else {
boolean bool = value.getClass().getName().equals("java.lang.String");
if(bool){
return;
}
JSONArray jsonArray = (JSONArray)value; JSONArray jsonArray = (JSONArray)value;
int cartLimitFlag = 0; int cartLimitFlag = 0;
int cartLimitCount = 0; int cartLimitCount = 0;
...@@ -1750,6 +1758,10 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService { ...@@ -1750,6 +1758,10 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
if (value == null) { if (value == null) {
return ; return ;
} else { } else {
boolean bool = value.getClass().getName().equals("java.lang.String");
if(bool){
return;
}
JSONArray jsonArray = (JSONArray)value; JSONArray jsonArray = (JSONArray)value;
int cartLimitFlag = 0; int cartLimitFlag = 0;
int cartLimitCount = 0; int cartLimitCount = 0;
......
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