盲袋优惠活动可配置

ch-core/src/main/java/com/wwdz/ch/core/util/DateTimeUtil.java

@@ -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

 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/dto/request/UserSigninRequestDto.java

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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;