|
@@ -392,6 +392,7 @@ public class OrderHandler {
|
|
|
String brushelEment = systemService.selectOneShopRuleById(253).getRuleDesc();
|
|
|
|
|
|
int brushelTotal = 0;
|
|
|
+ int brushHeadTotal = 0;
|
|
|
int brushelCouponTotal = 0;
|
|
|
|
|
|
int total = 0;
|
|
@@ -430,12 +431,12 @@ public class OrderHandler {
|
|
|
if(cartDto.getProductType() == Integer.valueOf(brushelEl)){
|
|
|
brush1Flag = true;
|
|
|
brush2Flag = true;
|
|
|
+ brushHeadTotal += subTotal;
|
|
|
if(brushelCouponTotal == 0 || brushelCouponTotal < cartDto.getProductPrice()){
|
|
|
brushelCouponTotal = cartDto.getProductPrice();
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
}else if(cartDto.getProductStatus().intValue() != 1){
|
|
|
msg.setMessage(ResultInfo.cartNoStatusError);
|
|
|
return msg;
|
|
@@ -512,11 +513,11 @@ public class OrderHandler {
|
|
|
total = total - brushelCouponTotal;
|
|
|
}else if(couponItemDto.getCouponIsNewPeople() == 1 && couponItemDto.getCouponId() ==40000){
|
|
|
int br = 0;
|
|
|
- br = brushelTotal - couponType.getCouponReduce();
|
|
|
+ br = brushHeadTotal - couponType.getCouponReduce();
|
|
|
if(br <= 0){
|
|
|
- total=total-brushelTotal;
|
|
|
+ total = total - brushHeadTotal;
|
|
|
}else{
|
|
|
- total=total-couponType.getCouponReduce();
|
|
|
+ total = total - couponType.getCouponReduce();
|
|
|
}
|
|
|
}else{
|
|
|
total=total-couponType.getCouponReduce();
|