|
@@ -359,12 +359,12 @@ public class OrderHandler {
|
|
cartIds.add(cartDto.getCartId());
|
|
cartIds.add(cartDto.getCartId());
|
|
Integer productDiscount = cartDto.getProductDiscount();
|
|
Integer productDiscount = cartDto.getProductDiscount();
|
|
if(cartDto.getColorType() == 1 && member.getUserIsVip() == 2 &&
|
|
if(cartDto.getColorType() == 1 && member.getUserIsVip() == 2 &&
|
|
- !"40001".equals(temp.getCouponTypeId()) && !"50000".equals(temp.getCouponTypeId())){
|
|
|
|
|
|
+ !"40001".equals(temp.getCouponTypeId()) && !"50000".equals(temp.getCouponTypeId()) && !"50001".equals(temp.getCouponTypeId())){
|
|
Double doubleProductDiscount = productDiscount.doubleValue();
|
|
Double doubleProductDiscount = productDiscount.doubleValue();
|
|
doubleProductDiscount = doubleProductDiscount * 0.95;
|
|
doubleProductDiscount = doubleProductDiscount * 0.95;
|
|
productDiscount = doubleProductDiscount.intValue();
|
|
productDiscount = doubleProductDiscount.intValue();
|
|
}else if((cartDto.getColorType() == 2 || cartDto.getColorType() == 3) && member.getUserIsVip() == 2 &&
|
|
}else if((cartDto.getColorType() == 2 || cartDto.getColorType() == 3) && member.getUserIsVip() == 2 &&
|
|
- !"40001".equals(temp.getCouponTypeId()) && !"50000".equals(temp.getCouponTypeId())){
|
|
|
|
|
|
+ !"40001".equals(temp.getCouponTypeId()) && !"50000".equals(temp.getCouponTypeId()) && !"50001".equals(temp.getCouponTypeId())){
|
|
Double doubleProductDiscount = productDiscount.doubleValue();
|
|
Double doubleProductDiscount = productDiscount.doubleValue();
|
|
doubleProductDiscount = doubleProductDiscount * 0.88;
|
|
doubleProductDiscount = doubleProductDiscount * 0.88;
|
|
productDiscount = doubleProductDiscount.intValue();
|
|
productDiscount = doubleProductDiscount.intValue();
|
|
@@ -456,6 +456,7 @@ public class OrderHandler {
|
|
}else if(couponType.getCouponType()==2){
|
|
}else if(couponType.getCouponType()==2){
|
|
Double totalDouble = Double.valueOf(total);
|
|
Double totalDouble = Double.valueOf(total);
|
|
switch (couponItemDto.getCouponId()){
|
|
switch (couponItemDto.getCouponId()){
|
|
|
|
+ case 50001:
|
|
case 50000:
|
|
case 50000:
|
|
Double reduce = Double.valueOf(couponType.getCouponReduce())/100;
|
|
Double reduce = Double.valueOf(couponType.getCouponReduce())/100;
|
|
totalDouble = totalDouble-kqjhj_amount_50000*(1-reduce);
|
|
totalDouble = totalDouble-kqjhj_amount_50000*(1-reduce);
|