puzhibing
2023-06-08 d77aa9268ed02e7bda8a67aab2213e42cb5afcf4
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCouponController.java
@@ -91,8 +91,8 @@
        // 开始,结束时间
        if(StringUtils.hasLength(createTime)){
            String[] split = createTime.split(" - ");
            Date startTime = DateUtil.getDate_str4(split[0]);
            Date endTime = DateUtil.getDate_str4(split[1]);
            Date startTime = DateUtil.getDate_str3(split[0]+" 00:00:00");
            Date endTime = DateUtil.getDate_str3(split[1]+" 23:59:59");
            wrapper.between("create_time",startTime,endTime);
        }
        wrapper.ne("status", StatusEnum.DELETE.getCode());
@@ -135,6 +135,16 @@
        Boolean isExit = tCouponService.isExit(tCoupon);
        if(isExit){
            return new SuccessTip(500,"该优惠券名称与类型已存在!");
        }
        // 如果是新人优惠券,查询是否存在已启用的新人优惠券
        if(tCoupon.getCouponType() == 2){
            int count = tCouponService.selectCount(new EntityWrapper<TCoupon>()
                    .eq("coupon_type", 2)
                    .eq("coupon_state", 1)
                    .eq("status", true));
            if(count>0){
                return new SuccessTip(500,"已存在已启用的新人优惠券!");
            }
        }
        tCouponService.insert(tCoupon);
        return SUCCESS_TIP;
@@ -225,7 +235,11 @@
            tUserToCoupon.setExpireTime(expireTime);
            // 添加发放人id和类型
            tUserToCoupon.setObjectId(ShiroKit.getUser().getObjectId());
            if(ShiroKit.getUser().getRoleType() == 1){
                tUserToCoupon.setObjectId(1);
            }else {
                tUserToCoupon.setObjectId(ShiroKit.getUser().getObjectId());
            }
            tUserToCoupon.setRoleType(ShiroKit.getUser().getRoleType());
            tUserToCoupons.add(tUserToCoupon);