Commit 8d203da7 by chongfu.liang

fix

parent 625b3360
......@@ -36,6 +36,7 @@ public class GetCouponDetailResponseDto {
* 可核销周,时间段设置
*/
private List<ActiveRedeemTimeInterval> activeRedeemTimeIntervalList;
private Integer today_available_times;
}
@Data
public static class Active{
......@@ -67,7 +68,6 @@ public class GetCouponDetailResponseDto {
private Integer maxDiscount;
@JsonProperty("MaxRedeemTimes")
private Integer maxRedeemTimes;
private Integer today_available_times;
@JsonProperty("MinAmount")
private Integer minAmount;
@JsonProperty("PartnerID")
......
......@@ -778,8 +778,8 @@ public class CouponServiceImpl implements CouponService {
dto.setCouponName(couponDetailResponseDto.getDetails().get(0).getTitle());
dto.setActivityName(couponDetailResponseDto.getDetails().get(0).getActive().getActiveName());
if (couponDetailResponseDto.getDetails().get(0).getActive().getMaxRedeemTimes() != null && couponDetailResponseDto.getDetails().get(0).getActive().getMaxRedeemTimes() > 1){
if (couponDetailResponseDto.getDetails().get(0).getActive().getToday_available_times() != null){
dto.setTodayAvailableTimes(couponDetailResponseDto.getDetails().get(0).getActive().getToday_available_times());
if (couponDetailResponseDto.getDetails().get(0).getToday_available_times() != null){
dto.setTodayAvailableTimes(couponDetailResponseDto.getDetails().get(0).getToday_available_times());
} else {
dto.setTodayAvailableTimes(1);
}
......@@ -949,8 +949,8 @@ public class CouponServiceImpl implements CouponService {
}
CheckSpqInfoResponseDto dto = new CheckSpqInfoResponseDto();
if (couponDetailResponseDto.getDetails().get(0).getActive().getMaxRedeemTimes() != null && couponDetailResponseDto.getDetails().get(0).getActive().getMaxRedeemTimes() > 1){
if (couponDetailResponseDto.getDetails().get(0).getActive().getToday_available_times() != null){
dto.setTodayAvailableTimes(couponDetailResponseDto.getDetails().get(0).getActive().getToday_available_times());
if (couponDetailResponseDto.getDetails().get(0).getToday_available_times() != null){
dto.setTodayAvailableTimes(couponDetailResponseDto.getDetails().get(0).getToday_available_times());
} else {
dto.setTodayAvailableTimes(1);
}
......
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