Skip to content

O
order-group
Commit 8d203da7 by chongfu.liang
Options

fix

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