Commit 66b1d33c by 徐康

价格展示

parent e560dddd
...@@ -30,6 +30,9 @@ public class FreightCalculation { ...@@ -30,6 +30,9 @@ public class FreightCalculation {
if (CollectionUtils.isEmpty(activityTip.getActivityList())) { if (CollectionUtils.isEmpty(activityTip.getActivityList())) {
activityTip.setActivityList(new ArrayList<ActivityList>()); activityTip.setActivityList(new ArrayList<ActivityList>());
} }
if(activityPrompt.getAlreadyDiscountAmount() == 0) {
return;
}
ActivityList activityList = new ActivityList(); ActivityList activityList = new ActivityList();
activityList.setTipType(activityPrompt.getActivityType()); activityList.setTipType(activityPrompt.getActivityType());
activityList.setSatisfy(MoneyUtils.parseFen2Yuan(activityPrompt.getThresholdAmount())); activityList.setSatisfy(MoneyUtils.parseFen2Yuan(activityPrompt.getThresholdAmount()));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment