Merge branch 'master' of http://111.203.232.171:8888/licc/shop-mall into master

pom.xml

@@ -162,7 +162,12 @@
                 <artifactId>ffmpeg-platform</artifactId>
                 <version>4.0.2-1.4.3</version>
             </dependency>
-
+            <!--获取服务器硬件信息-->
+            <dependency>
+                <groupId>org.fusesource</groupId>
+                <artifactId>sigar</artifactId>
+                <version>${sigar.version}</version>
+            </dependency>
 
             <!--druid数据源  -->
             <dependency>

wisenergy-mapper/src/main/java/cn/wisenergy/mapper/AccountMapper.java

@@ -5,6 +5,9 @@ import cn.wisenergy.model.app.AccountInfo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * @author 86187
  */
@@ -57,4 +60,17 @@ public interface AccountMapper extends BaseMapper<AccountInfo> {
      * @return
      */
     int updateEarningsMonthAndEarningsTotalByid(AccountInfo accountInfo);
+
+    /**
+     * 统计
+     * @return 数量
+     */
+    int count();
+
+    /**
+     * 获取账户列表
+     * @param map 条件
+     * @return 账户列表
+     */
+    List<AccountInfo> getList(Map<String,Object> map);
 }

wisenergy-mapper/src/main/java/cn/wisenergy/mapper/CultivatingPrizeInfoMapper.java

 package cn.wisenergy.mapper;
 
 import cn.wisenergy.model.app.CultivatingPrizeInfo;
+import cn.wisenergy.model.vo.CultivatingPrizeInfoVo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
 
-import java.math.BigDecimal;
+import java.util.List;
+import java.util.Map;
 
 /**
  * 培育奖详情记录
@@ -15,4 +16,19 @@ public interface CultivatingPrizeInfoMapper extends BaseMapper<CultivatingPrizeI
     CultivatingPrizeInfo getOneByUserId(String userId);
 
     int add(CultivatingPrizeInfo cultivatingPrizeInfo);
+
+    /**
+     * 分页查询所有信息
+     * @param map
+     * @return
+     */
+    List<CultivatingPrizeInfoVo> getCultivatingPrizeInfoList(Map<String, Object> map);
+
+    /**
+     * 统计总记录数
+     *
+     * @param map 入参
+     * @return 结果
+     */
+    int count( Map<String, Object> map);
 }

wisenergy-mapper/src/main/java/cn/wisenergy/mapper/CultivatingPrizeMapper.java

@@ -3,7 +3,7 @@ package cn.wisenergy.mapper;
 import cn.wisenergy.model.app.CultivatingPrize;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
-import java.math.BigDecimal;
+import java.util.List;
 
 /**
  * 培育奖金额对应表
@@ -16,4 +16,11 @@ public interface CultivatingPrizeMapper extends BaseMapper<CultivatingPrize> {
      * @return
      */
     CultivatingPrize getcultivatingPrizeByUserLevel(int userLevel);
+
+    /**
+     * 查询所有信息
+     * @return
+     */
+    List<CultivatingPrize> getCultivatingPrizeList();
+
 }

wisenergy-mapper/src/main/java/cn/wisenergy/mapper/MemberPercentMapper.java

@@ -4,6 +4,9 @@ import cn.wisenergy.model.app.MemberPercent;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * @author 86187
  */
@@ -39,4 +42,17 @@ public interface MemberPercentMapper extends BaseMapper<MemberPercent> {
      */
     MemberPercent getByLevelAndType(@Param("userLevel") Integer userLevel, @Param("type") Integer type);
 
+
+    /**
+     * 统计条数
+     * @return 条数
+     */
+    int count();
+
+    /**
+     * 获取会员优惠比列
+     * @param map 参数条件
+     * @return 列表
+     */
+    List<MemberPercent> getList(Map<String,Object> map);
 }

wisenergy-mapper/src/main/java/cn/wisenergy/mapper/MonthAwardMapper.java

@@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.Date;
+import java.util.List;
+import java.util.Map;
 
 /**
  * @author 86187
@@ -41,4 +43,19 @@ public interface MonthAwardMapper extends BaseMapper<MonthAward> {
      * @return 月度奖金
      */
     MonthAward getByTime(@Param("yearMonth") String yearMonth);
+
+    /**
+     * 统计数据条数
+     * @param map 条件
+     * @return 条数
+     */
+    int count(Map<String,Object> map);
+
+
+    /**
+     * 获取列表
+     * @param map 条件
+     * @return 列表
+     */
+    List<MonthAward> getList(Map<String,Object> map);
 }

wisenergy-mapper/src/main/java/cn/wisenergy/mapper/ProgressPrizeMapper.java

@@ -5,8 +5,8 @@ import cn.wisenergy.model.vo.ProgressPrizeVo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 
-import java.util.Date;
 import java.util.List;
+import java.util.Map;
 
 /**
  * @author 86187
@@ -38,10 +38,25 @@ public interface ProgressPrizeMapper extends BaseMapper<ProgressPrize> {
 
     /**
      * 根据 userId 年月 获取月的最大进步奖用户
-     *
+     * @param userId 用户id
      * @param yearMonth 年月
      * @return 最大进步奖用户列表
      */
     ProgressPrize getByUserIdYearMonth(@Param("userId") String userId,@Param("yearMonth") String yearMonth);
 
+
+    /**
+     * 统计最大进步奖总记录数
+     *
+     * @param map 入参
+     * @return 结果
+     */
+    int count( Map<String, Object> map);
+
+    /**
+     * 获取最大进步奖列表
+     * @param map 入参
+     * @return 结果集
+     */
+    List<ProgressPrize> getList(Map<String, Object> map);
 }

wisenergy-mapper/src/main/java/cn/wisenergy/mapper/RecommendUserMapper.java

 package cn.wisenergy.mapper;
 
 import cn.wisenergy.model.app.RecommendUser;
+import cn.wisenergy.model.vo.RecommendUserVo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
+
+
+import java.util.List;
+import java.util.Map;
 
 /**
  * @author zw
@@ -33,4 +37,19 @@ public interface RecommendUserMapper extends BaseMapper<RecommendUser> {
      * @return
      */
     int add(RecommendUser recommendUser);
+
+
+    /**
+     * 分页查询所有用户信息
+     * @param map
+     * @return
+     */
+    List<RecommendUserVo> getRecommendUserList(Map<String, Object> map);
+
+    /**
+     * 统计总记录数
+     * @param map 入参
+     * @return 结果
+     */
+    int count( Map<String, Object> map);
 }

wisenergy-mapper/src/main/java/cn/wisenergy/mapper/ShopZxMapper.java

@@ -2,13 +2,13 @@ package cn.wisenergy.mapper;
 
 
 import cn.wisenergy.model.app.shopZx;
-import cn.wisenergy.model.app.zxUserDto;
-import cn.wisenergy.model.app.zxUserVo;
+import cn.wisenergy.model.vo.ShopZxUserVo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 
 /**
@@ -34,15 +34,15 @@ public interface ShopZxMapper extends BaseMapper<shopZx> {
     /**
      * 倒叙查询资讯与用户发布数据
      */
-    List<zxUserDto> selectPage(@Param("pageNum") Integer pageNum, @Param("pageSize") Integer pageSize);
-
-    /**
-     * 用于查询资讯单表全部信息
-     * @param pageNum
-     * @param pageSize
-     * @return
-     */
-    List<zxUserVo> selectAll(@Param("pageNum") Integer pageNum, @Param("pageSize") Integer pageSize);
+    List<ShopZxUserVo> selectPage(@Param("pageNum") Integer pageNum, @Param("pageSize") Integer pageSize);
+//
+//    /**
+//     * 用于查询资讯单表全部信息
+//     * @param pageNum
+//     * @param pageSize
+//     * @return
+//     */
+//    List<zxUserVo> selectAll(@Param("pageNum") Integer pageNum, @Param("pageSize") Integer pageSize);
 
     /**
      * 点赞接口专用
@@ -58,4 +58,18 @@ public interface ShopZxMapper extends BaseMapper<shopZx> {
      * @return
      */
     int updateZxToExaminezxid(@Param("zxid")Integer zxid,@Param("ZxToExamine") Integer ZxToExamine);
+
+    /**
+     * 分页查询所有用户信息
+     * @param map
+     * @return
+     */
+    List<ShopZxUserVo> getShopZxList(Map<String, Object> map);
+
+    /**
+     * 统计总记录数
+     * @param map 入参
+     * @return 结果
+     */
+    int count( Map<String, Object> map);
 }

wisenergy-mapper/src/main/java/cn/wisenergy/mapper/SysUserMapper.java

+package cn.wisenergy.mapper;
+
+import cn.wisenergy.model.app.SysUser;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * @author 86187
+ */
+public interface SysUserMapper extends BaseMapper<SysUser> {
+
+    /**
+     * 获取后台账户信息
+     *
+     * @param id 用户主键id
+     * @return 后台账户信息
+     */
+    SysUser getById(@Param("id") Integer id);
+
+    /**
+     * 更据账户，获取后台用户信息
+     *
+     * @param account 账户
+     * @return 后台用户信息
+     */
+    SysUser getByAccount(@Param("account") String account);
+}

wisenergy-mapper/src/main/java/cn/wisenergy/mapper/TeamPerformanceMapper.java

 package cn.wisenergy.mapper;
 
 import cn.wisenergy.model.app.TeamPerformance;
-import cn.wisenergy.model.app.User;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 

wisenergy-mapper/src/main/java/cn/wisenergy/mapper/TeamUserInfoMapper.java

 package cn.wisenergy.mapper;
 
-import cn.wisenergy.model.app.RecommendUser;
 import cn.wisenergy.model.app.TeamUserInfo;
+import cn.wisenergy.model.vo.TeamUserInfoVo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * 团队Mapper
  * @author zw
@@ -30,4 +33,19 @@ public interface TeamUserInfoMapper extends BaseMapper<TeamUserInfo> {
     int add(TeamUserInfo teamUserInfo);
 
     int edit(TeamUserInfo teamUserInfo);
+
+    /**
+     * 分页查询所有信息
+     * @param map
+     * @return
+     */
+    List<TeamUserInfoVo> getTeamUserInfoList(Map<String, Object> map);
+
+    /**
+     * 统计总记录数
+     *
+     * @param map 入参
+     * @return 结果
+     */
+    int count( Map<String, Object> map);
 }

wisenergy-mapper/src/main/java/cn/wisenergy/mapper/UsersMapper.java

 package cn.wisenergy.mapper;
 
+
 import cn.wisenergy.model.app.User;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
@@ -104,6 +105,7 @@ public interface UsersMapper extends BaseMapper<User> {
     /**
      * 查询用户
      *
+     *
      * @param param
      * @return
      */
@@ -157,7 +159,7 @@ public interface UsersMapper extends BaseMapper<User> {
      * @param userLevel 用户等级
      * @return 等级用户列表
      */
-    List<User> getByLevel(@Param("userLevel") Integer userLevel);
+    List<cn.wisenergy.model.app.User> getByLevel(@Param("userLevel") Integer userLevel);
 
     /**
      * @param
@@ -236,4 +238,19 @@ public interface UsersMapper extends BaseMapper<User> {
      */
     User getUserByUserId(String userId);
 
+    /**
+     * 分页查询所有用户信息
+     * @param map
+     * @return
+     */
+    List<User> getUserList(Map<String, Object> map);
+
+ /**
+  * 统计用户总记录数
+  *
+  * @param map 入参
+  * @return 结果
+  */
+ int countUser( Map<String, Object> map);
+
 }

wisenergy-mapper/src/main/resources/mapper/AccountInfoMapper.xml

@@ -108,6 +108,21 @@
         </where>
     </select>
 
+    <select id="count" resultType="java.lang.Integer">
+        select count(1)
+        from
+        <include refid="table"/>
+    </select>
+
+    <select id="getList" resultType="cn.wisenergy.model.app.AccountInfo">
+        select
+        <include refid="cols_all"/>
+        from
+        <include refid="table"/>
+        order by create_time desc
+        limit #{startNum},#{endNum}
+    </select>
+
     <update id="updateEarningsMonthAndEarningsTotalByid" parameterType="cn.wisenergy.model.app.AccountInfo">
         UPDATE
         <include refid="table"/>

wisenergy-mapper/src/main/resources/mapper/CultivatingPrizeInfoMapper.xml

@@ -76,4 +76,37 @@
         (<include refid="vals"/>)
     </insert>
 
+    <select id="getCultivatingPrizeInfoList" resultType="cn.wisenergy.model.vo.CultivatingPrizeInfoVo">
+        select
+        <include refid="cols_all"/>
+        from
+        <include refid="table"/>
+        <where>
+            1=1
+            <if test="userId != null and userId != ''">
+                and user_id = #{userId}
+            </if>
+            <if test="queryTime != null and queryTime != ''">
+                and (YEAR(create_time) = YEAR(#{queryTime})
+                AND MONTH(create_time) =MONTH(#{queryTime})
+                AND DAY(create_time)=DAY(#{queryTime}))
+            </if>
+        </where>
+        order by create_time desc
+        limit #{startNum},#{endNum}
+    </select>
+
+    <select id="count" resultType="java.lang.Integer">
+        select count(1)
+        from
+        <include refid="table"/>
+        <where>
+            <if test="userId != null and userId != ''">
+                user_id=#{userId}
+            </if>
+            <if test="queryTime != null and queryTime != ''">
+                and `create_time` = #{queryTime}
+            </if>
+        </where>
+    </select>
 </mapper>
\ No newline at end of file

wisenergy-mapper/src/main/resources/mapper/CultivatingPrizeMapper.xml

@@ -50,4 +50,14 @@
         </where>
     </select>
 
+    <select id="getCultivatingPrizeList" resultType="cn.wisenergy.model.app.CultivatingPrize">
+        select
+        <include refid="cols_all"/>
+        from
+        <include refid="table"/>
+    </select>
+
+
+
+
 </mapper>
\ No newline at end of file

wisenergy-mapper/src/main/resources/mapper/MemberPercentMapper.xml

@@ -83,4 +83,19 @@
         </where>
     </select>
 
+    <select id="count" resultType="java.lang.Integer">
+        select count(1)
+        from
+        <include refid="table"/>
+    </select>
+
+    <select id="getList" resultType="cn.wisenergy.model.app.MemberPercent">
+        select
+        <include refid="cols_all"/>
+        from
+        <include refid="table"/>
+        order by create_time desc
+        limit #{startNum},#{endNum}
+    </select>
+
 </mapper>

wisenergy-mapper/src/main/resources/mapper/MonthAwardMapper.xml

@@ -103,4 +103,29 @@
         limit 1
     </select>
 
+    <select id="count" resultType="java.lang.Integer">
+        select count(1)
+        from
+        <include refid="table"/>
+        <where>
+            <if test="queryTime != null and queryTime != ''">
+                `year_month` = #{queryTime}
+            </if>
+        </where>
+    </select>
+
+    <select id="getList" resultType="cn.wisenergy.model.app.MonthAward">
+        select
+        <include refid="cols_all"/>
+        from
+        <include refid="table"/>
+        <where>
+            <if test="queryTime != null and queryTime != ''">
+                `year_month` = #{queryTime}
+            </if>
+        </where>
+        order by create_time desc
+        limit #{startNum},#{endNum}
+    </select>
+
 </mapper>
\ No newline at end of file

wisenergy-mapper/src/main/resources/mapper/ProgressPrizeMapper.xml

@@ -109,4 +109,29 @@
         </where>
     </select>
 
+    <select id="count" resultType="java.lang.Integer">
+        select count(1)
+        from
+        <include refid="table"/>
+        <where>
+            <if test="queryTime != null and queryTime != ''">
+                `year_month` = #{queryTime}
+            </if>
+        </where>
+    </select>
+
+    <select id="getList" resultType="cn.wisenergy.model.app.ProgressPrize">
+        select
+        <include refid="cols_all"/>
+        from
+        <include refid="table"/>
+        <where>
+            <if test="queryTime != null and queryTime != ''">
+                `year_month` = #{queryTime}
+            </if>
+        </where>
+        order by create_time desc
+        limit #{startNum},#{endNum}
+    </select>
+
 </mapper>
\ No newline at end of file

wisenergy-mapper/src/main/resources/mapper/RecommendUserMapper.xml

@@ -42,13 +42,13 @@
         <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">referrer_num =#{silverTreeNum},</if>
-        <if test="goldTreeNum != null">referrer_num =#{goldTreeNum},</if>
-        <if test="farmerNum != null">referrer_num =#{farmerNum},</if>
-        <if test="forestStartNum != null">referrer_num =#{forestStartNum},</if>
-        <if test="partnerNum != null">referrer_num =#{partnerNum},</if>
-        <if test="monthyCount != null">referrer_num =#{monthyCount},</if>
-        <if test="historyCount != null">referrer_num =#{historyCount},</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>
 
@@ -57,11 +57,11 @@
         <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 referrer_num =#{silverTreeNum},</if>
-        <if test="goldTreeNum != null">and referrer_num =#{goldTreeNum},</if>
-        <if test="farmerNum != null">and referrer_num =#{farmerNum},</if>
-        <if test="forestStartNum != null">and referrer_num =#{forestStartNum},</if>
-        <if test="partnerNum != null">and referrer_num =#{partnerNum},</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>
@@ -107,4 +107,39 @@
         value
         (<include refid="vals"/>)
     </insert>
+
+    <select id="getRecommendUserList" resultType="cn.wisenergy.model.app.RecommendUser">
+        select
+        <include refid="cols_all"/>
+        from
+        <include refid="table"/>
+        <where>
+            1=1
+            <if test="userId != null and userId != ''">
+                and user_id = #{userId}
+            </if>
+            <if test="queryTime != null and queryTime != ''">
+                and (YEAR(create_time) = YEAR(#{queryTime})
+                AND MONTH(create_time) =MONTH(#{queryTime})
+                AND DAY(create_time)=DAY(#{queryTime}))
+            </if>
+        </where>
+        order by create_time desc
+        limit #{startNum},#{endNum}
+    </select>
+
+    <select id="count" resultType="java.lang.Integer">
+        select count(1)
+        from
+        <include refid="table"/>
+        <where>
+            <if test="userId != null and userId != ''">
+                user_id=#{userId}
+            </if>
+            <if test="queryTime != null and queryTime != ''">
+                and `create_time` = #{queryTime}
+            </if>
+        </where>
+    </select>
+
 </mapper>
\ No newline at end of file

wisenergy-mapper/src/main/resources/mapper/ShopZxMapper.xml

@@ -55,7 +55,7 @@
 
 
     <!--资讯内容倒叙查询-->
-    <select id="selectPage" parameterType="java.lang.Integer" resultType="cn.wisenergy.model.app.zxUserDto">
+    <select id="selectPage" parameterType="java.lang.Integer" resultType="cn.wisenergy.model.vo.UserVo">
        select
       b.zx_id as zxid,
       b.zx_url as zxUrl,
@@ -68,6 +68,7 @@
       from shop_zx b left join user_info a ON a.invite_code=b.invite_code
       WHERE zx_to_examine != 0
       AND a.user_id !=0
+      and  a.user_id !=null
       order by zxid desc limit #{pageNum},#{pageSize}
     </select>
     <!--资讯总记录数查询-->
@@ -106,7 +107,7 @@
         </where>
     </update>
     <!--资讯内容与用户内容倒叙查询-->
-    <select id="selectAll" parameterType="java.lang.Integer" resultType="cn.wisenergy.model.app.zxUserVo">
+    <select id="getShopZxList" resultType="cn.wisenergy.model.vo.ShopZxUserVo">
       select
       b.zx_id as zxid,
       b.zx_url as zxUrl,
@@ -115,9 +116,27 @@
       b.zx_date as zxDate,
       b.invite_code as inviteCode,
       a.user_id as userId,
-      a.head_image as headImage
+      b.zx_to_examine as ZxToExamine
       from shop_zx b left join user_info a ON a.invite_code=b.invite_code
-      order by zx_id desc limit #{pageNum},#{pageSize}
+        <where>
+            1=1
+            <if test="userId != null and userId != ''">
+                and user_id = #{userId}
+            </if>
+        </where>
+      order by zx_id desc
+        limit #{startNum},#{endNum}
+    </select>
+
+    <select id="count" resultType="java.lang.Integer">
+        select count(1)
+        from
+        <include refid="table"/>
+        <where>
+            <if test="userId != null and userId != ''">
+                zx_id = #{zxId}
+            </if>
+        </where>
     </select>
 
 </mapper>
\ No newline at end of file

wisenergy-mapper/src/main/resources/mapper/SysUserMapper.xml

+<?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.SysUserMapper">
+    <resultMap id="sysMap" type="cn.wisenergy.model.app.SysUser">
+        <id column="id" property="id"/>
+        <result column="account" property="account"/>
+        <result column="password" property="password"/>
+        <result column="user_name" property="userName"/>
+        <result column="create_time" property="createTime"/>
+        <result column="update_time" property="updateTime"/>
+    </resultMap>
+
+    <sql id="table">
+        sys_user
+    </sql>
+
+    <sql id="cols_all">
+        id,
+        <include refid="cols_exclude_id"/>
+    </sql>
+
+    <sql id="cols_exclude_id">
+        account,password,user_name,create_time,update_time
+    </sql>
+
+    <sql id="vals">
+        #{account},#{password},#{userName},now(),now()
+    </sql>
+
+    <sql id="updateCondition">
+        <if test="account != null">account = #{account},</if>
+        <if test="password != null">password = #{password},</if>
+        <if test="userName != null">user_name = #{userName},</if>
+        update_time =now()
+    </sql>
+
+    <sql id="criteria">
+        <if test="id != null">id = #{id}</if>
+        <if test="account != null">and account = #{account}</if>
+        <if test="password != null">and password = #{password}</if>
+        <if test="userName != null">and user_name = #{userName}</if>
+        <if test="createTime != null">and create_time &gt;= #{createTime}</if>
+        <if test="updateTime != null">and #{updateTime} &gt;= update_time</if>
+    </sql>
+
+    <select id="getById" resultType="cn.wisenergy.model.app.SysUser">
+        select
+        <include refid="cols_all"/>
+        from
+        <include refid="table"/>
+        <where>
+            id=#{id}
+        </where>
+    </select>
+
+    <select id="getByAccount" resultType="cn.wisenergy.model.app.SysUser">
+        select
+        <include refid="cols_all"/>
+        from
+        <include refid="table"/>
+        <where>
+            account=#{account}
+        </where>
+    </select>
+
+</mapper>
\ No newline at end of file

wisenergy-mapper/src/main/resources/mapper/TeamUserInfoMapper.xml

@@ -40,11 +40,11 @@
         <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">referrer_num =#{silverTreeNum},</if>
-        <if test="goldTreeNum != null">referrer_num =#{goldTreeNum},</if>
-        <if test="farmerNum != null">referrer_num =#{farmerNum},</if>
-        <if test="forestStartNum != null">referrer_num =#{forestStartNum},</if>
-        <if test="partnerNum != null">referrer_num =#{partnerNum},</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>
 
@@ -53,11 +53,11 @@
         <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 referrer_num =#{silverTreeNum},</if>
-        <if test="goldTreeNum != null">and referrer_num =#{goldTreeNum},</if>
-        <if test="farmerNum != null">and referrer_num =#{farmerNum},</if>
-        <if test="forestStartNum != null">and referrer_num =#{forestStartNum},</if>
-        <if test="partnerNum != null">and referrer_num =#{partnerNum},</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>
@@ -112,4 +112,38 @@
         value
         (<include refid="vals"/>)
     </insert>
+
+    <select id="getTeamUserInfoList" resultType="cn.wisenergy.model.app.TeamUserInfo">
+        select
+        <include refid="cols_all"/>
+        from
+        <include refid="table"/>
+        <where>
+            1=1
+            <if test="userId != null and userId != ''">
+                and user_id = #{userId}
+            </if>
+            <if test="queryTime != null and queryTime != ''">
+                and (YEAR(create_time) = YEAR(#{queryTime})
+                AND MONTH(create_time) =MONTH(#{queryTime})
+                AND DAY(create_time)=DAY(#{queryTime}))
+            </if>
+        </where>
+        order by create_time desc
+        limit #{startNum},#{endNum}
+    </select>
+
+    <select id="count" resultType="java.lang.Integer">
+        select count(1)
+        from
+        <include refid="table"/>
+        <where>
+            <if test="userId != null and userId != ''">
+                user_id=#{userId}
+            </if>
+            <if test="queryTime != null and queryTime != ''">
+                and `create_time` = #{queryTime}
+            </if>
+        </where>
+    </select>
 </mapper>
\ No newline at end of file

wisenergy-mapper/src/main/resources/mapper/TradeRecordMapper.xml

@@ -116,7 +116,7 @@
         and date_format(create_time,'%Y-%m') >= date_format(now() - interval 7 month,'%Y-%m')
         and (status=1 or status=3)
         and user_id=#{userId}
-        group by user_id ,create_time desc;
+        group by user_id ,create_time;
     </select>
 
     <select id="getWithdrawalRecord" resultType="cn.wisenergy.model.vo.WithdrawalRecordVo">

wisenergy-mapper/src/main/resources/mapper/UsersMapper.xml

@@ -438,4 +438,31 @@
         user_id = #{userId}
     </select>
 
+
+    <select id="getUserList" resultType="cn.wisenergy.model.app.User">
+        select
+        <include refid="cols_all"/>
+        from
+        <include refid="table"/>
+        <where>
+            1=1
+            <if test="userId != null and userId != ''">
+                and user_id = #{userId}
+            </if>
+            <if test="queryTime != null and queryTime != ''">
+                and (YEAR(create_time) = YEAR(#{queryTime})
+                AND MONTH(create_time) =MONTH(#{queryTime})
+                AND DAY(create_time)=DAY(#{queryTime}))
+            </if>
+        </where>
+        order by create_time desc
+        limit #{startNum},#{endNum}
+    </select>
+
+    <select id="countUser" resultType="java.lang.Integer">
+        select count(1)
+        from
+        user_info
+    </select>
+
 </mapper>

wisenergy-model/src/main/java/cn/wisenergy/model/app/AccountInfo.java

@@ -31,9 +31,9 @@ public class AccountInfo implements Serializable {
     private String userId;
 
     /**
-     * 用户等级
+     * 用户等级 0：普通用户 1：幼苗 2: 青铜树 3：白银树 4：黄金树 5：农场主 6：森林之星 7：西田森合伙人
      */
-    @ApiModelProperty(name = "userLevel", value = "用户等级")
+    @ApiModelProperty(name = "userLevel", value = "用户等级 0：普通用户 1：幼苗 2: 青铜树 3：白银树 4：黄金树 5：农场主 6：森林之星 7：西田森合伙人")
     private Integer userLevel;
 
     /**

wisenergy-model/src/main/java/cn/wisenergy/model/app/MemberPercent.java

@@ -38,18 +38,18 @@ public class MemberPercent implements Serializable {
     /**
      * 等级对应的返佣比例
      */
-    @ApiModelProperty(name = "", value = "")
+    @ApiModelProperty(name = "percent", value = "等级对应的返佣比例")
     private BigDecimal percent;
 
     /**
      * 创建时间
      */
-    @ApiModelProperty(name = "", value = "")
+    @ApiModelProperty(name = "createTime", value = "创建时间")
     private Date createTime;
 
     /**
      * 更新时间
      */
-    @ApiModelProperty(name = "", value = "")
+    @ApiModelProperty(name = "updateTime", value = "更新时间")
     private Date updateTime;
 }

wisenergy-model/src/main/java/cn/wisenergy/model/app/SysUser.java

+package cn.wisenergy.model.app;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author 86187
+ * @ Description: 后台用户实体类
+ * @ Author     : 86187
+ * @ Date       : 2021/3/25 11:21
+ */
+@Data
+@ApiModel(value = "SysUsers")
+public class SysUser {
+    /**
+     * 主键id
+     */
+    @ApiModelProperty(value = "主键id", name = "id")
+    private Integer id;
+
+    /**
+     * 账户
+     */
+    @ApiModelProperty(value = "账户", name = "account")
+    private String account;
+
+    /**
+     * 密码
+     */
+    @ApiModelProperty(value = "密码", name = "password")
+    private String password;
+
+    /**
+     * 账户名称
+     */
+    @ApiModelProperty(value = "账户名称", name = "userName")
+    private String userName;
+
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty(value = "创建时间", name = "createTime")
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty(value = "更新时间", name = "updateTime")
+    private Date updateTime;
+}

wisenergy-model/src/main/java/cn/wisenergy/model/app/User.java

 package cn.wisenergy.model.app;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -17,7 +16,7 @@ import java.util.Date;
  * @ CreateDate    :  2020/11/8 19:59
  */
 @Data
-@ApiModel(value = "User")
+@ApiModel(value = "UserInfo")
 @TableName("user_info")
 public class User  implements Serializable{
     private static final long serialVersionUID = 2525339404301884673L;
@@ -113,127 +112,5 @@ public class User  implements Serializable{
     @ApiModelProperty(name = "frozen", value = "账户冻结字段")
     private Integer frozen;
 
-    public Integer getFrozen() {
-        return frozen;
-    }
 
-    public void setFrozen(Integer frozen) {
-        this.frozen = frozen;
-    }
-
-    public static long getSerialVersionUID() {
-        return serialVersionUID;
-    }
-
-    public Integer getId() {
-        return id;
-    }
-
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    public String getUserId() {
-        return userId;
-    }
-
-    public void setUserId(String userId) {
-        this.userId = userId;
-    }
-
-    public String getPassword() {
-        return password;
-    }
-
-    public void setPassword(String password) {
-        this.password = password;
-    }
-
-    public String getHeadImage() {
-        return headImage;
-    }
-
-    public void setHeadImage(String headImage) {
-        this.headImage = headImage;
-    }
-
-    public int getUserLevel() {
-        return userLevel;
-    }
-
-    public void setUserLevel(int userLevel) {
-        this.userLevel = userLevel;
-    }
-
-    public BigDecimal getCrossBorderLine() {
-        return crossBorderLine;
-    }
-
-    public void setCrossBorderLine(BigDecimal crossBorderLine) {
-        this.crossBorderLine = crossBorderLine;
-    }
-
-    public String getIdCardNumber() {
-        return idCardNumber;
-    }
-
-    public void setIdCardNumber(String idCardNumber) {
-        this.idCardNumber = idCardNumber;
-    }
-
-    public String getFansNickname() {
-        return fansNickname;
-    }
-
-    public void setFansNickname(String fansNickname) {
-        this.fansNickname = fansNickname;
-    }
-
-    public String getFansId() {
-        return fansId;
-    }
-
-    public void setFansId(String fansId) {
-        this.fansId = fansId;
-    }
-
-    public String getInviteCode() {
-        return inviteCode;
-    }
-
-    public void setInviteCode(String inviteCode) {
-        this.inviteCode = inviteCode;
-    }
-
-    public String getBeInvitedCode() {
-        return beInvitedCode;
-    }
-
-    public void setBeInvitedCode(String beInvitedCode) {
-        this.beInvitedCode = beInvitedCode;
-    }
-
-    public String getCustomerServiceId() {
-        return customerServiceId;
-    }
-
-    public void setCustomerServiceId(String customerServiceId) {
-        this.customerServiceId = customerServiceId;
-    }
-
-    public Date getCreateTime() {
-        return createTime;
-    }
-
-    public void setCreateTime(Date createTime) {
-        this.createTime = createTime;
-    }
-
-    public Date getUpdateTime() {
-        return updateTime;
-    }
-
-    public void setUpdateTime(Date updateTime) {
-        this.updateTime = updateTime;
-    }
 }

wisenergy-model/src/main/java/cn/wisenergy/model/app/zxUserDto.java

-package cn.wisenergy.model.app;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.List;
-
-/**
- * Created by m1991 on 2021/3/10 20:29
- */
-@Data
-public class zxUserDto {
-    /**
-     * 手机号作为用户账号
-     */
-    @TableField(exist = false)
-    @ApiModelProperty(name = "user_id", value = "用户id")
-    private String userId;
-    /*
-         * 用户头像
-     */
-    @TableField(exist = false)
-    @ApiModelProperty(name = "headImage", value = "用户头像")
-    private String headImage;
-    /**
-     * 资讯主键id
-     */
-    @TableField(exist = false)
-    @ApiModelProperty(name = "zx_id", value = "资讯主键id")
-    private Integer zxid;
-    /**
-     * 视频存放地址
-     */
-    @TableField(exist = false)
-    @ApiModelProperty(name = "zx_url", value = "视频/图片存放地址")
-    private String zxUrl;
-    /**
-     * 用户本人邀请码
-     */
-    @TableField(exist = false)
-    @ApiModelProperty(name = "invite_code", value = "用户本人邀请码")
-    private String inviteCode;
-    /**
-     * 获赞数
-     */
-    @TableField(exist = false)
-    @ApiModelProperty(name = "zx_likes", value = "获赞数")
-    private Integer zxLikes;
-
-    @ApiModelProperty(name = "liked_status", value = "点赞状态")
-    private Integer likedStatus;
-
-    /**
-     * 资讯文字输入字段
-     */
-    @TableField(exist = false)
-    @ApiModelProperty(name = "zx_field", value = "资讯文字输入字段")
-    private String zxField;
-
-    /**
-     * 资讯数据创建时间
-     */
-    @TableField(exist = false)
-    @ApiModelProperty(name = "zx_date", value = "资讯数据创建时间")
-    private Long zxDate;
-
-
-
-    @TableField(exist = false)
-    private List<String> askImgList;
-}

wisenergy-model/src/main/java/cn/wisenergy/model/dto/AccountInfoQuery.java

+package cn.wisenergy.model.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author 86187
+ */
+@Data
+@ApiModel("AccountInfoQuery")
+public class AccountInfoQuery {
+    /**
+     * 页码
+     */
+    @ApiModelProperty(value = "页码", name = "pageNo")
+    private Integer pageNo;
+
+    /**
+     * 页条数
+     */
+    @ApiModelProperty(value = "页条数", name = "pageSize")
+    private Integer pageSize;
+
+
+    private Integer startNum;
+
+    private Integer endNum;
+}

wisenergy-model/src/main/java/cn/wisenergy/model/dto/CultivatingPrizeDto.java

+package cn.wisenergy.model.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Created by m1991 on 2021/3/26 11:13
+ */
+@Data
+@ApiModel("CultivatingPrizeDto")
+public class CultivatingPrizeDto {
+    /**
+     * 用户id
+     */
+    @ApiModelProperty(value = "主键id", name = "id")
+    private String id;
+
+
+    /**
+     * 页码
+     */
+    @ApiModelProperty(value = "页码", name = "pageNo")
+    private Integer pageNo;
+
+    /**
+     * 页条数
+     */
+    @ApiModelProperty(value = "页条数", name = "pageSize")
+    private Integer pageSize;
+
+
+
+    private Integer startNum;
+
+    private Integer endNum;
+
+}

wisenergy-model/src/main/java/cn/wisenergy/model/dto/CultivatingPrizeInfoDto.java

+package cn.wisenergy.model.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Created by m1991 on 2021/3/26 10:13
+ */
+@Data
+@ApiModel("CultivatingPrizeInfoDto")
+public class CultivatingPrizeInfoDto {
+    /**
+     * 用户id
+     */
+    @ApiModelProperty(value = "用户id", name = "userId")
+    private String userId;
+
+    /**
+     * 查询时间 格式(yyyy-MM-dd)
+     */
+    @ApiModelProperty(value = "查询时间 格式(yyyy-MM-dd)", name = "queryTime")
+    private String queryTime;
+
+    /**
+     * 页码
+     */
+    @ApiModelProperty(value = "页码", name = "pageNo")
+    private Integer pageNo;
+
+    /**
+     * 页条数
+     */
+    @ApiModelProperty(value = "页条数", name = "pageSize")
+    private Integer pageSize;
+
+
+    private Integer startNum;
+
+    private Integer endNum;
+}

wisenergy-model/src/main/java/cn/wisenergy/model/dto/MemberPercentQuery.java

+package cn.wisenergy.model.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author 86187
+ */
+@Data
+@ApiModel("MemberPercentQuery")
+public class MemberPercentQuery {
+    /**
+     * 页码
+     */
+    @ApiModelProperty(value = "页码", name = "pageNo")
+    private Integer pageNo;
+
+    /**
+     * 页条数
+     */
+    @ApiModelProperty(value = "页条数", name = "pageSize")
+    private Integer pageSize;
+
+
+    private Integer startNum;
+
+    private Integer endNum;
+}

wisenergy-model/src/main/java/cn/wisenergy/model/dto/MonthAwardQuery.java

+package cn.wisenergy.model.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 月度奖励列表查询条件Dto
+ * @author 86187
+ */
+@Data
+@ApiModel("MonthAwardQuery")
+public class MonthAwardQuery {
+
+    /**
+     * 查询时间 格式(yyyy-MM)
+     */
+    @ApiModelProperty(value = "查询时间 格式(yyyy-MM)", name = "queryTime")
+    private String queryTime;
+
+    /**
+     * 页码
+     */
+    @ApiModelProperty(value = "页码", name = "pageNo")
+    private Integer pageNo;
+
+    /**
+     * 页条数
+     */
+    @ApiModelProperty(value = "页条数", name = "pageSize")
+    private Integer pageSize;
+
+
+    private Integer startNum;
+
+    private Integer endNum;
+}

wisenergy-model/src/main/java/cn/wisenergy/model/dto/ProgressPrizeQuery.java

+package cn.wisenergy.model.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+*@ Description: 每月进步奖查询参数
+*@ Author     : 86187
+*@ Date       : 2021/3/25 10:50
+ * @author 86187
+ */
+@Data
+@ApiModel("ProgressPrizeQuery")
+public class ProgressPrizeQuery {
+    /**
+     * 查询时间 格式(yyyy-MM)
+     */
+    @ApiModelProperty(value = "查询时间 格式(yyyy-MM)", name = "queryTime")
+    private String queryTime;
+
+    /**
+     * 页码
+     */
+    @ApiModelProperty(value = "页码", name = "pageNo")
+    private Integer pageNo;
+
+    /**
+     * 页条数
+     */
+    @ApiModelProperty(value = "页条数", name = "pageSize")
+    private Integer pageSize;
+
+
+    private Integer startNum;
+
+    private Integer endNum;
+}

wisenergy-model/src/main/java/cn/wisenergy/model/dto/RecommendUserDto.java

+package cn.wisenergy.model.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Created by m1991 on 2021/3/25 18:32
+ */
+@Data
+@ApiModel("RecommendUserDto")
+public class RecommendUserDto extends TeamQueryDto {
+    /**
+     * 用户id
+     */
+    @ApiModelProperty(value = "用户id", name = "userId")
+    private String userId;
+
+    /**
+     * 查询时间 格式(yyyy-MM-dd)
+     */
+    @ApiModelProperty(value = "查询时间 格式(yyyy-MM-dd)", name = "queryTime")
+    private String queryTime;
+
+    /**
+     * 页码
+     */
+    @ApiModelProperty(value = "页码", name = "pageNo")
+    private Integer pageNo;
+
+    /**
+     * 页条数
+     */
+    @ApiModelProperty(value = "页条数", name = "pageSize")
+    private Integer pageSize;
+
+
+    private Integer startNum;
+
+    private Integer endNum;
+}

wisenergy-model/src/main/java/cn/wisenergy/model/dto/ShopZxUserDto.java

+package cn.wisenergy.model.dto;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * Created by m1991 on 2021/3/10 20:29
+ */
+@Data
+@ApiModel("ShopZxUserDto")
+public class ShopZxUserDto {
+    /**
+     * 用户id
+     */
+    @ApiModelProperty(value = "用户id", name = "userId")
+    private String userId;
+
+    /**
+     * 页码
+     */
+    @ApiModelProperty(value = "页码", name = "pageNo")
+    private Integer pageNo;
+
+    /**
+     * 页条数
+     */
+    @ApiModelProperty(value = "页条数", name = "pageSize")
+    private Integer pageSize;
+
+    private Integer startNum;
+
+    private Integer endNum;
+
+}

wisenergy-model/src/main/java/cn/wisenergy/model/dto/SysLoginDto.java

+package cn.wisenergy.model.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author 86187
+ */
+@Data
+@ApiModel("SysLoginDto")
+public class SysLoginDto {
+
+    /**
+     * 账户
+     */
+    @ApiModelProperty(value = "账户", name = "account")
+    private String account;
+
+    /**
+     * 密码
+     */
+    @ApiModelProperty(value = "密码", name = "password")
+    private String password;
+}

wisenergy-model/src/main/java/cn/wisenergy/model/dto/TeamUserInfoDto.java

+package cn.wisenergy.model.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Created by m1991 on 2021/3/26 9:34
+ */
+@Data
+@ApiModel("TeamUserInfoDto")
+public class TeamUserInfoDto extends TeamQueryDto {
+    /**
+     * 用户id
+     */
+    @ApiModelProperty(value = "用户id", name = "userId")
+    private String userId;
+
+    /**
+     * 查询时间 格式(yyyy-MM-dd)
+     */
+    @ApiModelProperty(value = "查询时间 格式(yyyy-MM-dd)", name = "queryTime")
+    private String queryTime;
+
+    /**
+     * 页码
+     */
+    @ApiModelProperty(value = "页码", name = "pageNo")
+    private Integer pageNo;
+
+    /**
+     * 页条数
+     */
+    @ApiModelProperty(value = "页条数", name = "pageSize")
+    private Integer pageSize;
+
+
+    private Integer startNum;
+
+    private Integer endNum;
+}

wisenergy-model/src/main/java/cn/wisenergy/model/dto/UserDto.java

+package cn.wisenergy.model.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Created by m1991 on 2021/3/25 11:16
+ */
+@Data
+@ApiModel("UserDto")
+public class UserDto {
+    /**
+     * 用户id
+     */
+    @ApiModelProperty(value = "用户id", name = "userId")
+    private String userId;
+
+    /**
+     * 查询时间 格式(yyyy-MM-dd)
+     */
+    @ApiModelProperty(value = "查询时间 格式(yyyy-MM-dd)", name = "queryTime")
+    private String queryTime;
+    /**
+     * 页码
+     */
+    @ApiModelProperty(value = "页码", name = "pageNo")
+    private Integer pageNo;
+
+    /**
+     * 页条数
+     */
+    @ApiModelProperty(value = "页条数", name = "pageSize")
+    private Integer pageSize;
+
+
+    private Integer startNum;
+
+    private Integer endNum;
+
+}

wisenergy-model/src/main/java/cn/wisenergy/model/app/UsersDto.java → wisenergy-model/src/main/java/cn/wisenergy/model/dto/UsersDto.java

-package cn.wisenergy.model.app;
+package cn.wisenergy.model.dto;
 
 
+import cn.wisenergy.model.app.User;
 import lombok.Data;
 import java.io.Serializable;
 

wisenergy-model/src/main/java/cn/wisenergy/model/vo/CultivatingPrizeInfoVo.java

+package cn.wisenergy.model.vo;
+
+import cn.wisenergy.model.dto.CultivatingPrizeInfoDto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * Created by m1991 on 2021/3/26 10:14
+ */
+@ApiModel("CultivatingPrizeInfoVo")
+@Data
+public class CultivatingPrizeInfoVo extends CultivatingPrizeInfoDto {
+    /**
+     * 主键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/vo/CultivatingPrizeVo.java

+package cn.wisenergy.model.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * Created by m1991 on 2021/3/26 12:34
+ */
+@Data
+public class CultivatingPrizeVo {
+    /**
+     * 主键id
+     */
+    @ApiModelProperty(value = "主键id", name = "id")
+    private Integer id;
+
+    /**
+     * 用户id
+     */
+    @ApiModelProperty(value = "用户id", name = "userId")
+    private String userId;
+
+    /**
+     * 年月
+     */
+    @ApiModelProperty(value = "年月", name = "yearMonth")
+    private String yearMonth;
+
+    /**
+     * 本月增长率
+     */
+    @ApiModelProperty(value = "本月增长率", name = "growthRate")
+    private Double growthRate;
+
+    /**
+     * 进步奖奖金
+     */
+    @ApiModelProperty(value = "进步奖奖金", name = "awardMoney")
+    private Double awardMoney;
+
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty(value = "创建时间", name = "createTime")
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty(value = "更新时间", name = "updateTime")
+    private Date updateTime;
+}

wisenergy-model/src/main/java/cn/wisenergy/model/vo/RecommendUserVo.java

+package cn.wisenergy.model.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * Created by m1991 on 2021/3/25 18:36
+ */
+@ApiModel("RecommendUserVo")
+@Data
+public class RecommendUserVo {
+    /**
+     * 直推用户主键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/vo/SetMemberPercentVo.java

+package cn.wisenergy.model.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author 86187
+ * @ Description:
+ * @ Author     : 86187
+ * @ Date       : 2021/3/26 10:30
+ */
+@Data
+@ApiModel("SetMemberPercentVo")
+public class SetMemberPercentVo {
+    /**
+     * 比列
+     */
+    @ApiModelProperty(name = "percent", value = "比列")
+    private Double percent;
+
+    /**
+     * 用户等级 0：普通用户 1：幼苗 2: 青铜树 3：白银树 4：黄金树 5：农场主 6：森林之星 7：西田森合伙人
+     */
+    @ApiModelProperty(name = "userLevel", value = "用户等级 0：普通用户 1：幼苗 2: 青铜树 3：白银树 4：黄金树 5：农场主 6：森林之星 7：西田森合伙人")
+    private Integer userLevel;
+
+    /**
+     * 会员等级百分比类型：1：返佣 2：月度肥料 3：月度最大进步奖 4：运营中心补贴
+     */
+    @ApiModelProperty(name = "type", value = "会员等级百分比类型：1：返佣 2：月度肥料 3：月度最大进步奖 4：运营中心补贴")
+    private Integer type;
+}

wisenergy-model/src/main/java/cn/wisenergy/model/app/zxUserVo.java → wisenergy-model/src/main/java/cn/wisenergy/model/vo/ShopZxUserVo.java

-package cn.wisenergy.model.app;
+package cn.wisenergy.model.vo;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.annotations.ApiModelProperty;
@@ -11,7 +11,7 @@ import java.util.List;
  * Created by m1991 on 2021/3/22 11:06
  */
 @Data
-public class zxUserVo {
+public class ShopZxUserVo {
     /**
      * 手机号作为用户账号
      */
@@ -61,7 +61,11 @@ public class zxUserVo {
     @ApiModelProperty(name = "zx_date", value = "资讯数据创建时间")
     private Long zxDate;
 
-
-
+    /**
+     * 资讯数据创建时间
+     */
+    @TableField(exist = false)
+    @ApiModelProperty(name = "AskImgList", value = "资讯图片List集合")
+    private List AskImgList;
 
 }

wisenergy-model/src/main/java/cn/wisenergy/model/vo/TeamUserInfoVo.java

+package cn.wisenergy.model.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * Created by m1991 on 2021/3/26 9:35
+ */
+@ApiModel("TeamUserInfoVo")
+@Data
+public class TeamUserInfoVo {
+    /**
+    * 团队用户主键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/vo/UserVo.java

+package cn.wisenergy.model.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * Created by m1991 on 2021/3/26 11:26
+ */
+@Data
+@ApiModel("UserVo")
+public class UserVo {
+
+    /**
+     * 主键id
+     */
+    @ApiModelProperty(name = "id", value = "用户主键id")
+    private Integer id;
+
+
+    /**
+     * 手机号作为用户账号
+     */
+    @ApiModelProperty(name = "user_id", value = "用户id")
+    private String userId;
+
+    /**
+     * 密码
+     */
+    @ApiModelProperty(name = "password", value = "用户密码")
+    private String password;
+
+    /**
+     * 用户头像
+     */
+    @ApiModelProperty(name = "用户头像", value = "headImage")
+    private String headImage;
+
+
+    /**
+     * 用户会员等级
+     */
+    @ApiModelProperty(name = "user_level", value = "用户会员等级")
+    private int userLevel;
+
+    /**
+     * 跨境额度
+     */
+    @ApiModelProperty(name = "cross_border_line", value = "跨境额度")
+    private BigDecimal crossBorderLine;
+
+    /**
+     * 身份证号码
+     */
+    @ApiModelProperty(name = "id_card_number", value = "身份证号码")
+    private String idCardNumber;
+
+    /**
+     * 粉丝昵称
+     */
+    @ApiModelProperty(name = "fans_nickname", value = "粉丝昵称")
+    private String fansNickname;
+
+    /**
+     * 有赞粉丝id，有赞自动生成
+     */
+    @ApiModelProperty(name = "fans_id", value = "有赞粉丝id，有赞自动生成")
+    private String fansId;
+
+    /**
+     * 用户本人邀请码
+     */
+    @ApiModelProperty(name = "invite_code", value = "用户本人邀请码")
+    private String inviteCode;
+
+    /**
+     * 推荐人邀请码
+     */
+    @ApiModelProperty(name = "be_invited_code", value = "推荐人邀请码")
+    private String beInvitedCode;
+
+    /**
+     * 专属客服id
+     */
+    @ApiModelProperty(name = "customerServiceId", value ="专属客服id" )
+    private String customerServiceId;
+
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty(name = "createTime", value = "创建时间")
+    private Date createTime;
+    /**
+     * 修改时间
+     */
+    @ApiModelProperty(name = "updateTime", value = "修改时间")
+    private Date updateTime;
+
+    /**
+     * 账户冻结字段 0正常  1冻结
+     */
+    @ApiModelProperty(name = "frozen", value = "账户冻结字段")
+    private Integer frozen;
+
+}

wisenergy-model/src/main/java/cn/wisenergy/model/vo/WithdrawAuditVo.java

+package cn.wisenergy.model.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author 86187
+ * @ Description: 提现审核Vo
+ * @ Author     : 86187
+ * @ Date       : 2021/3/29 9:56
+ */
+@ApiModel("WithdrawAuditVo")
+@Data
+public class WithdrawAuditVo {
+
+    /**
+     * 提现记录主键id
+     */
+    @ApiModelProperty(value = "提现记录主键id", name = "id")
+    private Integer id;
+}

wisenergy-parent.iml

 <?xml version="1.0" encoding="UTF-8"?>
-<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4" />
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" version="4">
\ No newline at end of file
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
+    <output url="file://$MODULE_DIR$/target/classes" />
+    <output-test url="file://$MODULE_DIR$/target/test-classes" />
+    <content url="file://$MODULE_DIR$">
+      <excludeFolder url="file://$MODULE_DIR$/target" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
\ No newline at end of file

wisenergy-service/src/main/java/cn/wisenergy/service/Manager/AccountManager.java

@@ -77,6 +77,8 @@ public class AccountManager {
         orderInfo.setRebateStatus(RebateStatusEnum.ALREADY_REBATE.getCode());
 
         orderMapper.updateById(orderInfo);
+        String time = DateUtil.convertDateToStr(new Date(), "yyyy-MM-dd hh:mm:ss");
+        log.info("订单" + orderInfo.getTid() + "在" + time + "时返佣：" + bigDecimal);
 
         //3、更新账户可用金额
         accountMapper.edit(accountInfo);
@@ -100,6 +102,7 @@ public class AccountManager {
                 if (count == 0) {
                     return false;
                 }
+                log.info("月度肥料新增用户" + teamPerformance.getUserId() + "团队绩效：" + teamPerformance.getMonthTeamPerformance());
             }
         }
 
@@ -110,6 +113,7 @@ public class AccountManager {
                 if (count == 0) {
                     return false;
                 }
+                log.info("月度肥料更新用户" + teamPerformance.getUserId() + "团队绩效为：" + teamPerformance.getMonthTeamPerformance());
             }
         }
         return true;
@@ -181,6 +185,7 @@ public class AccountManager {
             List<ProgressPrize> deleteList = new ArrayList<>(prizes);
             for (ProgressPrize updatePrize : updateList) {
                 int count = progressPrizeMapper.edit(updatePrize);
+                log.info("更新最大进步奖用户" + updatePrize.getUserId() + "奖金为：" + updatePrize.getAwardMoney());
                 if (count == 0) {
                     return false;
                 }
@@ -188,6 +193,7 @@ public class AccountManager {
 
             for (ProgressPrize addPrize : addList) {
                 int count = progressPrizeMapper.add(addPrize);
+                log.info("新增最大进步奖用户" + addPrize.getUserId() + "奖金：" + addPrize.getAwardMoney());
                 if (count == 0) {
                     return false;
                 }
@@ -204,6 +210,7 @@ public class AccountManager {
         //3、添加账户获得的收益
         for (AccountInfo accountInfo : accountInfoList) {
             accountMapper.edit(accountInfo);
+            log.info("最大进步奖更新用户" + accountInfo.getUserId() + "月收益：" + accountInfo.getEarningsMonth());
 
             //添加交易流水记录
             TradeRecord tradeRecord = new TradeRecord();
@@ -240,6 +247,40 @@ public class AccountManager {
                 if (count == 0) {
                     return false;
                 }
+                log.info("月度肥料更新用户" + accountInfo.getUserId() + "月收益" + accountInfo.getEarningsMonth());
+            }
+        }
+
+        //新增交易流水记录
+        if (!CollectionUtils.isEmpty(recordList)) {
+            for (TradeRecord tradeRecord : recordList) {
+                int count = tradeRecordMapper.add(tradeRecord);
+                if (count == 0) {
+                    return false;
+                }
+            }
+        }
+        return true;
+    }
+
+
+    /**
+     * 运营中心更新账户信息和保存交易流水记录
+     *
+     * @param accountInfoList 账户列表
+     * @param recordList      交易流水信息
+     */
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean runCenterUpdateAccountAddRecord(List<AccountInfo> accountInfoList, List<TradeRecord> recordList) {
+
+        //更新月收益
+        if (!CollectionUtils.isEmpty(accountInfoList)) {
+            for (AccountInfo accountInfo : accountInfoList) {
+                int count = accountMapper.edit(accountInfo);
+                if (count == 0) {
+                    return false;
+                }
+                log.info("运营中心更新用户" + accountInfo.getUserId() + "月收益" + accountInfo.getEarningsMonth());
             }
         }
 
@@ -263,7 +304,7 @@ public class AccountManager {
      */
     @Transactional(rollbackFor = Exception.class)
     public Boolean updateAccountAddRecordAddPrize(List<AccountInfo> accountInfoList, List<TradeRecord> recordList,
-                                                  List<ProgressPrize> addPrizeList,List<ProgressPrize> updatePrizeList) {
+                                                  List<ProgressPrize> addPrizeList, List<ProgressPrize> updatePrizeList) {
 
         //更新月收益
         if (!CollectionUtils.isEmpty(accountInfoList)) {
@@ -272,6 +313,7 @@ public class AccountManager {
                 if (count == 0) {
                     return false;
                 }
+                log.info("最大进步奖更新用户" + accountInfo.getUserId() + "月收益" + accountInfo.getEarningsMonth());
             }
         }
 
@@ -292,6 +334,7 @@ public class AccountManager {
                 if (count == 0) {
                     return false;
                 }
+                log.info("用户" + progressPrize.getUserId() + "新增最大进步奖奖金：" + progressPrize.getAwardMoney());
             }
         }
 
@@ -302,6 +345,7 @@ public class AccountManager {
                 if (count == 0) {
                     return false;
                 }
+                log.info("用户" + progressPrize.getUserId() + "更新最大进步奖奖金为：" + progressPrize.getAwardMoney());
             }
         }
         return true;
@@ -325,6 +369,7 @@ public class AccountManager {
                 if (count == 0) {
                     return false;
                 }
+                log.info("月定时任务月度肥料更新用户" + accountInfo.getUserId() + "月收益：" + accountInfo.getEarningsMonth());
             }
         }
 
@@ -338,7 +383,7 @@ public class AccountManager {
             }
         }
 
-        //判断是否存在月度肥料奖金信息
+        //判断是否存在月度肥料剩余奖金信息
         if (null == monthManure) {
             //新增上月剩余月度肥料奖金
             int count = monthManureMapper.add(manure);

wisenergy-service/src/main/java/cn/wisenergy/service/Manager/BankManger.java

+package cn.wisenergy.service.Manager;
+
+import cn.wisenergy.mapper.AccountMapper;
+import cn.wisenergy.mapper.BankInfoMapper;
+import cn.wisenergy.mapper.TradeRecordMapper;
+import cn.wisenergy.model.app.AccountInfo;
+import cn.wisenergy.model.app.TradeRecord;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
+
+/**
+ * @author 86187
+ * @ Description: 银行卡管理类
+ * @ Author     : 86187
+ * @ Date       : 2021/3/26 19:38
+ */
+@Component
+@Slf4j
+public class BankManger {
+
+    @Autowired
+    private TradeRecordMapper recordMapper;
+
+    @Autowired
+    private AccountMapper accountMapper;
+
+    /**
+     * 更新账户信息和保存交易流水记录
+     *
+     * @param accountInfo 账户信息
+     * @param record  交易流水信息
+     */
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean updateAccountAddRecord(AccountInfo accountInfo, TradeRecord record) {
+
+        //更新账户信息
+        if (null != accountInfo) {
+            int count = accountMapper.edit(accountInfo);
+            if (count == 0) {
+                return false;
+            }
+        }
+
+        //新增交易流水记录
+        if (null != record) {
+            int count = recordMapper.add(record);
+            return count != 0;
+        }
+        return true;
+    }
+
+    /**
+     * 更新账户信息和提现记录状态
+     *
+     * @param accountInfo 账户信息
+     * @param record  交易流水信息
+     */
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean updateAccountAndRecord(AccountInfo accountInfo, TradeRecord record) {
+
+        //更新账户信息
+        if (null != accountInfo) {
+            int count = accountMapper.edit(accountInfo);
+            if (count == 0) {
+                return false;
+            }
+        }
+
+        //新增交易流水记录
+        if (null != record) {
+            int count = recordMapper.add(record);
+            return count != 0;
+        }
+        return true;
+    }
+}

wisenergy-service/src/main/java/cn/wisenergy/service/app/AccountService.java

@@ -3,21 +3,15 @@ package cn.wisenergy.service.app;
 
 import cn.wisenergy.common.utils.R;
 import cn.wisenergy.model.app.AccountInfo;
-import cn.wisenergy.model.app.User;
+import cn.wisenergy.model.dto.AccountInfoQuery;
+import com.github.pagehelper.PageInfo;
 
-import java.util.List;
 
 /**
  * @author 86187
  */
 public interface AccountService {
 
-    /**
-     * 订单返佣-日任务
-     * @return true or false
-     */
-    R<Boolean> orderRebate();
-
     /**
      * 获取账户信息
      *
@@ -27,24 +21,9 @@ public interface AccountService {
     R<AccountInfo> getByUserId(String userId);
 
     /**
-     * 收益和业绩统计（月度肥料 -日）
-     * @return true or false
-     */
-    R<Boolean> performanceCount();
-
-    /**
-     * 获取用户的商机信息
-     *
-     * @param userId 用户id
-     * @return 用户商机列表
-     */
-    List<User> getByList(String userId);
-
-
-    /**
-     * 进步奖收益统计（最大进步奖） -日任务
-     *
-     * @return true or false
+     * 获取账户列表
+     * @param query 查询条件
+     * @return 账户列表
      */
-    R<Boolean> progressPrizeCount();
+    R<PageInfo<AccountInfo>> getList(AccountInfoQuery query);
 }

wisenergy-service/src/main/java/cn/wisenergy/service/app/BankService.java

@@ -4,6 +4,7 @@ import cn.wisenergy.common.utils.R;
 import cn.wisenergy.model.app.BankInfo;
 import cn.wisenergy.model.dto.WithdrawBankDto;
 import cn.wisenergy.model.vo.TaxRateVo;
+import cn.wisenergy.model.vo.WithdrawAuditVo;
 
 import java.util.List;
 
@@ -67,4 +68,12 @@ public interface BankService {
      */
     R<TaxRateVo> getTaxRate(Double money);
 
+    /**
+     * 提现审核
+     *
+     * @param auditVo 提现记录id
+     * @return true or false
+     */
+    R<Boolean> withdrawAudit(WithdrawAuditVo auditVo);
+
 }

wisenergy-service/src/main/java/cn/wisenergy/service/app/CultivatingPrizeInfoService.java

+package cn.wisenergy.service.app;
+
+import cn.wisenergy.common.utils.R;
+import cn.wisenergy.model.dto.CultivatingPrizeInfoDto;
+import cn.wisenergy.model.vo.CultivatingPrizeInfoVo;
+import com.github.pagehelper.PageInfo;
+
+/**
+ * Created by m1991 on 2021/3/26 10:22
+ */
+public interface CultivatingPrizeInfoService {
+    /**
+     * 分页查询所有信息
+     *
+     * @param cultivatingPrizeInfoDto 查询参数
+     * @return 列表
+     */
+    R<PageInfo<CultivatingPrizeInfoVo>> getCultivatingPrizeInfoList(CultivatingPrizeInfoDto cultivatingPrizeInfoDto);
+}

wisenergy-service/src/main/java/cn/wisenergy/service/app/CultivatingPrizeService.java

+package cn.wisenergy.service.app;
+
+import cn.wisenergy.common.utils.R;
+import cn.wisenergy.model.app.CultivatingPrize;
+import cn.wisenergy.model.dto.CultivatingPrizeDto;
+import com.github.pagehelper.PageInfo;
+
+import java.util.List;
+
+/**
+ * Created by m1991 on 2021/3/26 11:00
+ */
+public interface CultivatingPrizeService {
+    /**
+     * 分页查询所有用户信息
+     *
+     * @return 列表
+     */
+    R<List<CultivatingPrize>> getCultivatingPrizeList();
+}

wisenergy-service/src/main/java/cn/wisenergy/service/app/DayTaskService.java

+package cn.wisenergy.service.app;
+
+import cn.wisenergy.common.utils.R;
+import cn.wisenergy.model.app.User;
+
+
+import java.util.List;
+
+/**
+*@ Description:  日定时任务
+*@ Author     : 86187
+*@ Date       : 2021/3/25 15:09
+ * @author 86187
+ */
+public interface DayTaskService {
+    /**
+     * 订单返佣-日任务
+     * @return true or false
+     */
+    R<Boolean> orderRebate();
+
+    /**
+     * 收益和业绩统计（月度肥料 -日）
+     * @return true or false
+     */
+    R<Boolean> performanceCount();
+
+    /**
+     * 获取用户的上级信息
+     *
+     * @param userId 用户id
+     * @return 用户商机列表
+     */
+    List<User> getByList(String userId);
+
+    /**
+     * 进步奖收益统计（最大进步奖） -日任务
+     *
+     * @return true or false
+     */
+    R<Boolean> progressPrizeCount();
+}

wisenergy-service/src/main/java/cn/wisenergy/service/app/LoginService.java

 package cn.wisenergy.service.app;
 
 import cn.wisenergy.common.utils.R;
-import cn.wisenergy.model.vo.UserLoginVo;
 import cn.wisenergy.model.vo.UserRegisterVo;
 
 /**

wisenergy-service/src/main/java/cn/wisenergy/service/app/MemberPercentService.java

+package cn.wisenergy.service.app;
+
+import cn.wisenergy.common.utils.R;
+import cn.wisenergy.model.app.MemberPercent;
+import cn.wisenergy.model.dto.MemberPercentQuery;
+import cn.wisenergy.model.vo.SetMemberPercentVo;
+import com.github.pagehelper.PageInfo;
+
+/**
+ * @author 86187
+ */
+public interface MemberPercentService {
+
+    /**
+     * 获取会员等级优惠比列列表
+     *
+     * @param query 条件
+     * @return 优惠比列列表
+     */
+    R<PageInfo<MemberPercent>> getList(MemberPercentQuery query);
+
+    /**
+     * 更据等级和类型，设置优惠比列
+     *
+     * @param percentVo 参数
+     * @return true or false
+     */
+    R<Boolean> setMemberPercent(SetMemberPercentVo percentVo);
+}

wisenergy-service/src/main/java/cn/wisenergy/service/app/MonthAwardService.java

 package cn.wisenergy.service.app;
 
 import cn.wisenergy.common.utils.R;
+import cn.wisenergy.model.app.MonthAward;
+import cn.wisenergy.model.dto.MonthAwardQuery;
 import cn.wisenergy.model.vo.MonthAwardVo;
+import com.github.pagehelper.PageInfo;
 
 /**
  * @author 86187
@@ -16,4 +19,11 @@ public interface MonthAwardService {
      * @return 月度奖金
      */
     R<MonthAwardVo> queryMonthAward(String userId);
+
+    /**
+     * 获取月度奖励列表
+     * @param monthAwardQuery 查询参数
+     * @return 月度奖励列表
+     */
+    R<PageInfo<MonthAward>> getList(MonthAwardQuery monthAwardQuery);
 }

wisenergy-service/src/main/java/cn/wisenergy/service/app/MonthTaskService.java

@@ -36,4 +36,11 @@ public interface MonthTaskService {
      * @return true or false
      */
     R<Boolean> runCenterSubsidy();
+
+    /**
+     * 月度奖金统计- 数据写入月度奖金实体类
+     *
+     * @return true or false
+     */
+    R<Boolean> monthAwardCount();
 }

wisenergy-service/src/main/java/cn/wisenergy/service/app/ProgressPrizeService.java

 package cn.wisenergy.service.app;
 
 import cn.wisenergy.common.utils.R;
+import cn.wisenergy.model.app.ProgressPrize;
+import cn.wisenergy.model.dto.ProgressPrizeQuery;
 import cn.wisenergy.model.vo.PrizeShowVo;
 import cn.wisenergy.model.vo.ProgressPrizeVo;
+import com.github.pagehelper.PageInfo;
 
 import java.util.List;
 
@@ -20,4 +23,11 @@ public interface ProgressPrizeService {
      * @return 进步奖列表
      */
     R<PrizeShowVo> getProgressPrizes();
+
+    /**
+     * 获取最大进步奖列表
+     * @param query 查询参数
+     * @return 最大进步奖列表
+     */
+    R<PageInfo<ProgressPrize>> getList(ProgressPrizeQuery query);
 }

wisenergy-service/src/main/java/cn/wisenergy/service/app/RecommendUserService.java

@@ -2,8 +2,10 @@ package cn.wisenergy.service.app;
 
 import cn.wisenergy.common.utils.R;
 import cn.wisenergy.model.app.RecommendUser;
-import cn.wisenergy.model.app.User;
+import cn.wisenergy.model.dto.RecommendUserDto;
+import cn.wisenergy.model.vo.RecommendUserVo;
 import cn.wisenergy.model.vo.UserAndRecommendVo;
+import com.github.pagehelper.PageInfo;
 
 import java.util.List;
 
@@ -12,4 +14,12 @@ public interface RecommendUserService {
     RecommendUser getMyRecommed(String userId);
 
     List<UserAndRecommendVo> getMyRecommendInfo(String userId, Integer userLevel);
+
+    /**
+     * 分页查询所有用户信息
+     *
+     * @param recommendUserDto 查询参数
+     * @return 列表
+     */
+    R<PageInfo<RecommendUserVo>> getRecommendUserList(RecommendUserDto recommendUserDto);
 }

wisenergy-service/src/main/java/cn/wisenergy/service/app/TeamUserInfoService.java

 package cn.wisenergy.service.app;
 
+import cn.wisenergy.common.utils.R;
 import cn.wisenergy.model.app.TeamUserInfo;
+import cn.wisenergy.model.dto.TeamUserInfoDto;
+import cn.wisenergy.model.vo.TeamUserInfoVo;
+import com.github.pagehelper.PageInfo;
 
 public interface TeamUserInfoService {
 
@@ -11,4 +15,12 @@ public interface TeamUserInfoService {
      * @return 用户团队总人数
      */
     int getTeamUserCount(String userId);
+
+    /**
+     * 分页查询所有用户信息
+     *
+     * @param teamUserInfoDto 查询参数
+     * @return 列表
+     */
+    R<PageInfo<TeamUserInfoVo>> getTeamUserInfoList(TeamUserInfoDto teamUserInfoDto);
 }

wisenergy-service/src/main/java/cn/wisenergy/service/app/TradeRecordService.java

@@ -11,13 +11,6 @@ import java.util.List;
  * @author 86187
  */
 public interface TradeRecordService {
-    /**
-     * 月度奖金统计- 数据写入月度奖金实体类
-     *
-     * @return true or false
-     */
-    R<Boolean> monthAwardCount();
-
     /**
      * 交易流水列表查询
      *

wisenergy-service/src/main/java/cn/wisenergy/service/app/UploadService.java

 package cn.wisenergy.service.app;
 
 
-import cn.wisenergy.model.app.shopZx;
-import cn.wisenergy.model.app.zxUserVo;
+import cn.wisenergy.common.utils.R;
+import cn.wisenergy.model.dto.ShopZxUserDto;
+import cn.wisenergy.model.vo.ShopZxUserVo;
+import com.github.pagehelper.PageInfo;
 import org.springframework.core.io.Resource;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
-import java.util.List;
 import java.util.Map;
 
 /**
@@ -55,11 +56,10 @@ public interface UploadService {
 
     /**
      * TODO 资讯单表分页全部信息展示
-     * @param pageNum
-     * @param pageSize
+     * @param shopZxUserDto
      * @return
      */
-    List<zxUserVo> selectAll(Integer pageNum, Integer pageSize);
+    R<PageInfo<ShopZxUserVo>> getShopZxUserList(ShopZxUserDto shopZxUserDto);
 
     /**
      * TODO 资讯点赞

wisenergy-service/src/main/java/cn/wisenergy/service/app/UserLevelService.java

@@ -9,8 +9,4 @@ public interface UserLevelService {
      */
     void userLevelUpgrade(String userId);
 
-    /**
-     * 用户升级定时任务
-     */
-    void userLevelUp();
 }

wisenergy-service/src/main/java/cn/wisenergy/service/app/UserLevelTaskService.java

+package cn.wisenergy.service.app;
+
+public interface UserLevelTaskService {
+    /**
+     * 用户升级定时任务
+     */
+    void userLevelUp();
+
+    /**
+     * 用户升级月定时任务
+     */
+    void monthUserLevelUp();
+}

wisenergy-service/src/main/java/cn/wisenergy/service/app/UserService.java

@@ -2,9 +2,12 @@ package cn.wisenergy.service.app;
 
 import cn.wisenergy.common.utils.R;
 import cn.wisenergy.model.app.User;
-import cn.wisenergy.model.app.UsersDto;
+
+import cn.wisenergy.model.dto.UsersDto;
+import cn.wisenergy.model.dto.TeamQueryDto;
 import cn.wisenergy.model.vo.AerialDeliveryVo;
-import cn.wisenergy.model.vo.UserRegisterVo;
+
+import com.github.pagehelper.PageInfo;
 
 import java.util.Map;
 
@@ -96,4 +99,12 @@ public interface UserService {
      */
     R<Boolean> fillInInviteCode(String userId, String inviteCode);
 
+    /**
+     * 分页查询所有用户信息
+     *
+     * @param queryDto 查询参数
+     * @return 列表
+     */
+    R<PageInfo<User>> getUserList(TeamQueryDto queryDto);
+
 }

wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/BankServiceImpl.java

@@ -8,6 +8,8 @@ import cn.wisenergy.model.enums.FrozenStatus;
 import cn.wisenergy.model.enums.TradeRecordEnum;
 import cn.wisenergy.model.enums.TradeStatusEnum;
 import cn.wisenergy.model.vo.TaxRateVo;
+import cn.wisenergy.model.vo.WithdrawAuditVo;
+import cn.wisenergy.service.Manager.BankManger;
 import cn.wisenergy.service.app.BankService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.extern.slf4j.Slf4j;
@@ -15,6 +17,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -49,6 +52,12 @@ public class BankServiceImpl extends ServiceImpl<BankInfoMapper, BankInfo> imple
     @Autowired
     private VariableMapper variableMapper;
 
+    @Autowired
+    private BankManger bankManger;
+
+    @Autowired
+    private TradeRecordMapper tradeRecordMapper;
+
     private static final String TAX_RATE_KEY = "TAX_RATE_CODE";
 
 
@@ -181,15 +190,31 @@ public class BankServiceImpl extends ServiceImpl<BankInfoMapper, BankInfo> imple
             return R.error(1, "验证码已过期!", false);
         }
 
-        //3、添加提现交易流水记录
+        //3、更新可提现金额和
+        BigDecimal money = BigDecimal.valueOf(dto.getMoney());
+        BigDecimal extractMoney = accountInfo.getExtractMoney().subtract(money);
+        accountInfo.setExtractMoney(extractMoney);
+
+        BigDecimal frozenMoney = accountInfo.getFrozenMoney().add(money);
+        accountInfo.setFrozenMoney(frozenMoney);
+
+        BigDecimal earningsMonth = accountInfo.getEarningsMonth().subtract(money);
+        accountInfo.setEarningsMonth(earningsMonth);
+
+        BigDecimal earningsTotal = accountInfo.getEarningsTotal().subtract(money);
+        accountInfo.setEarningsTotal(earningsTotal);
+
+        //4、添加提现交易流水记录
         TradeRecord tradeRecord = new TradeRecord();
         tradeRecord.setUserId(accountInfo.getUserId());
         tradeRecord.setTradeType(TradeRecordEnum.WITHDRAW_DEPOSIT.getCode());
         tradeRecord.setTradeNo(null);
         tradeRecord.setStatus(TradeStatusEnum.BANK_TRANSFER_ACCOUNTS.getCode());
-        int count = recordMapper.add(tradeRecord);
-        if (count == 0) {
-            return R.error("保存交易流水失败!");
+        tradeRecord.setMoney(money);
+
+        Boolean bool = bankManger.updateAccountAddRecord(accountInfo, tradeRecord);
+        if (!bool) {
+            return R.ok(1, false);
         }
         return R.ok(0, true);
     }
@@ -237,4 +262,31 @@ public class BankServiceImpl extends ServiceImpl<BankInfoMapper, BankInfo> imple
         taxRateVo.setTaxDesc("提现时系统自动扣除2%个人所得税，剩余税费由平台替缴。");
         return R.ok(taxRateVo);
     }
+
+    @Override
+    public R<Boolean> withdrawAudit(WithdrawAuditVo auditVo) {
+        log.info("shop-mall[]BankServiceImpl[]withdrawAudit[]input.param.auditVo:" + auditVo);
+        if (null == auditVo || null == auditVo.getId()) {
+            return R.error("入参为空!");
+        }
+
+        //1、根据提现记录id,获取提现信息
+        TradeRecord tradeRecord = tradeRecordMapper.selectById(auditVo.getId());
+        if (null == tradeRecord) {
+            return R.error("提现记录不正确，请联系管理员!");
+        }
+
+        //2、获取账户信息
+        AccountInfo accountInfo = accountMapper.getByUserId(tradeRecord.getUserId());
+        if (null == accountInfo) {
+            return R.error("提现账户信息不存在!");
+        }
+
+        //更新提现状态为 提现成功，更新账户冻结金额
+        boolean bool = bankManger.updateAccountAndRecord(accountInfo, tradeRecord);
+        if (!bool) {
+            return R.ok(1, false);
+        }
+        return R.ok(0, true);
+    }
 }

wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/CultivatingPrizeInfoServiceImpl.java

+package cn.wisenergy.service.app.impl;
+
+import cn.wisenergy.common.constant.CommonAttributes;
+import cn.wisenergy.common.utils.DateUtil;
+import cn.wisenergy.common.utils.R;
+import cn.wisenergy.mapper.CultivatingPrizeInfoMapper;
+import cn.wisenergy.model.app.CultivatingPrizeInfo;
+import cn.wisenergy.model.dto.CultivatingPrizeInfoDto;
+import cn.wisenergy.model.vo.CultivatingPrizeInfoVo;
+import cn.wisenergy.service.app.CultivatingPrizeInfoService;
+import com.github.pagehelper.PageInfo;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Created by m1991 on 2021/3/26 10:22
+ */
+@Service
+@Slf4j
+public class CultivatingPrizeInfoServiceImpl  implements CultivatingPrizeInfoService {
+
+    @Autowired
+    public CultivatingPrizeInfoMapper cultivatingPrizeInfoMapper;
+
+    @Override
+    public R<PageInfo<CultivatingPrizeInfoVo>> getCultivatingPrizeInfoList(CultivatingPrizeInfoDto cultivatingPrizeInfoDto) {
+        log.info("shop-mall[]CultivatingPrizeInfoServiceImpl[]getCultivatingPrizeInfoList[]input.param.query:" + cultivatingPrizeInfoDto);
+        if (null == cultivatingPrizeInfoDto) {
+            return R.error("入参不能为空!");
+        }
+        pageHandle(cultivatingPrizeInfoDto);
+        Map<String, Object> map = new HashMap<>(8);
+
+        if (!StringUtils.isBlank(cultivatingPrizeInfoDto.getUserId())) {
+            map.put("userId", cultivatingPrizeInfoDto.getUserId());
+        }
+        if (!StringUtils.isBlank(cultivatingPrizeInfoDto.getQueryTime())) {
+            Date date = DateUtil.convertStrToDate(cultivatingPrizeInfoDto.getQueryTime(), "yyyy-MM-dd");
+            String queryTime = cultivatingPrizeInfoDto.getQueryTime();
+            map.put("queryTime", queryTime);
+        }
+
+
+        map.put("startNum", cultivatingPrizeInfoDto.getStartNum());
+        map.put("endNum", cultivatingPrizeInfoDto.getEndNum());
+
+        int total = cultivatingPrizeInfoMapper.count(map);
+
+        List<CultivatingPrizeInfoVo> list = cultivatingPrizeInfoMapper.getCultivatingPrizeInfoList(map);
+        PageInfo<CultivatingPrizeInfoVo> info = new PageInfo<>();
+        info.setPageSize(cultivatingPrizeInfoDto.getPageSize());
+        info.setPageNum(cultivatingPrizeInfoDto.getPageNo());
+        info.setList(list);
+        info.setTotal(total);
+
+        return R.ok(info);
+    }
+
+    /**
+     * 分页处理方法
+     *
+     * @param schemeVo 参数
+     */
+    private void pageHandle(CultivatingPrizeInfoDto schemeVo) {
+        Integer pageNum = schemeVo.getPageNo();
+        Integer pageSize = schemeVo.getPageSize();
+        if (null == pageSize || pageSize == 0) {
+            pageSize = 10;
+        }
+        if (null == pageNum || pageNum == 0) {
+            pageNum = 1;
+        }
+        Integer endNum = pageSize;
+        Integer startNum = (pageNum - CommonAttributes.NUM_ONE) * pageSize;
+        schemeVo.setEndNum(endNum);
+        schemeVo.setStartNum(startNum);
+        schemeVo.setPageNo(pageNum);
+        schemeVo.setPageSize(pageSize);
+    }
+}

wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/CultivatingPrizeServiceImpl.java

+package cn.wisenergy.service.app.impl;
+
+import cn.wisenergy.common.utils.R;
+import cn.wisenergy.mapper.CultivatingPrizeMapper;
+import cn.wisenergy.model.app.CultivatingPrize;
+import cn.wisenergy.model.vo.CultivatingPrizeVo;
+import cn.wisenergy.service.app.CultivatingPrizeService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * Created by m1991 on 2021/3/26 11:06
+ */
+@Service
+@Slf4j
+public class CultivatingPrizeServiceImpl implements CultivatingPrizeService {
+
+    @Autowired
+    public CultivatingPrizeMapper cultivatingPrizeMapper;
+
+    @Override
+    public R<List<CultivatingPrize>> getCultivatingPrizeList() {
+        log.info("shop-mall[]CultivatingPrizeServiceImpl[]getCultivatingPrizeList[]input.param.query:" );
+
+        List<CultivatingPrize> cultivatingPrizeList = cultivatingPrizeMapper.getCultivatingPrizeList();
+
+        return R.ok(cultivatingPrizeList);
+    }
+}

wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/CustomerServiceServiceImpl.java

@@ -7,19 +7,17 @@ import cn.wisenergy.model.app.CustomerService;
 import cn.wisenergy.model.app.User;
 import cn.wisenergy.service.app.CustomerServiceService;
 import lombok.extern.slf4j.Slf4j;
-import org.aspectj.weaver.ast.Var;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
-import org.yaml.snakeyaml.events.Event;
+
 
 import javax.servlet.http.HttpServletRequest;
 import java.io.File;
 import java.io.IOException;
 import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
+
 
 @Service
 @Slf4j

wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/MemberPercentServiceImpl.java

+package cn.wisenergy.service.app.impl;
+
+import cn.wisenergy.common.constant.CommonAttributes;
+import cn.wisenergy.common.utils.R;
+import cn.wisenergy.mapper.MemberPercentMapper;
+import cn.wisenergy.model.app.MemberPercent;
+import cn.wisenergy.model.app.TradeRecord;
+import cn.wisenergy.model.dto.MemberPercentQuery;
+import cn.wisenergy.model.dto.TradeRecordQuery;
+import cn.wisenergy.model.vo.SetMemberPercentVo;
+import cn.wisenergy.service.app.MemberPercentService;
+import com.github.pagehelper.PageInfo;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author 86187
+ */
+@Service
+@Slf4j
+public class MemberPercentServiceImpl implements MemberPercentService {
+    @Autowired
+    private MemberPercentMapper memberPercentMapper;
+
+    @Override
+    public R<PageInfo<MemberPercent>> getList(MemberPercentQuery query) {
+        log.info("sho[-mall[]MemberPercentServiceImpl[]getList[]input.param.query:" + query);
+        if (null == query) {
+            return R.error("入参不能为空!");
+        }
+        pageHandle(query);
+
+        Map<String, Object> map = new HashMap<>();
+        int total = memberPercentMapper.count();
+
+        map.put("startNum", query.getStartNum());
+        map.put("endNum", query.getEndNum());
+        List<MemberPercent> list = memberPercentMapper.getList(map);
+        PageInfo<MemberPercent> info = new PageInfo<>();
+        info.setPageSize(query.getPageSize());
+        info.setPageNum(query.getPageNo());
+        info.setTotal(total);
+        info.setList(list);
+        return R.ok(info);
+    }
+
+    @Override
+    public R<Boolean> setMemberPercent(SetMemberPercentVo percentVo) {
+        log.info("sho[-mall[]MemberPercentServiceImpl[]setMemberPercent[]input.param.percentVo:" + percentVo);
+        if (null == percentVo || null == percentVo.getPercent() ||
+                null == percentVo.getType() || null == percentVo.getUserLevel()) {
+            return R.error("入参不能为空!");
+        }
+
+        //1、更据等级和类型，获取会员等级优惠  存在更新，不存 在新增
+        MemberPercent memberPercent = memberPercentMapper.getByLevelAndType(percentVo.getUserLevel(), percentVo.getType());
+        MemberPercent member = new MemberPercent();
+        BigDecimal bigDecimal = BigDecimal.valueOf(percentVo.getPercent()).setScale(2, RoundingMode.HALF_UP);
+        if (null == memberPercent) {
+            member.setType(percentVo.getType());
+            member.setPercent(bigDecimal);
+            member.setUserLevel(percentVo.getUserLevel());
+            int count = memberPercentMapper.add(member);
+            if (count == 0) {
+                return R.ok(1, false);
+            }
+            return R.ok(0, true);
+        }
+
+        //存在则更新
+        memberPercent.setPercent(bigDecimal);
+        int count = memberPercentMapper.edit(memberPercent);
+
+        if (count == 0) {
+            return R.ok(1, false);
+        }
+        return R.ok(0, true);
+    }
+
+    /**
+     * 分页处理方法
+     *
+     * @param schemeVo 参数
+     */
+    private void pageHandle(MemberPercentQuery schemeVo) {
+        Integer pageNum = schemeVo.getPageNo();
+        Integer pageSize = schemeVo.getPageSize();
+        if (null == pageSize || pageSize == 0) {
+            pageSize = 10;
+        }
+        if (null == pageNum || pageNum == 0) {
+            pageNum = 1;
+        }
+        Integer endNum = pageSize;
+        Integer startNum = (pageNum - CommonAttributes.NUM_ONE) * pageSize;
+        schemeVo.setEndNum(endNum);
+        schemeVo.setStartNum(startNum);
+        schemeVo.setPageNo(pageNum);
+        schemeVo.setPageSize(pageSize);
+    }
+}

wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/MonthAwardServiceImpl.java

 package cn.wisenergy.service.app.impl;
 
+import cn.wisenergy.common.constant.CommonAttributes;
 import cn.wisenergy.common.utils.DateUtil;
 import cn.wisenergy.common.utils.R;
 import cn.wisenergy.mapper.MonthAwardMapper;
 import cn.wisenergy.mapper.TradeRecordMapper;
 import cn.wisenergy.model.app.MonthAward;
+import cn.wisenergy.model.app.TradeRecord;
+import cn.wisenergy.model.dto.MonthAwardQuery;
+import cn.wisenergy.model.dto.TradeRecordQuery;
 import cn.wisenergy.model.vo.MonthAwardVo;
 import cn.wisenergy.service.app.MonthAwardService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.github.pagehelper.PageInfo;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * @author 86187
@@ -60,4 +68,52 @@ public class MonthAwardServiceImpl extends ServiceImpl<MonthAwardMapper, MonthAw
         }
         return R.ok(monthAwardVo);
     }
+
+    @Override
+    public R<PageInfo<MonthAward>> getList(MonthAwardQuery query) {
+        log.info("shop-mall[]MonthAwardServiceImpl[]getList[]input.param.query:" + query);
+        if (null == query) {
+            return R.error("入参为空!");
+        }
+
+        pageHandle(query);
+
+        Map<String, Object> map = new HashMap<>(8);
+        if (!StringUtils.isBlank(query.getQueryTime())) {
+            map.put("queryTime", query.getQueryTime());
+        }
+        int total = baseMapper.count(map);
+
+        map.put("startNum", query.getStartNum());
+        map.put("endNum", query.getEndNum());
+        List<MonthAward> list = baseMapper.getList(map);
+        PageInfo<MonthAward> info = new PageInfo<>();
+        info.setPageSize(query.getPageSize());
+        info.setPageNum(query.getPageNo());
+        info.setTotal(total);
+        info.setList(list);
+        return R.ok(info);
+    }
+
+    /**
+     * 分页处理方法
+     *
+     * @param schemeVo 参数
+     */
+    private void pageHandle(MonthAwardQuery schemeVo) {
+        Integer pageNum = schemeVo.getPageNo();
+        Integer pageSize = schemeVo.getPageSize();
+        if (null == pageSize || pageSize == 0) {
+            pageSize = 10;
+        }
+        if (null == pageNum || pageNum == 0) {
+            pageNum = 1;
+        }
+        Integer endNum = pageSize;
+        Integer startNum = (pageNum - CommonAttributes.NUM_ONE) * pageSize;
+        schemeVo.setEndNum(endNum);
+        schemeVo.setStartNum(startNum);
+        schemeVo.setPageNo(pageNum);
+        schemeVo.setPageSize(pageSize);
+    }
 }

wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/UserLevelTaskServiceImpl.java

+package cn.wisenergy.service.app.impl;
+
+import cn.wisenergy.mapper.OrderMapper;
+import cn.wisenergy.model.app.OrderInfo;
+import cn.wisenergy.service.app.UserLevelService;
+import cn.wisenergy.service.app.UserLevelTaskService;
+import com.xxl.job.core.handler.annotation.XxlJob;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+@Slf4j
+public class UserLevelTaskServiceImpl implements UserLevelTaskService {
+
+    @Autowired
+    private OrderMapper orderMapper;
+
+    @Autowired
+    private UserLevelService userLevelService;
+
+    //获取订单
+    @XxlJob(value = "userLevelUpjobhandler")
+    @Override
+    public void userLevelUp() {
+        //1.获取数据库订单数据
+        log.info("------------------------日定时任务+5分钟执行一次+用户升级开始----------------------------------");
+        List<OrderInfo> ordersByLevelStatus = orderMapper.getByLevelStatus(0);
+        for (OrderInfo orderInfo : ordersByLevelStatus) {
+            String userId = orderInfo.getUserId();
+            userLevelService.userLevelUpgrade(userId);
+            //当前订单升级状态置为1
+            orderInfo.setLevelStatus(1);
+            orderMapper.updateById(orderInfo);
+        }
+        log.info("-------------------------日定时任务+5分钟执行一次+用户升级结束--------------------------------------");
+    }
+
+    @XxlJob("monthUserLevelUpjobhandler")
+    @Override
+    public void monthUserLevelUp(){
+        //1.获取数据库订单数据
+        log.info("------------------------月定时任务：====用户升级开始----------------------------------");
+        List<OrderInfo> ordersByLevelStatus = orderMapper.getByMonthOrderStatus(0);
+        for (OrderInfo orderInfo : ordersByLevelStatus) {
+            String userId = orderInfo.getUserId();
+            userLevelService.userLevelUpgrade(userId);
+            //当前订单升级状态置为1
+            orderInfo.setLevelStatus(1);
+            orderMapper.updateById(orderInfo);
+        }
+        log.info("-------------------------月定时任务：====用户升级结束--------------------------------------");
+    }
+
+}

wisenergy-web-admin/pom.xml

@@ -64,6 +64,12 @@
             <artifactId>thumbnailator</artifactId>
             <version>0.4.8</version>
         </dependency>
+        <!--获取服务器硬件信息-->
+        <dependency>
+            <groupId>org.fusesource</groupId>
+            <artifactId>sigar</artifactId>
+            <version>1.6.4</version>
+        </dependency>
     </dependencies>
 
     <!-- MAVEN构建 -->