Commit 423c03eb by huiyang.chen

fix 运费月卡入机

parent 2ebe9614
......@@ -154,6 +154,10 @@ public class ActivityCalculationDiscountResponseDto {
private Integer type;
private Long thresholdAmount;
/**
* 运费月卡入机字段
*/
private String tenderId;
}
@Data
......
......@@ -21,6 +21,10 @@ public class ActivityDiscountsDto {
private String activityName;
private Integer discountAmount;
private Integer activityType;
/**
* 运费月卡入机字段
*/
private String tenderId;
/**
* 实际参与活动商品数量
......
......@@ -193,6 +193,7 @@ public class CalculationServiceImpl {
activityDiscountsDto.setActivityName(discount.getActivityName());
activityDiscountsDto.setActivityType(discountType);
activityDiscountsDto.setDiscountAmount(0 - discountAmount);
activityDiscountsDto.setTenderId(discount.getTenderId());
activityDiscountsDtos.add(activityDiscountsDto);
}
}
......
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