Skip to content

S
shop-Mall
Commit 17be847d authored by m1991's avatar m1991
Browse files
Options

Merge remote-tracking branch 'origin/master'

parents 1f390084 68bf91c5
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 3334 additions and 336 deletions
wisenergy-mapper/src/main/java/cn/wisenergy/mapper/LastMonthCultivatingPrizeInfoMapper.java 0 → 100644
View file @ 17be847d
package cn.wisenergy.mapper;
import cn.wisenergy.model.app.CultivatingPrize;
import cn.wisenergy.model.app.CultivatingPrizeInfo;
import cn.wisenergy.model.app.LastMonthCultivatingPrizeInfo;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
public interface LastMonthCultivatingPrizeInfoMapper extends BaseMapper<LastMonthCultivatingPrizeInfo> {
LastMonthCultivatingPrizeInfo getOneByUserId(String userId);
}
wisenergy-mapper/src/main/java/cn/wisenergy/mapper/LastMonthRecommendUserMapper.java 0 → 100644
View file @ 17be847d
package cn.wisenergy.mapper;
import cn.wisenergy.model.app.LastMonthRecommendUser;
import cn.wisenergy.model.app.RecommendUser;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
public interface LastMonthRecommendUserMapper extends BaseMapper<LastMonthRecommendUser> {
/**
* 获取用户直推信息
* @param userId 用户Id
* @return 用户直推信息
*/
LastMonthRecommendUser getByUserId(String userId);
//根据用户推荐人的userid,查询数据库用户直推表，看推荐人用户是否存在
Integer zcByUserId(String userid);
/**
* 获取用户的直推用户总人数
* @param userId 用户Id
* @return 直推用户总人数
*/
Integer getRecommendUserCountByUserId(String userId);
/**
* 新增用户直推信息
* @param recommendUser
* @return
*/
int add(LastMonthRecommendUser recommendUser);
}
wisenergy-mapper/src/main/java/cn/wisenergy/mapper/LastMonthTeamUserInfoMapper.java 0 → 100644
View file @ 17be847d
package cn.wisenergy.mapper;
import cn.wisenergy.model.app.LastMonthTeamUserInfo;
import cn.wisenergy.model.app.TeamUserInfo;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
public interface LastMonthTeamUserInfoMapper extends BaseMapper<LastMonthTeamUserInfo> {
/**
* 获取用户的团队信息
* @param userId 用户Id
* @return 用户的团队信息
*/
LastMonthTeamUserInfo getByUserId(String userId);
/**
* 获取用户的团队总人数
* @param userId 用户Id
* @return 团队总人数
*/
Integer getTeamUserCount(String userId);
int add(LastMonthTeamUserInfo teamUserInfo);
int edit(LastMonthTeamUserInfo lastMonthTeamUserInfo);
}
wisenergy-mapper/src/main/java/cn/wisenergy/mapper/LastMonthUserInfoMapper.java 0 → 100644
View file @ 17be847d
package cn.wisenergy.mapper;
import cn.hutool.system.UserInfo;
import cn.wisenergy.model.app.LastMonthUserInfo;
import cn.wisenergy.model.app.User;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
import java.util.Map;
public interface LastMonthUserInfoMapper extends BaseMapper<LastMonthUserInfo> {
/**
* 添加
*
* @param user 用户信息
* @return 用户信息
*/
int add(LastMonthUserInfo user);
/**
* 编辑
*
* @param user 用户信息
* @return 修改是否成功
*/
int edit(LastMonthUserInfo user);
/**
* 删除
*
* @param id 用户id
* @return 删除是否成功
*/
int delById(@Param("id") Integer id);
List<User> getList(Map<String, Object> map);
/**
* 获取所有的非普通用户列表
*
* @return 非普通用户列表
*/
List<LastMonthUserInfo> findAllNotZeroUser();
LastMonthUserInfo findByName(String name);
String findPswByName(String UserName);
void save(LastMonthUserInfo user);
/**
* 获取用户信息
*
* @return 用户信息
*/
LastMonthUserInfo getUserById(@Param("id") Long id);
/**
* 获取用户信息
*
* @param userId 用户id
* @return 用户信息
*/
LastMonthUserInfo getByUserId(@Param("userId") String userId);
/**
* 获取用户信息
*
* @param userId 用户id
* @return 用户信息
*/
Integer ByUserId(@Param("userId") String userId);
/**
* 获取用户信息
*
* @param
* @return 用户信息
*/
Integer beInvitedCode1(@Param("beInvitedCode") String beInvitedCode);
/**
* 获取用户信息
*
* @param beInvitedCode 用户被邀请码
* @return 用户信息
*/
LastMonthUserInfo getByBeInvitedCode(@Param("beInvitedCode") String beInvitedCode);
/**
* 获取黄金树以上会员用户
*
* @return
*/
List<LastMonthUserInfo> getAllGoldUser();
/**
* 查询用户
*
* @param param
* @return
*/
public List<LastMonthUserInfo> getUsersListByMap(Map<String, Object> param);
//根据手机号查询用户Integer
LastMonthUserInfo queryUsersByPhone(@Param("userId") String userId);
//根据用户的推荐人邀请码比对推荐人的本人邀请码，查询推荐人的用户ID
Integer inviteCodeBeInvitedCode(@Param("beInvitedCode") Integer beInvitedCode);
/**
* 用户注册
*
* @param userId
* @param inviteCode
* @param beInvitedCode
* @param userLevel
*/
Integer insertbyint(@Param("userId") String userId, @Param("inviteCode") String inviteCode, @Param("beInvitedCode") String beInvitedCode, @Param("userLevel") Integer userLevel, @Param("headImage") String headImage,@Param("frozen") Integer frozen);
Integer save(@Param("userId") String userId, @Param("beInvitedCode") String beInvitedCode);
LastMonthUserInfo edit1(int userLevel, String intiveCode, String userId);
Integer getuserIdById(@Param("userId") String userId);
Integer getById(@Param("userId") String userId);
String BYQMById(@Param("userId") String userId);
/**
* 根据userid获取获取所有的直接推荐人
*
* @param inviteCode 用户本人的邀请码
* @return 所有填写此人的邀请码的用户
*/
List<LastMonthUserInfo> getByInviteCode(@Param("inviteCode") String inviteCode, @Param("userLevel") int userLevel);
/**
* 通过邀请码，获取用户信息
*
* @param inviteCode 邀请码
* @return 用户信息
*/
LastMonthUserInfo queryByInviteCode(@Param("inviteCode") String inviteCode);
/**
* 通过用户等级，获取该等级用户列表
*
* @param userLevel 用户等级
* @return 等级用户列表
*/
List<LastMonthUserInfo> getByLevel(@Param("userLevel") Integer userLevel);
/**
* @param
* @return
*/
LastMonthUserInfo biInvitedCode1(@Param("inviteCode") String inviteCode);
/**
* 用户邀请码查询用户数据
*
* @param inviteCode
* @return
*/
LastMonthUserInfo InvitedCode2(@Param("inviteCode") String inviteCode);
/**
* 根据用户的推荐人邀请码 查询上级用户的id
*
* @param beInvitedCode
* @return
*/
String getUserByIntiveCode(String beInvitedCode);
String getUserIdByIntiveCode(String outerUserId);
/**
* 获取所有的空投用户
* 且注册时间为一月之前
*
* @return
*/
List<LastMonthUserInfo> getAerialDeliveryUserBeforOneMonth(@Param("before") String before,
@Param("now") String now);
/**
* 随机获取一条小于当前id的用户 即： 比当前用户早注册的用户
*
* @param id
* @return
*/
LastMonthUserInfo randOneGetUserByUserId(Integer id);
/**
* 根据邀请码获取所有的下级用户
* @param userId
* @return
*/
List<LastMonthUserInfo> getListByIntvitedCode(String userId);
/**
* 根据当前用户的推荐人邀请码获取推荐人的用户信息(上级用户信息)
* @param beInvitedCode
* @return
*/
LastMonthUserInfo getuserByBeInvitedCode(String beInvitedCode);
/**
* 获取在团队中处于同一位置的用户集合
* @param beInvitedCode
* @return
*/
List<LastMonthUserInfo> getListUserByBeInvitedCode(String beInvitedCode);
/**
* 通过邀请码获取用户信息
* @param inviteCode
* @return
*/
LastMonthUserInfo getUserByInviteCode(String inviteCode);
/**
* 根据用户的userid查询用户对象
* @param userId
* @return
*/
LastMonthUserInfo getUserByUserId(String userId);
List<LastMonthUserInfo> getAll();
}
wisenergy-mapper/src/main/java/cn/wisenergy/mapper/TradeRecordMapper.java
View file @ 17be847d
......@@ -47,14 +47,6 @@ public interface TradeRecordMapper extends BaseMapper<TradeRecord> {
*/
List<TradeRecord> getByUserId(@Param("userId") String userId);
/**
* 根据用户id、年月 ,获取用户本月交易列表
*
* @param userId 用户id
* @return 用户交易列表
*/
List<TradeRecord> getByUserIdAndTime(@Param("userId") String userId, @Param("yearMonth") Date yearMonth);
/**
* 获取不包括本月的六个月的累计收益
*
......@@ -122,6 +114,28 @@ public interface TradeRecordMapper extends BaseMapper<TradeRecord> {
*/
List<TradeRecord> getList(Map<String, Object> map);
/**
* 获取版本信息
* @return 版本信息
*/
TradeRecord getVersion();
/**
* 根据类型和用户id,获取用户本月该类型最新数据
* @param userId 用户id
* @param tradeType 类型
* @param yearMonth 时间
* @return 交易记录
*/
TradeRecord getByUserIdAndType(@Param("userId") String userId, @Param("tradeType") Integer tradeType,
@Param("yearMonth") Date yearMonth);
/**
* 获取本月返佣列表
* @param userId 用户id
* @param yearMonth 时间
* @return 返佣交易记录列表
*/
List<TradeRecord> getRebateList(@Param("userId") String userId,@Param("yearMonth") Date yearMonth);
}
wisenergy-mapper/src/main/java/cn/wisenergy/mapper/UserDataInfoMapper.java 0 → 100644
View file @ 17be847d
package cn.wisenergy.mapper;
import cn.wisenergy.model.app.UserDataInfo;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import java.util.List;
public interface UserDataInfoMapper extends BaseMapper<UserDataInfo> {
int add(UserDataInfo userDataInfo);
List<UserDataInfo> getALl();
List<UserDataInfo> getListByLevelStatus(int levelStatus);
}
wisenergy-mapper/src/main/resources/mapper/LastMonthCultivatingPrizeInfoMapper.xml 0 → 100644
View file @ 17be847d
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="cn.wisenergy.mapper.LastMonthCultivatingPrizeInfoMapper">
<resultMap id="LastMonthCultivatingPrizeInfoMap" type="cn.wisenergy.model.app.LastMonthCultivatingPrizeInfo">
<id column="id" property="id"/>
<result column="user_id" property="userId"/>
<result column="seedling" property="seedling"/>
<result column="bronze_tree" property="bronzeTree"/>
<result column="silver_tree" property="silverTree"/>
<result column="gold_tree" property="goldTree"/>
<result column="farmer" property="farmer"/>
<result column="forest_start" property="forestStart"/>
<result column="partner" property="partner"/>
<result column="create_time" property="createTime"/>
<result column="update_time" property="updateTime"/>
</resultMap>
<sql id="table">
lastmonth_cultivating_prize_info
</sql>
<sql id="cols_all">
id,
<include refid="cols_exclude_id"/>
</sql>
<sql id="cols_exclude_id">
user_id,seedling,bronze_tree,silver_tree,gold_tree,farmer,forest_start,partner,create_time,update_time
</sql>
<sql id="vals">
#{userId},#{seedling},#{bronzeTree},#{silverTree},#{goldTree},#{farmer},#{forestStart},#{partner},now(),now()
</sql>
<sql id="updateCondition">
<if test="userId != null">user_id = #{userId},</if>
<if test="seedling != null">seedling = #{seedling},</if>
<if test="bronzeTree != null">bronze_tree = #{bronzeTree},</if>
<if test="silverTree != null">silver_tree = #{silverTree},</if>
<if test="goldTree != null">gold_tree = #{goldTree},</if>
<if test="farmer != null">farmer = #{farmer},</if>
<if test="forestStart != null">forest_start = #{forestStart},</if>
<if test="partner != null">partner = #{partner},</if>
update_time =now()
</sql>
<sql id="criteria">
<if test="id != null">id = #{id}</if>
<if test="userId != null">and user_id = #{userId}</if>
<if test="seedling != null">and seedling = #{seedling}</if>
<if test="bronzeTree != null">and bronze_tree = #{bronzeTree}</if>
<if test="silverTree != null">and silver_tree = #{silverTree}</if>
<if test="goldTree != null">and gold_tree = #{goldTree}</if>
<if test="farmer != null">and farmer = #{farmer}</if>
<if test="forestStart != null">and forest_start = #{forestStart}</if>
<if test="partner != null">and partner = #{partner}</if>
<if test="createTime != null">and create_time &gt;= #{createTime}</if>
<if test="updateTime != null">and #{updateTime} &gt;= update_time</if>
</sql>
<select id="getOneByUserId" resultType="cn.wisenergy.model.app.LastMonthCultivatingPrizeInfo">
select
<include refid="cols_all"/>
from
<include refid="table"/>
<where>
user_id = #{userId}
</where>
</select>
</mapper>
\ No newline at end of file
wisenergy-mapper/src/main/resources/mapper/LastMonthRecommendUserMapper.xml 0 → 100644
View file @ 17be847d
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="cn.wisenergy.mapper.LastMonthRecommendUserMapper">
<resultMap id="userMap" type="cn.wisenergy.model.app.LastMonthRecommendUser">
<id column="id" property="id"/>
<result column="user_id" property="userId"/>
<result column="normal_user_num" property="normalUserNum"/>
<result column="seedling_num" property="seedlingNum"/>
<result column="bronze_tree_num" property="bronzeTreeNum"/>
<result column="silver_tree_num" property="silverTreeNum"/>
<result column="gold_tree_num" property="goldTreeNum"/>
<result column="farmer_num" property="farmerNum"/>
<result column="forest_start_num" property="forestStartNum"/>
<result column="partner_num" property="partnerNum"/>
<result column="create_time" property="createTime"/>
<result column="update_time" property="updateTime"/>
<result column="monthy_count" property="monthyCount"/>
<result column="history_count" property="historyCount"/>
</resultMap>
<sql id="table">
lastmonth_recommend_user
</sql>
<sql id="cols_all">
id,
<include refid="cols_exclude_id"/>
</sql>
<sql id="cols_exclude_id">
user_id,normal_user_num,seedling_num,bronze_tree_num,silver_tree_num,
gold_tree_num,farmer_num,forest_start_num,partner_num,create_time,update_time,monthy_count,history_count
</sql>
<sql id="vals">
#{userId},#{normalUserNum},#{seedlingNum},#{bronzeTreeNum},#{silverTreeNum},
#{goldTreeNum},#{farmerNum},#{forestStartNum},#{partnerNum},now(),now(),#{monthyCount},#{historyCount}
</sql>
<sql id="updateCondition">
<if test="normalUserNum != null">normal_user_num =#{normalUserNum},</if>
<if test="seedlingNum != null">seedling_num =#{seedlingNum},</if>
<if test="bronzeTreeNum != null">bronze_tree_num =#{bronzeTreeNum},</if>
<if test="silverTreeNum != null">silver_tree_num =#{silverTreeNum},</if>
<if test="goldTreeNum != null">gold_tree_num =#{goldTreeNum},</if>
<if test="farmerNum != null">farmer_num =#{farmerNum},</if>
<if test="forestStartNum != null">forest_start_num =#{forestStartNum},</if>
<if test="partnerNum != null">partner_num =#{partnerNum},</if>
<if test="monthyCount != null">monthy_count =#{monthyCount},</if>
<if test="historyCount != null">history_count =#{historyCount},</if>
update_time =now()
</sql>
<sql id="criteria">
<if test="id != null">id = #{id}</if>
<if test="normalUserNum != null">and normal_user_num =#{normalUserNum},</if>
<if test="seedlingNum != null">and seedling_num =#{seedlingNum},</if>
<if test="bronzeTreeNum != null">and bronze_tree_num =#{bronzeTreeNum},</if>
<if test="silverTreeNum != null">and silver_tree_num =#{silverTreeNum},</if>
<if test="goldTreeNum != null">and gold_tree_num =#{goldTreeNum},</if>
<if test="farmerNum != null">and farmer_num =#{farmerNum},</if>
<if test="forestStartNum != null">and forest_start_num =#{forestStartNum},</if>
<if test="partnerNum != null">and partner_num =#{partnerNum},</if>
<if test="createTime != null">and create_time &gt;= #{createTime}</if>
<if test="updateTime != null">and #{updateTime} &gt;= update_time</if>
<if test="monthyCount != null">and #{monthyCount} &gt;= monthyCount</if>
<if test="historyCount != null">and #{historyCount} &gt;= historyCount</if>
</sql>
<select id="getByUserId" resultType="cn.wisenergy.model.app.LastMonthRecommendUser">
select
<include refid="cols_all"/>
from
<include refid="table"/>
<where>
user_id=#{userId}
</where>
</select>
<!--根据用户邀请码更新直推表-->
<select id="zcByUserId" resultType="integer">
select
id
from
<include refid="table"/>
<where>
user_id=#{userid}
</where>
</select>
<!--用户信息插入用户直推表-->
<select id="getRecommendUserCountByUserId" resultType="java.lang.Integer">
select
(normal_user_num+seedling_num+bronze_tree_num+silver_tree_num+
gold_tree_num+farmer_num+forest_start_num+partner_num) AS RecommendUserCount
from
<include refid="table"/>
<where>
user_id=#{userId}
</where>
</select>
<insert id="add" parameterType="cn.wisenergy.model.app.LastMonthRecommendUser" keyProperty="id" useGeneratedKeys="true">
insert into
<include refid="table"/>
(<include refid="cols_exclude_id"/>)
value
(<include refid="vals"/>)
</insert>
</mapper>
\ No newline at end of file
wisenergy-mapper/src/main/resources/mapper/LastMonthTeamUserInfoMapper.xml 0 → 100644
View file @ 17be847d
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="cn.wisenergy.mapper.LastMonthTeamUserInfoMapper">
<resultMap id="userMap" type="cn.wisenergy.model.app.LastMonthTeamUserInfo">
<id column="id" property="id"/>
<result column="user_id" property="userId"/>
<result column="normal_user_num" property="normalUserNum"/>
<result column="seedling_num" property="seedlingNum"/>
<result column="bronze_tree_num" property="bronzeTreeNum"/>
<result column="silver_tree_num" property="silverTreeNum"/>
<result column="gold_tree_num" property="goldTreeNum"/>
<result column="farmer_num" property="farmerNum"/>
<result column="forest_start_num" property="forestStartNum"/>
<result column="partner_num" property="partnerNum"/>
<result column="create_time" property="createTime"/>
<result column="update_time" property="updateTime"/>
</resultMap>
<sql id="table">
lastmonth_team_user_info
</sql>
<sql id="cols_all">
id,
<include refid="cols_exclude_id"/>
</sql>
<sql id="cols_exclude_id">
user_id,normal_user_num,seedling_num,bronze_tree_num,silver_tree_num,
gold_tree_num,farmer_num,forest_start_num,partner_num,create_time,update_time
</sql>
<sql id="vals">
#{userId},#{normalUserNum},#{seedlingNum},#{bronzeTreeNum},#{silverTreeNum},
#{goldTreeNum},#{farmerNum},#{forestStartNum},#{partnerNum},now(),now()
</sql>
<sql id="updateCondition">
<if test="normalUserNum != null">normal_user_num =#{normalUserNum},</if>
<if test="seedlingNum != null">seedling_num =#{seedlingNum},</if>
<if test="bronzeTreeNum != null">bronze_tree_num =#{bronzeTreeNum},</if>
<if test="silverTreeNum != null">silver_tree_num =#{silverTreeNum},</if>
<if test="goldTreeNum != null">gold_tree_num =#{goldTreeNum},</if>
<if test="farmerNum != null">farmer_num =#{farmerNum},</if>
<if test="forestStartNum != null">forest_start_num =#{forestStartNum},</if>
<if test="partnerNum != null">partner_num =#{partnerNum},</if>
update_time =now()
</sql>
<sql id="criteria">
<if test="id != null">id = #{id}</if>
<if test="normalUserNum != null">and normal_user_num =#{normalUserNum},</if>
<if test="seedlingNum != null">and seedling_num =#{seedlingNum},</if>
<if test="bronzeTreeNum != null">and bronze_tree_num =#{bronzeTreeNum},</if>
<if test="silverTreeNum != null">and silver_tree_num =#{silverTreeNum},</if>
<if test="goldTreeNum != null">and gold_tree_num =#{goldTreeNum},</if>
<if test="farmerNum != null">and farmer_num =#{farmerNum},</if>
<if test="forestStartNum != null">and forest_start_num =#{forestStartNum},</if>
<if test="partnerNum != null">and partner_num =#{partnerNum},</if>
<if test="createTime != null">and create_time &gt;= #{createTime}</if>
<if test="updateTime != null">and #{updateTime} &gt;= update_time</if>
</sql>
<update id="edit">
UPDATE
<include refid="table"/>
<set>
<include refid="updateCondition"/>
</set>
<where>
id = #{id}
</where>
</update>
<select id="getByUserId" resultType="cn.wisenergy.model.app.LastMonthTeamUserInfo">
select
<include refid="cols_all"/>
from
<include refid="table"/>
<where>
user_id=#{userId}
</where>
</select>
<!--根据userid查询用户是否存在-->
<select id="czByUserId" resultType="cn.wisenergy.model.app.LastMonthTeamUserInfo">
select
id
from
<include refid="table"/>
<where>
user_id=#{userid}
</where>
</select>
<select id="getTeamUserCount" resultType="java.lang.Integer" >
select
(normal_user_num+seedling_num+bronze_tree_num+silver_tree_num+
gold_tree_num+farmer_num+forest_start_num+partner_num) AS teamUserCount
from
<include refid="table"/>
<where>
user_id=#{userId}
</where>
</select>
<insert id="add" parameterType="cn.wisenergy.model.app.LastMonthTeamUserInfo" keyProperty="id" useGeneratedKeys="true">
insert into
<include refid="table"/>
(<include refid="cols_exclude_id"/>)
value
(<include refid="vals"/>)
</insert>
</mapper>
\ No newline at end of file
wisenergy-mapper/src/main/resources/mapper/OrderMapper.xml
View file @ 17be847d
......@@ -172,6 +172,8 @@
<include refid="table"/>
where
month_order_status = #{monthOrderStatus}
and
success_time is not null
</select>
</mapper>
\ No newline at end of file
wisenergy-mapper/src/main/resources/mapper/TradeRecordMapper.xml
View file @ 17be847d
......@@ -96,8 +96,9 @@
from
<include refid="table"/>
<where>
trade_type !=1
<if test="userId">
user_id=#{userId}
and user_id=#{userId}
</if>
<if test="yearMonth != null">
AND(
......@@ -234,4 +235,35 @@
where trade_type=9
</select>
<select id="getByUserIdAndType" resultType="cn.wisenergy.model.app.TradeRecord">
select
<include refid="cols_all"/>
from
<include refid="table"/>
<where>
user_id=#{userId}
and trade_type=#{tradeType}
AND(
YEAR(create_time) = YEAR(#{yearMonth})
AND MONTH(create_time) = MONTH(#{yearMonth}))
</where>
order by create_time desc
limit 1
</select>
<select id="getRebateList" resultType="cn.wisenergy.model.app.TradeRecord">
select
<include refid="cols_all"/>
from
<include refid="table"/>
<where>
status=1
and user_id=#{userId}
and trade_type=2
AND(
YEAR(create_time) = YEAR(#{yearMonth})
AND MONTH(create_time) = MONTH(#{yearMonth}))
</where>
</select>
</mapper>
\ No newline at end of file
wisenergy-mapper/src/main/resources/mapper/UserDataInfoMapper.xml 0 → 100644
View file @ 17be847d
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="cn.wisenergy.mapper.UserDataInfoMapper">
<resultMap id="UserDataInfoMap" type="cn.wisenergy.model.app.UserDataInfo">
<id column="id" property="id"/>
<result column="user_id" property="userId"/>
<result column="invite_code" property="inviteCode"/>
<result column="be_invited_code" property="beInvitedCode"/>
<result column="level_status" property="levelStatus"/>
<result column="create_time" property="createTime"/>
<result column="update_time" property="updateTime"/>
</resultMap>
<sql id="table">
user_data_info
</sql>
<sql id="cols_all">
id,
<include refid="cols_exclude_id"/>
</sql>
<sql id="cols_exclude_id">
user_id,invite_code,be_invited_code,level_status,create_time,update_time
</sql>
<sql id="vals">
#{userId},#{inviteCode},#{beInvitedCode},#{levelStatus},now(),now()
</sql>
<sql id="updateCondition">
<if test="userId != null">user_id = #{userId},</if>
<if test="inviteCode != null">invite_code = #{inviteCode},</if>
<if test="beInvitedCode != null">be_invited_code = #{beInvitedCode},</if>
<if test="levelStatus != null">level_status = #{levelStatus},</if>
update_time =now()
</sql>
<sql id="criteria">
<if test="id != null">id = #{id}</if>
<if test="userId != null">and user_id = #{userId}</if>
<if test="inviteCode != null">and invite_code = #{inviteCode}</if>
<if test="beInvitedCode != null">and be_invited_code = #{beInvitedCode}</if>
<if test="levelStatus != null">and level_status = #{levelStatus}</if>
<if test="createTime != null">and create_time &gt;= #{createTime}</if>
<if test="updateTime != null">and #{updateTime} &gt;= update_time</if>
</sql>
<insert id="add" parameterType="cn.wisenergy.model.app.UserDataInfo" keyProperty="id" useGeneratedKeys="true">
insert into
<include refid="table"/>
(<include refid="cols_exclude_id"/>)
value(
<include refid="vals"/>
)
</insert>
<select id="getALl" resultType="cn.wisenergy.model.app.UserDataInfo">
select
<include refid="cols_all"/>
from
<include refid="table"/>
</select>
<select id="getListByLevelStatus" resultType="cn.wisenergy.model.app.UserDataInfo">
select
<include refid="cols_all"/>
from
<include refid="table"/>
where
level_status = #{levelStatus}
</select>
</mapper>
\ No newline at end of file
wisenergy-model/src/main/java/cn/wisenergy/model/app/LastMonthCultivatingPrizeInfo.java 0 → 100644
View file @ 17be847d
package cn.wisenergy.model.app;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;
@Data
@ApiModel(value = "LastMonthCultivatingPrizeInfo")
@TableName("lastmonth_cultivating_prize_info")
public class LastMonthCultivatingPrizeInfo implements Serializable {
/**
* 主键id
*/
@ApiModelProperty(name = "id", value = "主键id")
private int id;
/**
* 用户id
*/
@ApiModelProperty(name = "userId", value = "用户id")
private String userId;
/**
* 幼苗状态培育奖记录 0：表示上级用户没有获得过当前等级的培育奖
* 1： 表示上级用户已经获得过当前等级的培育奖
*/
@ApiModelProperty(name = "seedling", value = "幼苗等级培育奖记录")
private int seedling;
/**
* 青铜树等级培育奖记录0：表示上级用户没有获得过当前等级的培育奖
* 1： 表示上级用户已经获得过当前等级的培育奖
*/
@ApiModelProperty(name = "bronze_tree", value = "青铜树等级培育奖记录")
private int bronzeTree;
/**
* 白银树等级培育奖记录0：表示上级用户没有获得过当前等级的培育奖
* 1： 表示上级用户已经获得过当前等级的培育奖
*/
@ApiModelProperty(name = "silver_tree", value = "白银树等级培育奖记录")
private int silverTree;
/**
* 黄金树等级培育奖记录0：表示上级用户没有获得过当前等级的培育奖
* 1： 表示上级用户已经获得过当前等级的培育奖
*/
@ApiModelProperty(name = "gold_tree", value = "黄金树等级培育奖记录")
private int goldTree;
/**
* 农场主等级培育奖记录0：表示上级用户没有获得过当前等级的培育奖
* 1： 表示上级用户已经获得过当前等级的培育奖
*/
@ApiModelProperty(name = "forest_start", value = "农场主等级培育奖记录")
private int farmer;
/**
* 森林之星等级培育奖记录0：表示上级用户没有获得过当前等级的培育奖
* 1： 表示上级用户已经获得过当前等级的培育奖
*/
@ApiModelProperty(name = "forest_start", value = "森林之星等级培育奖记录")
private int forestStart;
/**
* 西田森合伙人等级培育奖记录0：表示上级用户没有获得过当前等级的培育奖
* 1： 表示上级用户已经获得过当前等级的培育奖
*/
@ApiModelProperty(name = "partner", value = "西田森合伙人等级培育奖记录")
private int partner;
/**
* 创建时间
*/
@ApiModelProperty(name = "createTime", value = "创建时间")
private Date createTime;
/**
* 修改时间
*/
@ApiModelProperty(name = "updateTime", value = "修改时间")
private Date updateTime;
}
wisenergy-model/src/main/java/cn/wisenergy/model/app/LastMonthRecommendUser.java 0 → 100644
View file @ 17be847d
package cn.wisenergy.model.app;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
/**
*@ Description: 上月直推用户实体类
*@ Author : zw
*@ Date : 2021/3/25 11:24
* @author zw
*/
@Data
@ApiModel(value = "LastmonthRecommendUser")
@TableName("lastmonth_recommend_user")
public class LastMonthRecommendUser implements Serializable {
/**
* 直推用户主键id
*/
@ApiModelProperty(name = "id", value = "直推用户主键id")
private Integer id;
/**
* 用户id
*/
@ApiModelProperty(name = "user_id", value = "用户id")
private String userId;
/**
* 普通用户数量
*/
@ApiModelProperty(name = "normal_user_num", value = "普通用户数量")
private Integer normalUserNum;
/**
* 幼苗数量
*/
@ApiModelProperty(name = "seedling_num", value = "幼苗数量")
private Integer seedlingNum;
/**
* 青铜树数量
*/
@ApiModelProperty(name = " bronze_tree_num", value = "青铜树数量")
private Integer bronzeTreeNum;
/**
* 白银树数量
*/
@ApiModelProperty(name = "silver_tree_num", value = "白银树数量")
private Integer silverTreeNum;
/**
* 黄金树数量
*/
@ApiModelProperty(name = "gold_tree_num", value = "黄金树数量")
private Integer goldTreeNum;
/**
* 农场主数量
*/
@ApiModelProperty(name = "farmer_num", value = "农场主数量")
private Integer farmerNum;
/**
* 森林之星数量
*/
@ApiModelProperty(name = "forest_start_num", value = "森林之星数量")
private Integer forestStartNum;
/**
* 西田森合伙人数量
*/
@ApiModelProperty(name = "partner_num", value = "西田森合伙人数量")
private Integer partnerNum;
/**
* 创建时间
*/
@ApiModelProperty(name = "create_time", value = "创建时间")
private Date createTime;
/**
* 更新时间
*/
@ApiModelProperty(name = "update_time", value = "更新时间")
private Date updateTime;
/**
* 用户当月消费金额
*/
@ApiModelProperty(name = "monthy_count", value = "用户当月消费金额")
private BigDecimal monthyCount;
/**
* 用户当月消费金额
*/
@ApiModelProperty(name = "history_count", value = "用户累计消费金额")
private BigDecimal historyCount;
}
wisenergy-model/src/main/java/cn/wisenergy/model/app/LastMonthTeamUserInfo.java 0 → 100644
View file @ 17be847d
package cn.wisenergy.model.app;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;
/**
*@ Description: 上月团队用户实体类
*@ Author : zw
*@ Date : 2021/3/25 11:24
* @author zw
*/
@Data
@ApiModel
@TableName("lastmonth_team_user_info")
public class LastMonthTeamUserInfo implements Serializable {
/**
* 团队用户主键id
*/
@ApiModelProperty(name = "id", value = "团队用户主键id")
private Integer id;
/**
* 用户id
*/
@ApiModelProperty(name = "userId", value = "用户id")
private String userId;
/**
* 普通用户数量
*/
@ApiModelProperty(name = "normal_user_num", value = "普通用户数量")
private Integer normalUserNum;
/**
* 幼苗数量
*/
@ApiModelProperty(name = "seedling_num", value = "幼苗数量")
private Integer seedlingNum;
/**
* 青铜树数量
*/
@ApiModelProperty(name = " bronze_tree_num", value = "青铜树数量")
private Integer bronzeTreeNum;
/**
* 白银树数量
*/
@ApiModelProperty(name = "silver_tree_num", value = "白银树数量")
private Integer silverTreeNum;
/**
* 黄金树数量
*/
@ApiModelProperty(name = "gold_tree_num", value = "黄金树数量")
private Integer goldTreeNum;
/**
* 农场主数量
*/
@ApiModelProperty(name = "farmer_num", value = "农场主数量")
private Integer farmerNum;
/**
* 森林之星数量
*/
@ApiModelProperty(name = "forest_start_num", value = "森林之星数量")
private Integer forestStartNum;
/**
* 西田森合伙人数量
*/
@ApiModelProperty(name = "partner_num", value = "西田森合伙人数量")
private Integer partnerNum;
/**
* 创建时间
*/
@ApiModelProperty(name = "createTime", value = "创建时间")
private Date createTime;
/**
* 更新时间
*/
@ApiModelProperty(name = "updateTime", value = "更新时间")
private Date updateTime;
}
wisenergy-model/src/main/java/cn/wisenergy/model/app/LastMonthUserInfo.java
View file @ 17be847d
package cn.wisenergy.model.app;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
......@@ -16,6 +17,7 @@ import java.util.Date;
*/
@Data
@ApiModel
@TableName("lastmonth_user_info")
public class LastMonthUserInfo implements Serializable {
/**
* 主键id
......
wisenergy-model/src/main/java/cn/wisenergy/model/app/TradeRecord.java
View file @ 17be847d
......@@ -51,7 +51,7 @@ public class TradeRecord implements Serializable {
private Integer status;
/**
* 定时任务id
* 定时任务id: 1:返佣 2：月度肥料 3：月最大进步奖 4：
*/
@ApiModelProperty(name = "taskId", value = "定时任务id")
private Integer taskId;
......
wisenergy-model/src/main/java/cn/wisenergy/model/app/UserDataInfo.java 0 → 100644
View file @ 17be847d
package cn.wisenergy.model.app;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;
/**
* @author 86187
* @ Description : 用户填写邀请码行为记录详情表
* @ Author : zw
* @ CreateDate : 2020/3/25 10:42
*/
@Data
@ApiModel("UserDataInfo")
@TableName("user_data_info")
public class UserDataInfo implements Serializable {
@ApiModelProperty(name = "id",value = "主键id")
private int id;
@ApiModelProperty(name = "user_id",value = "用户id")
private String userId;
@ApiModelProperty(name = "inviteCode",value = "邀请码")
private String inviteCode;
@ApiModelProperty(name = "beInvitedCode",value = "推荐人邀请码")
private String beInvitedCode;
/**
* 0：该条记录未进行升级处理
* 1：该条记录已进行升级处理
*/
@ApiModelProperty(name="levelStatus",value = "是否计算升级状态")
private int levelStatus;
@ApiModelProperty(name = "createTime",value = "创建时间")
private Date createTime;
@ApiModelProperty(name = "updateTime",value = "修改时间")
private Date updateTime;
}
wisenergy-service/src/main/java/cn/wisenergy/service/Manager/AccountManager.java
View file @ 17be847d
......@@ -89,6 +89,7 @@ public class AccountManager {
tradeRecord.setTradeType(TradeRecordEnum.ORDER_REBATE.getCode());
tradeRecord.setTradeNo(orderInfo.getTid());
tradeRecord.setStatus(TradeStatusEnum.ALREADY_SETTLE_ACCOUNTS.getCode());
tradeRecord.setMoney(bigDecimal);
recordMapper.add(tradeRecord);
}
......
wisenergy-service/src/main/java/cn/wisenergy/service/Manager/UserDataInfoManager.java 0 → 100644
View file @ 17be847d
package cn.wisenergy.service.Manager;
import cn.wisenergy.mapper.UserDataInfoMapper;
import cn.wisenergy.mapper.UsersMapper;
import cn.wisenergy.model.app.User;
import cn.wisenergy.model.app.UserDataInfo;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@Component
@Slf4j
public class UserDataInfoManager {
@Autowired
private UserDataInfoMapper userDataInfoMapper;
@Autowired
private UsersMapper usersMapper;
//记录用户设置邀请码的行为数据
public boolean addUserSetBeInvitedCodeDoc(String userId , String invitedUserId){
if (null != userId && null != invitedUserId){
User userByUserId = usersMapper.getUserByUserId(userId);
User inviteduserByUserId = usersMapper.getUserByUserId(invitedUserId);
if (null != userByUserId && null != inviteduserByUserId){
//用户自身的邀请码
String inviteCode = userByUserId.getInviteCode();
//推荐人的邀请码
String beInvitedCode = inviteduserByUserId.getInviteCode();
UserDataInfo userDataInfo = new UserDataInfo();
userDataInfo.setUserId(userId);
userDataInfo.setInviteCode(inviteCode);
userDataInfo.setBeInvitedCode(beInvitedCode);
userDataInfo.setLevelStatus(0);
userDataInfoMapper.add(userDataInfo);
return true;
}
}
return false;
}
}
wisenergy-service/src/main/java/cn/wisenergy/service/app/LastMonthUserInfoService.java
View file @ 17be847d
......@@ -2,5 +2,20 @@ package cn.wisenergy.service.app;
public interface LastMonthUserInfoService {
/**
* 镜像上一个时间节点的用户表
* 直推表
* 团队表
* 培育奖记录表
*/
void userInfoMirrorImage();
/**
* 用户升级月度任务执行完成以后执行用户表
* 直推表
* 团队表
* 培育奖记录表
* 的备份，以便下次月度定时任务的执行
*/
public void userInfoMirrorImageBack();
}
wisenergy-service/src/main/java/cn/wisenergy/service/app/MonthUserLevelService.java 0 → 100644
View file @ 17be847d
package cn.wisenergy.service.app;
public interface MonthUserLevelService {
/**
* 月度定时升级任务
*/
void monthUserLevelUpgrade(String userId);
}
wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/AerialDeliveryUserServiceImpl.java
View file @ 17be847d
......@@ -6,6 +6,8 @@ import cn.wisenergy.mapper.UsersMapper;
import cn.wisenergy.model.app.RecommendUser;
import cn.wisenergy.model.app.TeamUserInfo;
import cn.wisenergy.model.app.User;
import cn.wisenergy.model.app.UserDataInfo;
import cn.wisenergy.service.Manager.UserDataInfoManager;
import cn.wisenergy.service.app.AerialDeliveryUserService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -29,6 +31,9 @@ public class AerialDeliveryUserServiceImpl implements AerialDeliveryUserService
@Autowired
private TeamUserInfoMapper teamUserInfoMapper;
@Autowired
UserDataInfoManager userDataInfoManager;
@Autowired
UserLevelServiceImpl userLevelService;
......@@ -66,10 +71,12 @@ public class AerialDeliveryUserServiceImpl implements AerialDeliveryUserService
String randUserId = randUser.getUserId();
//2.1、随机用户的邀请码
String inviteCode = randUser.getInviteCode();
log.info("推荐人用户id------------" +randUserId+"推荐人用户邀请码----------"+inviteCode);
//2.2、设置当前用户的推荐人邀请码为 随机用户的inviteCode
user.setBeInvitedCode(inviteCode);
usersMapper.edit(user);
//用户团队与直推数据维护
userSetBeinviteCode(userId,randUserId);
usersMapper.edit(user);
}
}
......@@ -79,21 +86,13 @@ public class AerialDeliveryUserServiceImpl implements AerialDeliveryUserService
@Override
@Transactional
public void userSetBeinviteCode(String userId, String userInvitedId){
//3、上级用户的直推表数据维护
recommendInfoDataPreserve(userId,userInvitedId);
//4、用户的团队表数据维护
//Map<String, Integer> teamDataMap = teamUserInfoByAerialDelivery(userInvitedId, userId);
//4.1获取当前团队中最上级的用户对象
// User highUser = highUser(userId);
// if (null != highUser){
// //4.2 最上级用户id
// String highUserId = highUser.getUserId();
// //4.1整体团队数据维护
// teamData(teamDataMap, highUserId);
// }
//4、用户团队数据维护
teamDataPreserve(userId,userInvitedId);
//记录用户设置邀请码的行为数据
userDataInfoManager.addUserSetBeInvitedCodeDoc(userId, userInvitedId);
//5、查看当前用户是否要进行升级
userLevelService.userLevelUpgrade(userInvitedId);
}
......
wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/LastMonthUserInfoServiceImpl.java
View file @ 17be847d
......@@ -13,28 +13,78 @@ public class LastMonthUserInfoServiceImpl implements LastMonthUserInfoService {
@Autowired
private LastAccountMapper lastAccountMapper;
/**
* 镜像上一个时间节点的用户表
* 直推表
* 团队表
* 培育奖记录表
*/
@Override
public void userInfoMirrorImage() {
//把用户表user_info备份
log.info("user_info表进行镜像开始");
lastAccountMapper.copyTable("user_info","user_info_image");
lastAccountMapper.deleteTable("user_info_backup");
lastAccountMapper.updateTableName("user_info_image","user_info_backup");
lastAccountMapper.copyTable("user_info_backup", "user_info_image");
lastAccountMapper.deleteTable("lastmonth_user_info");
lastAccountMapper.updateTableName("user_info_image", "lastmonth_user_info");
log.info("user_info表进行镜像成功");
//recommend_user表备份
log.info("user_info表进行镜像开始");
lastAccountMapper.copyTable("recommend_user","recommend_user_image");
lastAccountMapper.deleteTable("recommend_user_backup");
lastAccountMapper.updateTableName("recommend_user_image","recommend_user_backup");
lastAccountMapper.copyTable("recommend_user_backup", "recommend_user_image");
lastAccountMapper.deleteTable("lastmonth_recommend_user");
lastAccountMapper.updateTableName("recommend_user_image", "lastmonth_recommend_user");
log.info("user_info表进行镜像成功");
//team_user_info表备份
log.info("user_info表进行镜像开始");
lastAccountMapper.copyTable("team_user_info","team_user_info_image");
lastAccountMapper.deleteTable("team_user_info_backup");
lastAccountMapper.updateTableName("team_user_info_image","team_user_info_backup");
lastAccountMapper.copyTable("team_user_info_backup", "team_user_info_image");
lastAccountMapper.deleteTable("lastmonth_team_user_info");
lastAccountMapper.updateTableName("team_user_info_image", "lastmonth_team_user_info");
log.info("user_info表进行镜像成功");
//镜像培育奖记录表
log.info("cultivating_prize_info表记录镜像开始");
lastAccountMapper.copyTable("cultivating_prize_info_backup", "cultivating_prize_info_image");
lastAccountMapper.deleteTable("lastmonth_cultivating_prize_info");
lastAccountMapper.updateTableName("cultivating_prize_info_image", "lastmonth_cultivating_prize_info");
log.info("cultivating_prize_info表记录镜像结束");
}
/**
* 用户升级月度任务执行完成以后执行用户表
* 直推表
* 团队表
* 培育奖记录表
* 的备份，以便下次月度定时任务的执行
*/
@Override
public void userInfoMirrorImageBack(){
//把用户表user_info备份
log.info("user_info表进行镜像开始");
lastAccountMapper.copyTable("user_info", "user_info_image");
lastAccountMapper.deleteTable("user_info_backup");
lastAccountMapper.updateTableName("user_info_image", "user_info_backup");
log.info("user_info表进行镜像成功");
//recommend_user表备份
log.info("recommend_user表进行镜像开始");
lastAccountMapper.copyTable("recommend_user", "recommend_user_image");
lastAccountMapper.deleteTable("recommend_user_backup");
lastAccountMapper.updateTableName("recommend_user_image", "recommend_user_backup");
log.info("recommend_user表进行镜像成功");
//team_user_info表备份
log.info("team_user_info表进行镜像开始");
lastAccountMapper.copyTable("team_user_info", "team_user_info_image");
lastAccountMapper.deleteTable("team_user_info_backup");
lastAccountMapper.updateTableName("team_user_info_image", "team_user_info_backup");
log.info("team_user_info表进行镜像成功");
//镜像培育奖记录表
log.info("cultivating_prize_info表进行镜像开始");
lastAccountMapper.copyTable("cultivating_prize_info", "cultivating_prize_info_image");
lastAccountMapper.deleteTable("cultivating_prize_info_backup");
lastAccountMapper.updateTableName("cultivating_prize_info_image", "cultivating_prize_info_backup");
log.info("cultivating_prize_info表进行镜像成功");
}
}
wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/OrderServiceImpl.java
View file @ 17be847d
......@@ -104,7 +104,9 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, OrderInfo> implem
orderInfo.setItemId(itemList.toString());
//有赞的outer_user_id 与有赞的对应关系是邀请码 邀请码唯一
String outerUserId = buyerInfo.getOuterUserId();
log.info("有赞返回OutUserId------------"+outerUserId);
String userId = usersMapper.getUserIdByIntiveCode(outerUserId);
log.info("对应西田森系统中的用户Id--------"+userId);
orderInfo.setUserId(userId);
//支付方式
orderInfo.setPayType(youzanOrderInfo.getPayType().toString());
......@@ -226,7 +228,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, OrderInfo> implem
.build();
OAuthToken oAuthToken = yzClient.getOAuthToken(tokenParameter);
String accessToken = oAuthToken.getAccessToken();
log.info(accessToken);
log.info("调用有赞接口获取到的有赞Token"+accessToken);
Token youzanToken = new Token(accessToken);
return youzanToken;
......
wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/UserServiceImpl.java
View file @ 17be847d
......@@ -9,6 +9,7 @@ import cn.wisenergy.model.dto.TeamQueryDto;
import cn.wisenergy.model.vo.AerialDeliveryVo;
import cn.wisenergy.model.vo.UserPoolVo;
import cn.wisenergy.service.Manager.RegistUserMoudleInitManager;
import cn.wisenergy.service.Manager.UserDataInfoManager;
import cn.wisenergy.service.app.AerialDeliveryUserService;
import cn.wisenergy.service.app.UserService;
import com.alibaba.fastjson.JSONObject;
......@@ -47,6 +48,9 @@ public class UserServiceImpl extends ServiceImpl<UsersMapper, User> implements U
@Autowired
private AerialDeliveryUserService aerialDeliveryUserService;
@Autowired
private UserDataInfoManager userDataInfoManager;
@Autowired
private RedisUtils redisUtils;
......@@ -219,12 +223,12 @@ public class UserServiceImpl extends ServiceImpl<UsersMapper, User> implements U
Integer normalUserNum = recommendUserMapperByUserId.getNormalUserNum();
recommendUserMapperByUserId.setNormalUserNum(normalUserNum + 1);
recommendUserMapper.updateById(recommendUserMapperByUserId);
//通过用户的userid和推荐人邀请码 设置当前用户的上级直推数据和当前用户所在团队的团队数据
// aerialDeliveryUserService.userSetBeinviteCode(userId,beInvitedCode);
}
//递归向上修改团队用户信息表
teamUserInfo(beInvitedCode);
//记录带邀请码注册的用户行为信息
userDataInfoManager.addUserSetBeInvitedCodeDoc(userId,userIdByIntive);
Map map = new HashMap();
R.ok("注册成功！", 0);
map.put("code", 0);
......@@ -334,7 +338,7 @@ public class UserServiceImpl extends ServiceImpl<UsersMapper, User> implements U
//团队用户数据维护
public void teamUserInfo(String beInvitedCode) {
//根据邀请码查询上级用户的id
//根据邀请码查询上级用户的userId
String teamUserId = usersMapper.getUserByIntiveCode(beInvitedCode);
//查询上级用户的团队信息表
TeamUserInfo teamUserInfoByUserId = teamUserInfoMapper.getByUserId(teamUserId);
......@@ -347,7 +351,7 @@ public class UserServiceImpl extends ServiceImpl<UsersMapper, User> implements U
String teamUserBeInvitedCode = teamUser.getBeInvitedCode();
//递归实现上级所有的用户普通数量 + 1
//若团队用户的被邀请码为 1 时 则没有上级用户用户
if (!"1".equals(teamUserBeInvitedCode)) {
if (!"1".equals(teamUserBeInvitedCode) && !"88888888".equals(teamUserBeInvitedCode)) {
teamUserInfo(teamUserBeInvitedCode);
} else {
return;
......
wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/WalletServiceImpl.java
View file @ 17be847d
......@@ -130,16 +130,12 @@ public class WalletServiceImpl implements WalletService {
return R.error("账户信息为空!");
}
//获取本月交易记录
List<TradeRecord> list = tradeRecordMapper.getByUserIdAndTime(userId, date);
if (CollectionUtils.isEmpty(list)) {
return R.ok(new MoneyPackageDetailVo());
}
MoneyPackageDetailVo detailVo = new MoneyPackageDetailVo();
detailVo.setUserId(userId);
detailVo.setTotalIncome(accountInfo.getEarningsTotal());
//获取本月交易记录
List<TradeRecord> list = getTradeRecordList(userId);
List<IncomeDetailVo> incomeDetailVos = new ArrayList<>();
for (TradeRecord tradeRecord : list) {
IncomeDetailVo incomeDetailVo = new IncomeDetailVo();
......@@ -167,4 +163,44 @@ public class WalletServiceImpl implements WalletService {
List<WithdrawalRecordVo> list = tradeRecordMapper.getWithdrawalRecord(userId, date);
return R.ok(list);
}
private List<TradeRecord> getTradeRecordList(String userId) {
List<TradeRecord> list = new ArrayList<>();
Date date = new Date();
//获取返佣、月度肥料、培育奖、最大进步奖、运营中心补贴类型交易记录
//获取返佣本月交易记录
List<TradeRecord> orderRebate = tradeRecordMapper.getRebateList(userId, date);
if (!CollectionUtils.isEmpty(orderRebate)) {
list.addAll(orderRebate);
}
//获取月度肥料本月交易记录
TradeRecord monthFertilizer = tradeRecordMapper.getByUserIdAndType(userId,
TradeRecordEnum.MONTHLY_FERTILIZER.getCode(), date);
if (null != monthFertilizer) {
list.add(monthFertilizer);
}
//获取培育奖本月交易记录
TradeRecord trainRecord = tradeRecordMapper.getByUserIdAndType(userId,
TradeRecordEnum.CULTIVATING_PRIZE.getCode(), date);
if (null != trainRecord) {
list.add(trainRecord);
}
//获取最大进步奖本月交易记录
TradeRecord prizeRecord = tradeRecordMapper.getByUserIdAndType(userId,
TradeRecordEnum.PROGRESS_PRIZE.getCode(), date);
if (null != prizeRecord) {
list.add(prizeRecord);
}
//获取运营中心补贴本月交易记录
TradeRecord centerRecord = tradeRecordMapper.getByUserIdAndType(userId,
TradeRecordEnum.RUN_CENTER_SUBSIDY.getCode(), date);
if (null != centerRecord) {
list.add(centerRecord);
}
return list;
}
}
wisenergy-web-admin/src/main/java/cn/wisenergy/web/admin/controller/app/LoginController.java
View file @ 17be847d
......@@ -167,6 +167,8 @@ public class LoginController {
QrConfig config = new QrConfig(width, height);
config.setCharset(StandardCharsets.UTF_8);
config.setMargin(0);
config.setWidth(width);
config.setHeight(height);
BufferedImage waterImage = QrCodeUtil.generate(regFullUrl, config);
byte[] bytes = ImageUtil.watermarkImageSimple1(srcImage, waterImage);
// ByteArrayOutputStream out = new ByteArrayOutputStream();
......
wisenergy-web-admin/src/main/java/cn/wisenergy/web/admin/controller/app/UserLevelController.java 0 → 100644
View file @ 17be847d
package cn.wisenergy.web.admin.controller.app;
import cn.wisenergy.common.utils.R;
import cn.wisenergy.model.app.User;
import cn.wisenergy.service.app.*;
import cn.wisenergy.service.app.impl.AerialDeliveryUserServiceImpl;
import cn.wisenergy.service.app.impl.UserServiceImpl;
import com.youzan.cloud.open.sdk.common.exception.SDKException;
import com.youzan.cloud.open.sdk.gen.v4_0_0.model.YouzanTradesSoldGetResult;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@Api(tags = "用户等级管理")
@RestController
@RequestMapping("/user")
@Slf4j
public class UserLevelController {
@Autowired
private UserLevelService userLevelService;
@Autowired
private OrderService orderService;
@Autowired
private UserService userService;
@Autowired
private AerialDeliveryUserService aerialDeliveryUserService;
@Autowired
private AerialDeliveryUserServiceImpl AerialDeliveryUserServiceImpl;
@Autowired
private LastMonthUserInfoService lastMonthUserInfoService;
@Autowired
private UserLevelTaskService userLevelTaskService;
@ApiOperation(value = "用户升级接口测试", notes = "用户升级接口测试扫描订单", httpMethod = "GET")
@GetMapping("/test")
public R<String> userLevel(){
// userLevelService.userLevelUpgrade(userId);
userLevelTaskService.userLevelUp();
return R.ok();
}
@ApiOperation(value = "用户升级接口测试", notes = "用户升级接口测试不扫描订单", httpMethod = "GET")
@GetMapping("/test1")
public R<String> userLevel1(String userId){
userLevelService.userLevelUpgrade(userId);
// userLevelService.userLevelUp();
return R.ok();
}
@ApiOperation(value = "根据订单创建时间获取订单数据", notes = "根据订单创建时间获取订单数据", httpMethod = "GET")
@GetMapping("/order")
public void getyouzanorder() throws SDKException {
orderService.getYouZanOrdersForCreateTime();
}
@ApiOperation(value = "根据订单修改时间获取订单数据", notes = "根据订单修改时间获取订单数据", httpMethod = "GET")
@GetMapping("orders")
public void getyouzanOrdersByUpdateTime() throws SDKException {
orderService.getYouZanOrdersForUpdateTime();
}
@ApiOperation(value = "空投池用户随机分配", notes = "空投池用户随机分配", httpMethod = "GET")
@GetMapping("/aerialDeliveryUserRand")
public void aerialDeliveryUserRand(){
aerialDeliveryUserService.aerialDeliveryUserRand();
}
@ApiOperation(value = "注册100个用户", notes = "注册100个用户", httpMethod = "GET")
@GetMapping("/registerController")
public void registerController(){
for (int i = 0; i <= 9; i++) {
String userid = "1393377000"+i;
userService.userByZx(userid,null);
}
}
@ApiOperation(value = "注册系统透明用户5个", notes = "注册系统透明用户5个", httpMethod = "GET")
@GetMapping("/registerSysUSerController")
public void registerSysUSerController(){
for (int i = 0; i <= 4; i++) {
String userid = "13933770741"+i;
userService.userByZx(userid,null);
}
}
@ApiOperation(value = "获取顶级用户", notes = "获取顶级用户", httpMethod = "GET")
@GetMapping("/getHighUser")
public User getHighUser(String userId){
User user = AerialDeliveryUserServiceImpl.highUser(userId);
return user ;
}
@ApiOperation(value = "用户表镜像", notes = "用户表镜像", httpMethod = "GET")
@GetMapping("/userInfoMirrorImage")
public void userInfoMirrorImageController(){
lastMonthUserInfoService.userInfoMirrorImage();
}
@ApiOperation(value = "月度定时任务执行测试", notes = "月度定时任务执行测试", httpMethod = "GET")
@GetMapping("/monthUserlevelTask")
public void monthUserlevelTask(){
userLevelTaskService.monthUserLevelUp();
}
}
wisenergy-web-admin/src/main/resources/logback-spring.xml
View file @ 17be847d
......@@ -71,10 +71,7 @@
<!-- 项目日志 -->
<logger name="cn.wisenergy"/>
<!-- 定时任务日志配置-->
<!-- <property name="task_log_address" value="/opt"/>-->
<!-- 订单定时任务日志配置-->
<appender name="order_task_logs" class="ch.qos.logback.core.rolling.RollingFileAppender">
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<fileNamePattern>${LOG_DIR}/${project.artifactId}/order_task-log.%d{yyyy-MM-dd}.log</fileNamePattern>
......@@ -95,6 +92,27 @@
<appender-ref ref="order_task_logs"/>
</logger>
<!-- 升级日、月定时任务日志配置-->
<appender name="userLevel_task_logs" class="ch.qos.logback.core.rolling.RollingFileAppender">
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<fileNamePattern>${LOG_DIR}/${project.artifactId}/userLevel_task_log.%d{yyyy-MM-dd}.log</fileNamePattern>
</rollingPolicy>
<encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
<layout class="ch.qos.logback.classic.PatternLayout">
<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
</layout>
</encoder>
<!--日志文件最大的大小 -->
<triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
<MaxFileSize>10MB</MaxFileSize>
</triggeringPolicy>
</appender>
<logger name="cn.wisenergy.service.app.impl.UserLevelTaskServiceImpl">
<appender-ref ref="userLevel_task_logs"/>
</logger>
<!-- 日志根 -->
<root level="${LOG_LEVEL}">
<appender-ref ref="stdout"/>
......
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