Commit af3787b7 by ping.wu

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

Merge branches 'develop' and 'feature/20200915_购物车添加限制数量_wuping' of http://gitlab.freemud.com/order-group-application/order-group into develop
parents c1202710 5ea43207
...@@ -1697,6 +1697,10 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService { ...@@ -1697,6 +1697,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;
...@@ -1743,6 +1747,10 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService { ...@@ -1743,6 +1747,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;
...@@ -1787,6 +1795,10 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService { ...@@ -1787,6 +1795,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