Browse Source

fixed 卡券文案

fushengqian 1 year ago
parent
commit
e117eaf955

+ 3 - 0
fuint-application/src/main/java/com/fuint/common/dto/MyCouponDto.java

@@ -50,6 +50,9 @@ public class MyCouponDto implements Serializable {
     @ApiModelProperty("余额")
     @ApiModelProperty("余额")
     private BigDecimal balance;
     private BigDecimal balance;
 
 
+    @ApiModelProperty("剩余")
+    private Integer num;
+
     @ApiModelProperty("是否可用")
     @ApiModelProperty("是否可用")
     private boolean canUse;
     private boolean canUse;
 
 

+ 2 - 0
fuint-application/src/main/java/com/fuint/common/service/impl/UserCouponServiceImpl.java

@@ -464,6 +464,7 @@ public class UserCouponServiceImpl extends ServiceImpl<MtUserCouponMapper, MtUse
                 dto.setCreateTime(userCouponDto.getCreateTime());
                 dto.setCreateTime(userCouponDto.getCreateTime());
                 dto.setUserInfo(userInfo);
                 dto.setUserInfo(userInfo);
                 dto.setStoreInfo(storeInfo);
                 dto.setStoreInfo(storeInfo);
+                dto.setNum(0);
 
 
                 boolean canUse = couponService.isCouponEffective(couponInfo, userCouponDto);
                 boolean canUse = couponService.isCouponEffective(couponInfo, userCouponDto);
                 if (!userCouponDto.getStatus().equals(UserCouponStatusEnum.UNUSED.getKey())) {
                 if (!userCouponDto.getStatus().equals(UserCouponStatusEnum.UNUSED.getKey())) {
@@ -500,6 +501,7 @@ public class UserCouponServiceImpl extends ServiceImpl<MtUserCouponMapper, MtUse
                 if (couponInfo.getType().equals(CouponTypeEnum.TIMER.getKey())) {
                 if (couponInfo.getType().equals(CouponTypeEnum.TIMER.getKey())) {
                     Long confirmNum = confirmLogService.getConfirmNum(userCouponDto.getId());
                     Long confirmNum = confirmLogService.getConfirmNum(userCouponDto.getId());
                     tips = "已使用"+ confirmNum +"次,可使用" + couponInfo.getOutRule() + "次";
                     tips = "已使用"+ confirmNum +"次,可使用" + couponInfo.getOutRule() + "次";
+                    dto.setNum(Integer.parseInt(couponInfo.getOutRule()) - confirmNum.intValue());
                 }
                 }
 
 
                 dto.setTips(tips);
                 dto.setTips(tips);