|
@@ -421,6 +421,7 @@ public class OrderHandler {
|
|
list.add(item);
|
|
list.add(item);
|
|
|
|
|
|
if(cartDto.getProductType() == 100){ //当订单中有电动牙刷时,isContainProduct为true
|
|
if(cartDto.getProductType() == 100){ //当订单中有电动牙刷时,isContainProduct为true
|
|
|
|
+ brushelTotal += subTotal;
|
|
isContainProduct = true;
|
|
isContainProduct = true;
|
|
}
|
|
}
|
|
|
|
|
|
@@ -429,7 +430,6 @@ public class OrderHandler {
|
|
if(cartDto.getProductType() == Integer.valueOf(brushelEl)){ //判断订单中是否有刷头,有刷头 brushFlag 为true;
|
|
if(cartDto.getProductType() == Integer.valueOf(brushelEl)){ //判断订单中是否有刷头,有刷头 brushFlag 为true;
|
|
brush1Flag = true;
|
|
brush1Flag = true;
|
|
brush2Flag = true;
|
|
brush2Flag = true;
|
|
- brushelTotal += subTotal;
|
|
|
|
if(brushelCouponTotal == 0 || brushelCouponTotal < cartDto.getProductPrice()){
|
|
if(brushelCouponTotal == 0 || brushelCouponTotal < cartDto.getProductPrice()){
|
|
brushelCouponTotal = cartDto.getProductPrice();
|
|
brushelCouponTotal = cartDto.getProductPrice();
|
|
}
|
|
}
|