|
@@ -218,11 +218,7 @@ public class OrderHandler {
|
|
msg.setMessage(ResultInfo.cartNoNumError);
|
|
msg.setMessage(ResultInfo.cartNoNumError);
|
|
return msg;
|
|
return msg;
|
|
}
|
|
}
|
|
- if (cd.getProductStatus() != null && cd.getProductStatus().intValue() == 1) {
|
|
|
|
- total += cd.getCartNum() * cd.getProductPrice();
|
|
|
|
- sum++;
|
|
|
|
- tempCarts.add(cd);
|
|
|
|
- }else{
|
|
|
|
|
|
+ if (cd.getProductStatus() == null || cd.getProductStatus().intValue() != 1) {
|
|
msg.setMessage(ResultInfo.cartNoStatusError);
|
|
msg.setMessage(ResultInfo.cartNoStatusError);
|
|
return msg;
|
|
return msg;
|
|
}
|
|
}
|
|
@@ -240,6 +236,10 @@ public class OrderHandler {
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ total += cd.getCartNum() * cd.getProductPrice();
|
|
|
|
+ sum++;
|
|
|
|
+ tempCarts.add(cd);
|
|
|
|
+
|
|
switch (cd.getColorToothType()){
|
|
switch (cd.getColorToothType()){
|
|
//牙刷分类
|
|
//牙刷分类
|
|
case 1: //1:赠品(非牙刷,非刷头)
|
|
case 1: //1:赠品(非牙刷,非刷头)
|