Skip to content

GitLab

Q
qk_backend
Commit 9da87711 authored by shiyu's avatar shiyu
Browse files
Options

盲袋优惠活动可配置

parent d6ce8dd3
Hide whitespace changes
Inline Side-by-side
Showing with 923 additions and 82 deletions
ch-core/src/main/java/com/wwdz/ch/core/util/DateTimeUtil.java
View file @ 9da87711
......@@ -107,4 +107,15 @@ public class DateTimeUtil {
return false;
}
/**
* 获取昨天的日期，字符串格式
* @return
*/
public static String getYesterdayDate() {
LocalDate yesterday = LocalDate.now().minusDays(1);
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
String yesterdayString = yesterday.format(formatter);
return yesterdayString;
}
}
ch-dao/src/main/java/com/wwdz/ch/db/domain/UserSignin.java
View file @ 9da87711
package com.wwdz.ch.db.domain;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date;
import com.xxdxxs.entity.Entity;
import lombok.Data;
/**
* @author shiyu
* @date 2024/11/11
* @date 2024/11/15
*/
@Data
public class UserSignin implements Entity {
......@@ -25,13 +27,38 @@ public class UserSignin implements Entity {
/**
* 签到时间
*/
private Date signinTime;
private Date createTime;
/**
* 更新时间
*/
private Date updateTime;
/**
* 签到日期
*/
private String signinDate;
/**
* 连续天数
*/
private Integer consecutiveDays;
/**
* 是否有奖励
*/
private Boolean isReward;
/**
* 奖励等级
*/
private Integer rewardLevel;
/**
* 是否领取奖励
*/
private Boolean isGet;
private static final long serialVersionUID = 1L;
@Override
......@@ -42,8 +69,13 @@ public class UserSignin implements Entity {
sb.append("Hash = ").append(hashCode());
sb.append(", id=").append(id);
sb.append(", userId=").append(userId);
sb.append(", signinTime=").append(signinTime);
sb.append(", createTime=").append(createTime);
sb.append(", updateTime=").append(updateTime);
sb.append(", signinDate=").append(signinDate);
sb.append(", consecutiveDays=").append(consecutiveDays);
sb.append(", isReward=").append(isReward);
sb.append(", rewardLevel=").append(rewardLevel);
sb.append(", isGet=").append(isGet);
sb.append(", serialVersionUID=").append(serialVersionUID);
sb.append("]");
return sb.toString();
......@@ -63,8 +95,13 @@ public class UserSignin implements Entity {
UserSignin other = (UserSignin) that;
return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId()))
&& (this.getUserId() == null ? other.getUserId() == null : this.getUserId().equals(other.getUserId()))
&& (this.getSigninTime() == null ? other.getSigninTime() == null : this.getSigninTime().equals(other.getSigninTime()))
&& (this.getConsecutiveDays() == null ? other.getConsecutiveDays() == null : this.getConsecutiveDays().equals(other.getConsecutiveDays()));
&& (this.getCreateTime() == null ? other.getCreateTime() == null : this.getCreateTime().equals(other.getCreateTime()))
&& (this.getUpdateTime() == null ? other.getUpdateTime() == null : this.getUpdateTime().equals(other.getUpdateTime()))
&& (this.getSigninDate() == null ? other.getSigninDate() == null : this.getSigninDate().equals(other.getSigninDate()))
&& (this.getConsecutiveDays() == null ? other.getConsecutiveDays() == null : this.getConsecutiveDays().equals(other.getConsecutiveDays()))
&& (this.getIsReward() == null ? other.getIsReward() == null : this.getIsReward().equals(other.getIsReward()))
&& (this.getRewardLevel() == null ? other.getRewardLevel() == null : this.getRewardLevel().equals(other.getRewardLevel()))
&& (this.getIsGet() == null ? other.getIsGet() == null : this.getIsGet().equals(other.getIsGet()));
}
@Override
......@@ -73,8 +110,13 @@ public class UserSignin implements Entity {
int result = 1;
result = prime * result + ((getId() == null) ? 0 : getId().hashCode());
result = prime * result + ((getUserId() == null) ? 0 : getUserId().hashCode());
result = prime * result + ((getSigninTime() == null) ? 0 : getSigninTime().hashCode());
result = prime * result + ((getCreateTime() == null) ? 0 : getCreateTime().hashCode());
result = prime * result + ((getUpdateTime() == null) ? 0 : getUpdateTime().hashCode());
result = prime * result + ((getSigninDate() == null) ? 0 : getSigninDate().hashCode());
result = prime * result + ((getConsecutiveDays() == null) ? 0 : getConsecutiveDays().hashCode());
result = prime * result + ((getIsReward() == null) ? 0 : getIsReward().hashCode());
result = prime * result + ((getRewardLevel() == null) ? 0 : getRewardLevel().hashCode());
result = prime * result + ((getIsGet() == null) ? 0 : getIsGet().hashCode());
return result;
}
......@@ -88,8 +130,13 @@ public class UserSignin implements Entity {
public enum Column {
id("id", "id", "BIGINT", false),
userId("user_id", "userId", "BIGINT", false),
signinTime("signin_time", "signinTime", "TIMESTAMP", false),
consecutiveDays("consecutive_days", "consecutiveDays", "INTEGER", false);
createTime("create_time", "createTime", "TIMESTAMP", false),
updateTime("update_time", "updateTime", "TIMESTAMP", false),
signinDate("signin_date", "signinDate", "VARCHAR", false),
consecutiveDays("consecutive_days", "consecutiveDays", "INTEGER", false),
isReward("is_reward", "isReward", "BIT", false),
rewardLevel("reward_level", "rewardLevel", "INTEGER", false),
isGet("is_get", "isGet", "BIT", false);
/**
* This field was generated by MyBatis Generator.
......
ch-dao/src/main/java/com/wwdz/ch/db/domain/UserSigninExample.java
View file @ 9da87711
......@@ -412,18 +412,18 @@ public class UserSigninExample {
return (Criteria) this;
}
public Criteria andSigninTimeIsNull() {
addCriterion("signin_time is null");
public Criteria andCreateTimeIsNull() {
addCriterion("create_time is null");
return (Criteria) this;
}
public Criteria andSigninTimeIsNotNull() {
addCriterion("signin_time is not null");
public Criteria andCreateTimeIsNotNull() {
addCriterion("create_time is not null");
return (Criteria) this;
}
public Criteria andSigninTimeEqualTo(Date value) {
addCriterion("signin_time =", value, "signinTime");
public Criteria andCreateTimeEqualTo(Date value) {
addCriterion("create_time =", value, "createTime");
return (Criteria) this;
}
......@@ -434,13 +434,13 @@ public class UserSigninExample {
* @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin
*/
public Criteria andSigninTimeEqualToColumn(UserSignin.Column column) {
addCriterion(new StringBuilder("signin_time = ").append(column.getEscapedColumnName()).toString());
public Criteria andCreateTimeEqualToColumn(UserSignin.Column column) {
addCriterion(new StringBuilder("create_time = ").append(column.getEscapedColumnName()).toString());
return (Criteria) this;
}
public Criteria andSigninTimeNotEqualTo(Date value) {
addCriterion("signin_time <>", value, "signinTime");
public Criteria andCreateTimeNotEqualTo(Date value) {
addCriterion("create_time <>", value, "createTime");
return (Criteria) this;
}
......@@ -451,13 +451,13 @@ public class UserSigninExample {
* @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin
*/
public Criteria andSigninTimeNotEqualToColumn(UserSignin.Column column) {
addCriterion(new StringBuilder("signin_time <> ").append(column.getEscapedColumnName()).toString());
public Criteria andCreateTimeNotEqualToColumn(UserSignin.Column column) {
addCriterion(new StringBuilder("create_time <> ").append(column.getEscapedColumnName()).toString());
return (Criteria) this;
}
public Criteria andSigninTimeGreaterThan(Date value) {
addCriterion("signin_time >", value, "signinTime");
public Criteria andCreateTimeGreaterThan(Date value) {
addCriterion("create_time >", value, "createTime");
return (Criteria) this;
}
......@@ -468,13 +468,13 @@ public class UserSigninExample {
* @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin
*/
public Criteria andSigninTimeGreaterThanColumn(UserSignin.Column column) {
addCriterion(new StringBuilder("signin_time > ").append(column.getEscapedColumnName()).toString());
public Criteria andCreateTimeGreaterThanColumn(UserSignin.Column column) {
addCriterion(new StringBuilder("create_time > ").append(column.getEscapedColumnName()).toString());
return (Criteria) this;
}
public Criteria andSigninTimeGreaterThanOrEqualTo(Date value) {
addCriterion("signin_time >=", value, "signinTime");
public Criteria andCreateTimeGreaterThanOrEqualTo(Date value) {
addCriterion("create_time >=", value, "createTime");
return (Criteria) this;
}
......@@ -485,13 +485,13 @@ public class UserSigninExample {
* @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin
*/
public Criteria andSigninTimeGreaterThanOrEqualToColumn(UserSignin.Column column) {
addCriterion(new StringBuilder("signin_time >= ").append(column.getEscapedColumnName()).toString());
public Criteria andCreateTimeGreaterThanOrEqualToColumn(UserSignin.Column column) {
addCriterion(new StringBuilder("create_time >= ").append(column.getEscapedColumnName()).toString());
return (Criteria) this;
}
public Criteria andSigninTimeLessThan(Date value) {
addCriterion("signin_time <", value, "signinTime");
public Criteria andCreateTimeLessThan(Date value) {
addCriterion("create_time <", value, "createTime");
return (Criteria) this;
}
......@@ -502,13 +502,13 @@ public class UserSigninExample {
* @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin
*/
public Criteria andSigninTimeLessThanColumn(UserSignin.Column column) {
addCriterion(new StringBuilder("signin_time < ").append(column.getEscapedColumnName()).toString());
public Criteria andCreateTimeLessThanColumn(UserSignin.Column column) {
addCriterion(new StringBuilder("create_time < ").append(column.getEscapedColumnName()).toString());
return (Criteria) this;
}
public Criteria andSigninTimeLessThanOrEqualTo(Date value) {
addCriterion("signin_time <=", value, "signinTime");
public Criteria andCreateTimeLessThanOrEqualTo(Date value) {
addCriterion("create_time <=", value, "createTime");
return (Criteria) this;
}
......@@ -519,28 +519,302 @@ public class UserSigninExample {
* @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin
*/
public Criteria andSigninTimeLessThanOrEqualToColumn(UserSignin.Column column) {
addCriterion(new StringBuilder("signin_time <= ").append(column.getEscapedColumnName()).toString());
public Criteria andCreateTimeLessThanOrEqualToColumn(UserSignin.Column column) {
addCriterion(new StringBuilder("create_time <= ").append(column.getEscapedColumnName()).toString());
return (Criteria) this;
}
public Criteria andSigninTimeIn(List<Date> values) {
addCriterion("signin_time in", values, "signinTime");
public Criteria andCreateTimeIn(List<Date> values) {
addCriterion("create_time in", values, "createTime");
return (Criteria) this;
}
public Criteria andSigninTimeNotIn(List<Date> values) {
addCriterion("signin_time not in", values, "signinTime");
public Criteria andCreateTimeNotIn(List<Date> values) {
addCriterion("create_time not in", values, "createTime");
return (Criteria) this;
}
public Criteria andSigninTimeBetween(Date value1, Date value2) {
addCriterion("signin_time between", value1, value2, "signinTime");
public Criteria andCreateTimeBetween(Date value1, Date value2) {
addCriterion("create_time between", value1, value2, "createTime");
return (Criteria) this;
}
public Criteria andSigninTimeNotBetween(Date value1, Date value2) {
addCriterion("signin_time not between", value1, value2, "signinTime");
public Criteria andCreateTimeNotBetween(Date value1, Date value2) {
addCriterion("create_time not between", value1, value2, "createTime");
return (Criteria) this;
}
public Criteria andUpdateTimeIsNull() {
addCriterion("update_time is null");
return (Criteria) this;
}
public Criteria andUpdateTimeIsNotNull() {
addCriterion("update_time is not null");
return (Criteria) this;
}
public Criteria andUpdateTimeEqualTo(Date value) {
addCriterion("update_time =", value, "updateTime");
return (Criteria) this;
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table user_signin
*
* @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin
*/
public Criteria andUpdateTimeEqualToColumn(UserSignin.Column column) {
addCriterion(new StringBuilder("update_time = ").append(column.getEscapedColumnName()).toString());
return (Criteria) this;
}
public Criteria andUpdateTimeNotEqualTo(Date value) {
addCriterion("update_time <>", value, "updateTime");
return (Criteria) this;
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table user_signin
*
* @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin
*/
public Criteria andUpdateTimeNotEqualToColumn(UserSignin.Column column) {
addCriterion(new StringBuilder("update_time <> ").append(column.getEscapedColumnName()).toString());
return (Criteria) this;
}
public Criteria andUpdateTimeGreaterThan(Date value) {
addCriterion("update_time >", value, "updateTime");
return (Criteria) this;
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table user_signin
*
* @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin
*/
public Criteria andUpdateTimeGreaterThanColumn(UserSignin.Column column) {
addCriterion(new StringBuilder("update_time > ").append(column.getEscapedColumnName()).toString());
return (Criteria) this;
}
public Criteria andUpdateTimeGreaterThanOrEqualTo(Date value) {
addCriterion("update_time >=", value, "updateTime");
return (Criteria) this;
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table user_signin
*
* @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin
*/
public Criteria andUpdateTimeGreaterThanOrEqualToColumn(UserSignin.Column column) {
addCriterion(new StringBuilder("update_time >= ").append(column.getEscapedColumnName()).toString());
return (Criteria) this;
}
public Criteria andUpdateTimeLessThan(Date value) {
addCriterion("update_time <", value, "updateTime");
return (Criteria) this;
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table user_signin
*
* @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin
*/
public Criteria andUpdateTimeLessThanColumn(UserSignin.Column column) {
addCriterion(new StringBuilder("update_time < ").append(column.getEscapedColumnName()).toString());
return (Criteria) this;
}
public Criteria andUpdateTimeLessThanOrEqualTo(Date value) {
addCriterion("update_time <=", value, "updateTime");
return (Criteria) this;
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table user_signin
*
* @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin
*/
public Criteria andUpdateTimeLessThanOrEqualToColumn(UserSignin.Column column) {
addCriterion(new StringBuilder("update_time <= ").append(column.getEscapedColumnName()).toString());
return (Criteria) this;
}
public Criteria andUpdateTimeIn(List<Date> values) {
addCriterion("update_time in", values, "updateTime");
return (Criteria) this;
}
public Criteria andUpdateTimeNotIn(List<Date> values) {
addCriterion("update_time not in", values, "updateTime");
return (Criteria) this;
}
public Criteria andUpdateTimeBetween(Date value1, Date value2) {
addCriterion("update_time between", value1, value2, "updateTime");
return (Criteria) this;
}
public Criteria andUpdateTimeNotBetween(Date value1, Date value2) {
addCriterion("update_time not between", value1, value2, "updateTime");
return (Criteria) this;
}
public Criteria andSigninDateIsNull() {
addCriterion("signin_date is null");
return (Criteria) this;
}
public Criteria andSigninDateIsNotNull() {
addCriterion("signin_date is not null");
return (Criteria) this;
}
public Criteria andSigninDateEqualTo(String value) {
addCriterion("signin_date =", value, "signinDate");
return (Criteria) this;
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table user_signin
*
* @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin
*/
public Criteria andSigninDateEqualToColumn(UserSignin.Column column) {
addCriterion(new StringBuilder("signin_date = ").append(column.getEscapedColumnName()).toString());
return (Criteria) this;
}
public Criteria andSigninDateNotEqualTo(String value) {
addCriterion("signin_date <>", value, "signinDate");
return (Criteria) this;
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table user_signin
*
* @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin
*/
public Criteria andSigninDateNotEqualToColumn(UserSignin.Column column) {
addCriterion(new StringBuilder("signin_date <> ").append(column.getEscapedColumnName()).toString());
return (Criteria) this;
}
public Criteria andSigninDateGreaterThan(String value) {
addCriterion("signin_date >", value, "signinDate");
return (Criteria) this;
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table user_signin
*
* @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin
*/
public Criteria andSigninDateGreaterThanColumn(UserSignin.Column column) {
addCriterion(new StringBuilder("signin_date > ").append(column.getEscapedColumnName()).toString());
return (Criteria) this;
}
public Criteria andSigninDateGreaterThanOrEqualTo(String value) {
addCriterion("signin_date >=", value, "signinDate");
return (Criteria) this;
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table user_signin
*
* @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin
*/
public Criteria andSigninDateGreaterThanOrEqualToColumn(UserSignin.Column column) {
addCriterion(new StringBuilder("signin_date >= ").append(column.getEscapedColumnName()).toString());
return (Criteria) this;
}
public Criteria andSigninDateLessThan(String value) {
addCriterion("signin_date <", value, "signinDate");
return (Criteria) this;
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table user_signin
*
* @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin
*/
public Criteria andSigninDateLessThanColumn(UserSignin.Column column) {
addCriterion(new StringBuilder("signin_date < ").append(column.getEscapedColumnName()).toString());
return (Criteria) this;
}
public Criteria andSigninDateLessThanOrEqualTo(String value) {
addCriterion("signin_date <=", value, "signinDate");
return (Criteria) this;
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table user_signin
*
* @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin
*/
public Criteria andSigninDateLessThanOrEqualToColumn(UserSignin.Column column) {
addCriterion(new StringBuilder("signin_date <= ").append(column.getEscapedColumnName()).toString());
return (Criteria) this;
}
public Criteria andSigninDateLike(String value) {
addCriterion("signin_date like", value, "signinDate");
return (Criteria) this;
}
public Criteria andSigninDateNotLike(String value) {
addCriterion("signin_date not like", value, "signinDate");
return (Criteria) this;
}
public Criteria andSigninDateIn(List<String> values) {
addCriterion("signin_date in", values, "signinDate");
return (Criteria) this;
}
public Criteria andSigninDateNotIn(List<String> values) {
addCriterion("signin_date not in", values, "signinDate");
return (Criteria) this;
}
public Criteria andSigninDateBetween(String value1, String value2) {
addCriterion("signin_date between", value1, value2, "signinDate");
return (Criteria) this;
}
public Criteria andSigninDateNotBetween(String value1, String value2) {
addCriterion("signin_date not between", value1, value2, "signinDate");
return (Criteria) this;
}
......@@ -675,6 +949,402 @@ public class UserSigninExample {
addCriterion("consecutive_days not between", value1, value2, "consecutiveDays");
return (Criteria) this;
}
public Criteria andIsRewardIsNull() {
addCriterion("is_reward is null");
return (Criteria) this;
}
public Criteria andIsRewardIsNotNull() {
addCriterion("is_reward is not null");
return (Criteria) this;
}
public Criteria andIsRewardEqualTo(Boolean value) {
addCriterion("is_reward =", value, "isReward");
return (Criteria) this;
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table user_signin
*
* @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin
*/
public Criteria andIsRewardEqualToColumn(UserSignin.Column column) {
addCriterion(new StringBuilder("is_reward = ").append(column.getEscapedColumnName()).toString());
return (Criteria) this;
}
public Criteria andIsRewardNotEqualTo(Boolean value) {
addCriterion("is_reward <>", value, "isReward");
return (Criteria) this;
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table user_signin
*
* @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin
*/
public Criteria andIsRewardNotEqualToColumn(UserSignin.Column column) {
addCriterion(new StringBuilder("is_reward <> ").append(column.getEscapedColumnName()).toString());
return (Criteria) this;
}
public Criteria andIsRewardGreaterThan(Boolean value) {
addCriterion("is_reward >", value, "isReward");
return (Criteria) this;
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table user_signin
*
* @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin
*/
public Criteria andIsRewardGreaterThanColumn(UserSignin.Column column) {
addCriterion(new StringBuilder("is_reward > ").append(column.getEscapedColumnName()).toString());
return (Criteria) this;
}
public Criteria andIsRewardGreaterThanOrEqualTo(Boolean value) {
addCriterion("is_reward >=", value, "isReward");
return (Criteria) this;
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table user_signin
*
* @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin
*/
public Criteria andIsRewardGreaterThanOrEqualToColumn(UserSignin.Column column) {
addCriterion(new StringBuilder("is_reward >= ").append(column.getEscapedColumnName()).toString());
return (Criteria) this;
}
public Criteria andIsRewardLessThan(Boolean value) {
addCriterion("is_reward <", value, "isReward");
return (Criteria) this;
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table user_signin
*
* @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin
*/
public Criteria andIsRewardLessThanColumn(UserSignin.Column column) {
addCriterion(new StringBuilder("is_reward < ").append(column.getEscapedColumnName()).toString());
return (Criteria) this;
}
public Criteria andIsRewardLessThanOrEqualTo(Boolean value) {
addCriterion("is_reward <=", value, "isReward");
return (Criteria) this;
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table user_signin
*
* @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin
*/
public Criteria andIsRewardLessThanOrEqualToColumn(UserSignin.Column column) {
addCriterion(new StringBuilder("is_reward <= ").append(column.getEscapedColumnName()).toString());
return (Criteria) this;
}
public Criteria andIsRewardIn(List<Boolean> values) {
addCriterion("is_reward in", values, "isReward");
return (Criteria) this;
}
public Criteria andIsRewardNotIn(List<Boolean> values) {
addCriterion("is_reward not in", values, "isReward");
return (Criteria) this;
}
public Criteria andIsRewardBetween(Boolean value1, Boolean value2) {
addCriterion("is_reward between", value1, value2, "isReward");
return (Criteria) this;
}
public Criteria andIsRewardNotBetween(Boolean value1, Boolean value2) {
addCriterion("is_reward not between", value1, value2, "isReward");
return (Criteria) this;
}
public Criteria andRewardLevelIsNull() {
addCriterion("reward_level is null");
return (Criteria) this;
}
public Criteria andRewardLevelIsNotNull() {
addCriterion("reward_level is not null");
return (Criteria) this;
}
public Criteria andRewardLevelEqualTo(Integer value) {
addCriterion("reward_level =", value, "rewardLevel");
return (Criteria) this;
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table user_signin
*
* @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin
*/
public Criteria andRewardLevelEqualToColumn(UserSignin.Column column) {
addCriterion(new StringBuilder("reward_level = ").append(column.getEscapedColumnName()).toString());
return (Criteria) this;
}
public Criteria andRewardLevelNotEqualTo(Integer value) {
addCriterion("reward_level <>", value, "rewardLevel");
return (Criteria) this;
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table user_signin
*
* @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin
*/
public Criteria andRewardLevelNotEqualToColumn(UserSignin.Column column) {
addCriterion(new StringBuilder("reward_level <> ").append(column.getEscapedColumnName()).toString());
return (Criteria) this;
}
public Criteria andRewardLevelGreaterThan(Integer value) {
addCriterion("reward_level >", value, "rewardLevel");
return (Criteria) this;
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table user_signin
*
* @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin
*/
public Criteria andRewardLevelGreaterThanColumn(UserSignin.Column column) {
addCriterion(new StringBuilder("reward_level > ").append(column.getEscapedColumnName()).toString());
return (Criteria) this;
}
public Criteria andRewardLevelGreaterThanOrEqualTo(Integer value) {
addCriterion("reward_level >=", value, "rewardLevel");
return (Criteria) this;
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table user_signin
*
* @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin
*/
public Criteria andRewardLevelGreaterThanOrEqualToColumn(UserSignin.Column column) {
addCriterion(new StringBuilder("reward_level >= ").append(column.getEscapedColumnName()).toString());
return (Criteria) this;
}
public Criteria andRewardLevelLessThan(Integer value) {
addCriterion("reward_level <", value, "rewardLevel");
return (Criteria) this;
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table user_signin
*
* @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin
*/
public Criteria andRewardLevelLessThanColumn(UserSignin.Column column) {
addCriterion(new StringBuilder("reward_level < ").append(column.getEscapedColumnName()).toString());
return (Criteria) this;
}
public Criteria andRewardLevelLessThanOrEqualTo(Integer value) {
addCriterion("reward_level <=", value, "rewardLevel");
return (Criteria) this;
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table user_signin
*
* @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin
*/
public Criteria andRewardLevelLessThanOrEqualToColumn(UserSignin.Column column) {
addCriterion(new StringBuilder("reward_level <= ").append(column.getEscapedColumnName()).toString());
return (Criteria) this;
}
public Criteria andRewardLevelIn(List<Integer> values) {
addCriterion("reward_level in", values, "rewardLevel");
return (Criteria) this;
}
public Criteria andRewardLevelNotIn(List<Integer> values) {
addCriterion("reward_level not in", values, "rewardLevel");
return (Criteria) this;
}
public Criteria andRewardLevelBetween(Integer value1, Integer value2) {
addCriterion("reward_level between", value1, value2, "rewardLevel");
return (Criteria) this;
}
public Criteria andRewardLevelNotBetween(Integer value1, Integer value2) {
addCriterion("reward_level not between", value1, value2, "rewardLevel");
return (Criteria) this;
}
public Criteria andIsGetIsNull() {
addCriterion("is_get is null");
return (Criteria) this;
}
public Criteria andIsGetIsNotNull() {
addCriterion("is_get is not null");
return (Criteria) this;
}
public Criteria andIsGetEqualTo(Boolean value) {
addCriterion("is_get =", value, "isGet");
return (Criteria) this;
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table user_signin
*
* @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin
*/
public Criteria andIsGetEqualToColumn(UserSignin.Column column) {
addCriterion(new StringBuilder("is_get = ").append(column.getEscapedColumnName()).toString());
return (Criteria) this;
}
public Criteria andIsGetNotEqualTo(Boolean value) {
addCriterion("is_get <>", value, "isGet");
return (Criteria) this;
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table user_signin
*
* @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin
*/
public Criteria andIsGetNotEqualToColumn(UserSignin.Column column) {
addCriterion(new StringBuilder("is_get <> ").append(column.getEscapedColumnName()).toString());
return (Criteria) this;
}
public Criteria andIsGetGreaterThan(Boolean value) {
addCriterion("is_get >", value, "isGet");
return (Criteria) this;
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table user_signin
*
* @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin
*/
public Criteria andIsGetGreaterThanColumn(UserSignin.Column column) {
addCriterion(new StringBuilder("is_get > ").append(column.getEscapedColumnName()).toString());
return (Criteria) this;
}
public Criteria andIsGetGreaterThanOrEqualTo(Boolean value) {
addCriterion("is_get >=", value, "isGet");
return (Criteria) this;
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table user_signin
*
* @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin
*/
public Criteria andIsGetGreaterThanOrEqualToColumn(UserSignin.Column column) {
addCriterion(new StringBuilder("is_get >= ").append(column.getEscapedColumnName()).toString());
return (Criteria) this;
}
public Criteria andIsGetLessThan(Boolean value) {
addCriterion("is_get <", value, "isGet");
return (Criteria) this;
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table user_signin
*
* @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin
*/
public Criteria andIsGetLessThanColumn(UserSignin.Column column) {
addCriterion(new StringBuilder("is_get < ").append(column.getEscapedColumnName()).toString());
return (Criteria) this;
}
public Criteria andIsGetLessThanOrEqualTo(Boolean value) {
addCriterion("is_get <=", value, "isGet");
return (Criteria) this;
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table user_signin
*
* @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin
*/
public Criteria andIsGetLessThanOrEqualToColumn(UserSignin.Column column) {
addCriterion(new StringBuilder("is_get <= ").append(column.getEscapedColumnName()).toString());
return (Criteria) this;
}
public Criteria andIsGetIn(List<Boolean> values) {
addCriterion("is_get in", values, "isGet");
return (Criteria) this;
}
public Criteria andIsGetNotIn(List<Boolean> values) {
addCriterion("is_get not in", values, "isGet");
return (Criteria) this;
}
public Criteria andIsGetBetween(Boolean value1, Boolean value2) {
addCriterion("is_get between", value1, value2, "isGet");
return (Criteria) this;
}
public Criteria andIsGetNotBetween(Boolean value1, Boolean value2) {
addCriterion("is_get not between", value1, value2, "isGet");
return (Criteria) this;
}
}
public static class Criteria extends GeneratedCriteria {
......
ch-dao/src/main/java/com/wwdz/ch/db/dto/request/UserSigninRequestDto.java
View file @ 9da87711
......@@ -20,11 +20,40 @@ public class UserSigninRequestDto extends BaseRequestDto implements Entity {
/**
* 签到时间
*/
private Date signinTime;
private Date createTime;
private Date startQueryTime;
private Date endQueryTime;
/**
* 更新时间
*/
private Date updateTime;
/**
* 签到日期
*/
private String signinDate;
/**
* 连续天数
*/
private Integer consecutiveDays;
/**
* 是否有奖励
*/
private Boolean isReward;
/**
* 奖励等级
*/
private Integer rewardLevel;
/**
* 是否领取奖励
*/
private Boolean isGet;
}
ch-dao/src/main/java/com/wwdz/ch/db/impl/UserSigninDaoImpl.java
View file @ 9da87711
......@@ -5,11 +5,15 @@ import com.wwdz.ch.db.domain.UserSignin;
import com.wwdz.ch.db.domain.UserSigninExample;
import com.wwdz.ch.db.dto.request.UserSigninRequestDto;
import com.wwdz.ch.db.mapper.UserSigninMapper;
import com.xxdxxs.db.component.JdbcHelper;
import com.xxdxxs.utils.DateUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Repository;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.LocalTime;
import java.time.format.DateTimeFormatter;
import java.util.List;
@Repository
......@@ -28,7 +32,7 @@ public class UserSigninDaoImpl implements UserSigninDao {
UserSigninExample example = new UserSigninExample();
UserSigninExample.Criteria criteria = example.createCriteria();
criteria.andUserIdEqualTo(userId);
example.setOrderByClause("signin_time desc");
example.setOrderByClause("create_time desc");
return userSigninMapper.selectOneByExample(example);
}
......@@ -37,21 +41,21 @@ public class UserSigninDaoImpl implements UserSigninDao {
UserSigninExample example = new UserSigninExample();
UserSigninExample.Criteria criteria = example.createCriteria();
criteria.andUserIdEqualTo(dto.getUserId());
example.setOrderByClause("signin_time desc");
JdbcHelper.ifPresent(dto.getStartQueryTime(), criteria :: andCreateTimeGreaterThanOrEqualTo);
JdbcHelper.ifPresent(dto.getEndQueryTime(), criteria :: andCreateTimeLessThanOrEqualTo);
example.setOrderByClause("create_time desc");
return userSigninMapper.selectByExample(example);
}
@Override
public UserSignin findYesterdayRecord(long userId) {
LocalDateTime now = LocalDateTime.now();
LocalDateTime yesterday = now.minusDays(1);
LocalDateTime minTime = yesterday.with(LocalTime.MIN);
LocalDateTime maxTime = yesterday.with(LocalTime.MAX);
LocalDate yesterday = LocalDate.now().minusDays(1);
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
String yesterdayString = yesterday.format(formatter);
UserSigninExample example = new UserSigninExample();
UserSigninExample.Criteria criteria = example.createCriteria();
criteria.andUserIdEqualTo(userId);
criteria.andSigninTimeGreaterThanOrEqualTo(DateUtils.fromLocalDateTime(minTime));
criteria.andSigninTimeLessThanOrEqualTo(DateUtils.fromLocalDateTime(maxTime));
criteria.andSigninDateEqualTo(yesterdayString);
return userSigninMapper.selectOneByExample(example);
}
......
ch-dao/src/main/resources/com/wwdz/ch/db/mapper/UserSigninMapper.xml
View file @ 9da87711
......@@ -4,8 +4,13 @@
<resultMap id="BaseResultMap" type="com.wwdz.ch.db.domain.UserSignin">
<id column="id" jdbcType="BIGINT" property="id" />
<result column="user_id" jdbcType="BIGINT" property="userId" />
<result column="signin_time" jdbcType="TIMESTAMP" property="signinTime" />
<result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
<result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
<result column="signin_date" jdbcType="VARCHAR" property="signinDate" />
<result column="consecutive_days" jdbcType="INTEGER" property="consecutiveDays" />
<result column="is_reward" jdbcType="BIT" property="isReward" />
<result column="reward_level" jdbcType="INTEGER" property="rewardLevel" />
<result column="is_get" jdbcType="BIT" property="isGet" />
</resultMap>
<sql id="Example_Where_Clause">
<where>
......@@ -66,7 +71,8 @@
</where>
</sql>
<sql id="Base_Column_List">
id, user_id, signin_time, consecutive_days
id, user_id, create_time, update_time, signin_date, consecutive_days, is_reward,
reward_level, is_get
</sql>
<select id="selectByExample" parameterType="com.wwdz.ch.db.domain.UserSigninExample" resultMap="BaseResultMap">
select
......@@ -95,13 +101,14 @@
distinct
</if>
<choose>
<when test="selective != null and selective.length > 0">
<when test="selective != null and selective.length &gt; 0">
<foreach collection="selective" item="column" separator=",">
${column.escapedColumnName}
</foreach>
</when>
<otherwise>
id, user_id, signin_time, consecutive_days
id, user_id, create_time, update_time, signin_date, consecutive_days, is_reward,
reward_level, is_get
</otherwise>
</choose>
from user_signin
......@@ -126,13 +133,14 @@
-->
select
<choose>
<when test="selective != null and selective.length > 0">
<when test="selective != null and selective.length &gt; 0">
<foreach collection="selective" item="column" separator=",">
${column.escapedColumnName}
</foreach>
</when>
<otherwise>
id, user_id, signin_time, consecutive_days
id, user_id, create_time, update_time, signin_date, consecutive_days, is_reward,
reward_level, is_get
</otherwise>
</choose>
from user_signin
......@@ -152,10 +160,12 @@
<selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
SELECT LAST_INSERT_ID()
</selectKey>
insert into user_signin (user_id, signin_time, consecutive_days
)
values (#{userId,jdbcType=BIGINT}, #{signinTime,jdbcType=TIMESTAMP}, #{consecutiveDays,jdbcType=INTEGER}
)
insert into user_signin (user_id, create_time, update_time,
signin_date, consecutive_days, is_reward,
reward_level, is_get)
values (#{userId,jdbcType=BIGINT}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP},
#{signinDate,jdbcType=VARCHAR}, #{consecutiveDays,jdbcType=INTEGER}, #{isReward,jdbcType=BIT},
#{rewardLevel,jdbcType=INTEGER}, #{isGet,jdbcType=BIT})
</insert>
<insert id="insertSelective" parameterType="com.wwdz.ch.db.domain.UserSignin">
<selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
......@@ -166,23 +176,53 @@
<if test="userId != null">
user_id,
</if>
<if test="signinTime != null">
signin_time,
<if test="createTime != null">
create_time,
</if>
<if test="updateTime != null">
update_time,
</if>
<if test="signinDate != null">
signin_date,
</if>
<if test="consecutiveDays != null">
consecutive_days,
</if>
<if test="isReward != null">
is_reward,
</if>
<if test="rewardLevel != null">
reward_level,
</if>
<if test="isGet != null">
is_get,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="userId != null">
#{userId,jdbcType=BIGINT},
</if>
<if test="signinTime != null">
#{signinTime,jdbcType=TIMESTAMP},
<if test="createTime != null">
#{createTime,jdbcType=TIMESTAMP},
</if>
<if test="updateTime != null">
#{updateTime,jdbcType=TIMESTAMP},
</if>
<if test="signinDate != null">
#{signinDate,jdbcType=VARCHAR},
</if>
<if test="consecutiveDays != null">
#{consecutiveDays,jdbcType=INTEGER},
</if>
<if test="isReward != null">
#{isReward,jdbcType=BIT},
</if>
<if test="rewardLevel != null">
#{rewardLevel,jdbcType=INTEGER},
</if>
<if test="isGet != null">
#{isGet,jdbcType=BIT},
</if>
</trim>
</insert>
<select id="countByExample" parameterType="com.wwdz.ch.db.domain.UserSigninExample" resultType="java.lang.Long">
......@@ -200,12 +240,27 @@
<if test="record.userId != null">
user_id = #{record.userId,jdbcType=BIGINT},
</if>
<if test="record.signinTime != null">
signin_time = #{record.signinTime,jdbcType=TIMESTAMP},
<if test="record.createTime != null">
create_time = #{record.createTime,jdbcType=TIMESTAMP},
</if>
<if test="record.updateTime != null">
update_time = #{record.updateTime,jdbcType=TIMESTAMP},
</if>
<if test="record.signinDate != null">
signin_date = #{record.signinDate,jdbcType=VARCHAR},
</if>
<if test="record.consecutiveDays != null">
consecutive_days = #{record.consecutiveDays,jdbcType=INTEGER},
</if>
<if test="record.isReward != null">
is_reward = #{record.isReward,jdbcType=BIT},
</if>
<if test="record.rewardLevel != null">
reward_level = #{record.rewardLevel,jdbcType=INTEGER},
</if>
<if test="record.isGet != null">
is_get = #{record.isGet,jdbcType=BIT},
</if>
</set>
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
......@@ -215,8 +270,13 @@
update user_signin
set id = #{record.id,jdbcType=BIGINT},
user_id = #{record.userId,jdbcType=BIGINT},
signin_time = #{record.signinTime,jdbcType=TIMESTAMP},
consecutive_days = #{record.consecutiveDays,jdbcType=INTEGER}
create_time = #{record.createTime,jdbcType=TIMESTAMP},
update_time = #{record.updateTime,jdbcType=TIMESTAMP},
signin_date = #{record.signinDate,jdbcType=VARCHAR},
consecutive_days = #{record.consecutiveDays,jdbcType=INTEGER},
is_reward = #{record.isReward,jdbcType=BIT},
reward_level = #{record.rewardLevel,jdbcType=INTEGER},
is_get = #{record.isGet,jdbcType=BIT}
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
</if>
......@@ -227,20 +287,40 @@
<if test="userId != null">
user_id = #{userId,jdbcType=BIGINT},
</if>
<if test="signinTime != null">
signin_time = #{signinTime,jdbcType=TIMESTAMP},
<if test="createTime != null">
create_time = #{createTime,jdbcType=TIMESTAMP},
</if>
<if test="updateTime != null">
update_time = #{updateTime,jdbcType=TIMESTAMP},
</if>
<if test="signinDate != null">
signin_date = #{signinDate,jdbcType=VARCHAR},
</if>
<if test="consecutiveDays != null">
consecutive_days = #{consecutiveDays,jdbcType=INTEGER},
</if>
<if test="isReward != null">
is_reward = #{isReward,jdbcType=BIT},
</if>
<if test="rewardLevel != null">
reward_level = #{rewardLevel,jdbcType=INTEGER},
</if>
<if test="isGet != null">
is_get = #{isGet,jdbcType=BIT},
</if>
</set>
where id = #{id,jdbcType=BIGINT}
</update>
<update id="updateByPrimaryKey" parameterType="com.wwdz.ch.db.domain.UserSignin">
update user_signin
set user_id = #{userId,jdbcType=BIGINT},
signin_time = #{signinTime,jdbcType=TIMESTAMP},
consecutive_days = #{consecutiveDays,jdbcType=INTEGER}
create_time = #{createTime,jdbcType=TIMESTAMP},
update_time = #{updateTime,jdbcType=TIMESTAMP},
signin_date = #{signinDate,jdbcType=VARCHAR},
consecutive_days = #{consecutiveDays,jdbcType=INTEGER},
is_reward = #{isReward,jdbcType=BIT},
reward_level = #{rewardLevel,jdbcType=INTEGER},
is_get = #{isGet,jdbcType=BIT}
where id = #{id,jdbcType=BIGINT}
</update>
<select id="selectOneByExample" parameterType="com.wwdz.ch.db.domain.UserSigninExample" resultMap="BaseResultMap">
......@@ -270,13 +350,14 @@
select
'true' as QUERYID,
<choose>
<when test="selective != null and selective.length > 0">
<when test="selective != null and selective.length &gt; 0">
<foreach collection="selective" item="column" separator=",">
${column.escapedColumnName}
</foreach>
</when>
<otherwise>
id, user_id, signin_time, consecutive_days
id, user_id, create_time, update_time, signin_date, consecutive_days, is_reward,
reward_level, is_get
</otherwise>
</choose>
from user_signin
......
ch-dao/src/main/resources/generatorConfig_new.xml
View file @ 9da87711
......@@ -63,16 +63,16 @@
<!--生成Model类存放位置-->
<javaModelGenerator targetPackage="com.wwdz.ch.db.domain.distribution" targetProject="ch-dao/src/main/java">
<javaModelGenerator targetPackage="com.wwdz.ch.db.domain" targetProject="ch-dao/src/main/java">
<property name="enableSubPackages" value="true"/>
<property name="trimStrings" value="true"/>
</javaModelGenerator>
<sqlMapGenerator targetPackage="com.wwdz.ch.db.mapper.distribution" targetProject="ch-dao/src/main/resources"/>
<javaClientGenerator type="XMLMAPPER" targetPackage="com.wwdz.ch.db.mapper.distribution"
<sqlMapGenerator targetPackage="com.wwdz.ch.db.mapper" targetProject="ch-dao/src/main/resources"/>
<javaClientGenerator type="XMLMAPPER" targetPackage="com.wwdz.ch.db.mapper"
targetProject="ch-dao/src/main/java"/>
<table tableName="sell_activity" enableCountByExample="true" enableUpdateByExample="true" enableDeleteByExample="true" enableSelectByExample="true" selectByExampleQueryId="true">
<table tableName="user_signin" enableCountByExample="true" enableUpdateByExample="true" enableDeleteByExample="true" enableSelectByExample="true" selectByExampleQueryId="true">
<generatedKey column="id" sqlStatement="Mysql" identity="true" />
</table>
......
ch-wx-api/src/main/java/com/wwdz/ch/wx/impl/distribution/BlindBoxServiceImpl.java
View file @ 9da87711
......@@ -11,7 +11,6 @@ import com.wwdz.ch.db.dao.distribution.DistributionOrderDao;
import com.wwdz.ch.db.dao.distribution.ItemSkuDao;
import com.wwdz.ch.db.dao.distribution.SellActivityDao;
import com.wwdz.ch.db.dao.distribution.SupplierItemDao;
import com.wwdz.ch.db.domain.Item;
import com.wwdz.ch.db.domain.User;
import com.wwdz.ch.db.domain.distribution.DistributionOrder;
import com.wwdz.ch.db.domain.distribution.ItemSku;
......
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