fix
Hentua
2024-01-29 000904e9c419e67d3538bb5ccc8da02f8d1c22cf
fix
5 files modified
11 ■■■■■ changed files
src/main/java/cc/mrbird/febs/mall/controller/AdminMallMemberController.java 2 ●●●●● patch | view | raw | blame | history
src/main/java/cc/mrbird/febs/mall/entity/MallGoodsCoupon.java 1 ●●●● patch | view | raw | blame | history
src/main/java/cc/mrbird/febs/mall/entity/MallMemberCoupon.java 6 ●●●●● patch | view | raw | blame | history
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java 1 ●●●● patch | view | raw | blame | history
src/main/java/cc/mrbird/febs/vip/service/impl/VipCommonServiceImpl.java 1 ●●●● patch | view | raw | blame | history
src/main/java/cc/mrbird/febs/mall/controller/AdminMallMemberController.java
@@ -20,6 +20,7 @@
import javax.validation.Valid;
import javax.validation.constraints.NotNull;
import java.util.Date;
import java.util.List;
import java.util.Map;
@@ -608,6 +609,7 @@
    @PostMapping("vipLevelSetUpdate")
    public FebsResponse vipLevelSetUpdate(MallMember member) {
        member.setVipLevelTime(new Date());
        mallMemberService.updateById(member);
        return new FebsResponse().success().message("操作成功");
    }
src/main/java/cc/mrbird/febs/mall/entity/MallGoodsCoupon.java
@@ -26,5 +26,4 @@
    //减免金额
    private BigDecimal realAmount;
}
src/main/java/cc/mrbird/febs/mall/entity/MallMemberCoupon.java
@@ -21,4 +21,10 @@
    private Integer state;
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date expireTime;
    /**
     * 来源类型 1-默认 2-积分权益 3-失活会员
     */
    private Integer fromType;
}
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java
@@ -1119,6 +1119,7 @@
        LambdaQueryWrapper<MallMemberCoupon> memberCouponQuery = new LambdaQueryWrapper<>();
        memberCouponQuery.in(MallMemberCoupon::getCouponId, couponIds)
                        .eq(MallMemberCoupon::getMemberId, member.getId())
                        .eq(MallMemberCoupon::getFromType, 3)
                        .ge(MallMemberCoupon::getCreatedTime, DateUtil.beginOfDay(new Date()))
                        .le(MallMemberCoupon::getCreatedTime, DateUtil.endOfDay(new Date()));
        List<MallMemberCoupon> mallMemberCoupons = mallMemberCouponMapper.selectList(memberCouponQuery);
src/main/java/cc/mrbird/febs/vip/service/impl/VipCommonServiceImpl.java
@@ -147,6 +147,7 @@
            MallMember update = new MallMember();
            update.setId(member.getId());
            update.setLevel(nextLevelCode);
            update.setVipLevelTime(new Date());
            mallMemberMapper.updateById(update);
        }
    }