|
|
@@ -421,7 +421,7 @@ public class ActivityServiceImpl extends ServiceImpl<ActivityDao, Activity> impl
|
|
|
return null;
|
|
|
}
|
|
|
|
|
|
- Double discountContent = curTimeTimeActivity.getDiscountContent();
|
|
|
+ Double discountContent = curTimeTimeActivity.getDiscountContent() / 10.0;
|
|
|
discountAmount = curSuitGoodsTotalPrice - (curSuitGoodsTotalPrice * discountContent);
|
|
|
} else if (ActivityTypeEnum.FULL.getTypeCode().equals(type)) {
|
|
|
ActivityOfFullReductionDTO fullReductionInfo = shopActivityBO.getFullReductionInfo();
|
|
|
@@ -432,7 +432,8 @@ public class ActivityServiceImpl extends ServiceImpl<ActivityDao, Activity> impl
|
|
|
}
|
|
|
|
|
|
if (FullActivityTypeEnum.DISCOUNT.getTypeCode().equals(fullReductionInfo.getType())) {
|
|
|
- discountAmount = curSuitGoodsTotalPrice - (curSuitGoodsTotalPrice * fullReductionInfo.getDiscountContent());
|
|
|
+ Double discountContent = fullReductionInfo.getDiscountContent() / 10.0;
|
|
|
+ discountAmount = curSuitGoodsTotalPrice - (curSuitGoodsTotalPrice * discountContent);
|
|
|
} else {
|
|
|
Double discountContent = fullReductionInfo.getDiscountContent();
|
|
|
|
|
|
@@ -445,8 +446,8 @@ public class ActivityServiceImpl extends ServiceImpl<ActivityDao, Activity> impl
|
|
|
}
|
|
|
} else if (ActivityTypeEnum.GLOBAL.getTypeCode().equals(type)) {
|
|
|
ActivityOfGlobalDiscountDTO globalDiscountsInfo = shopActivityBO.getGlobalDiscountsInfo();
|
|
|
-
|
|
|
- discountAmount = curSuitGoodsTotalPrice - (curSuitGoodsTotalPrice * globalDiscountsInfo.getDiscountRate());
|
|
|
+ Double discountRate = globalDiscountsInfo.getDiscountRate() / 10.0;
|
|
|
+ discountAmount = curSuitGoodsTotalPrice - (curSuitGoodsTotalPrice * discountRate);
|
|
|
}
|
|
|
|
|
|
OrderSuitActivityVO vo = new OrderSuitActivityVO();
|