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

wisenergy-common/src/main/java/cn/wisenergy/common/utils/FrameGrabberKit.java

@@ -6,7 +6,7 @@ import java.awt.image.BufferedImage;
 import java.io.File;
 import javax.imageio.ImageIO;
 
-
+import org.bytedeco.javacpp.opencv_core;
 import org.bytedeco.javacv.FFmpegFrameGrabber;
 import org.bytedeco.javacv.Frame;
 import org.bytedeco.javacv.Java2DFrameConverter;
@@ -44,7 +44,7 @@ public class FrameGrabberKit {
      * 获取指定视频的帧并保存为图片至指定目录
      *
      * @param videofile 源视频文件路径
-     * @param framefile 截取帧的图片存放路径 例：F:/hfkjrecorder/target/4.jpg
+     * @param framefile 截取帧的图片存放路径 例：F:\hfkjrecorder\target\4.jpg
      * @throws Exception
      */
     public static void fetchFrame(String videofile, String framefile) throws Exception {
@@ -82,5 +82,4 @@ public class FrameGrabberKit {
         //ff.flush();
         ff.stop();
     }
-
 }

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

+package cn.wisenergy.mapper;
+
+import cn.wisenergy.model.app.CustomerService;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * 专属客服对应表
+ * @author zw
+ */
+public interface CustomerServiceMapper extends BaseMapper<CustomerService> {
+
+    /**
+     * 随机获得一条专属客服记录
+     * @return
+     */
+    CustomerService randService();
+}

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

+package cn.wisenergy.mapper;
+
+import cn.wisenergy.model.app.MonthManure;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * @author 86187
+ */
+public interface MonthManureMapper extends BaseMapper<MonthManure> {
+    /**
+     * 添加月度肥料
+     *
+     * @param monthManure 月度肥料信息
+     * @return 1
+     */
+    int add(MonthManure monthManure);
+
+    /**
+     * 编辑月度肥料
+     *
+     * @param monthManure 月度肥料信息
+     * @return 1
+     */
+    int edit(MonthManure monthManure);
+
+    /**
+     * 通过年月获取月度肥料剩余奖金信息
+     *
+     * @param yearMonth 年月
+     * @return 月度肥料剩余奖金信息
+     */
+    MonthManure queryByTime(@Param("yearMonth") String yearMonth);
+}

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

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.math.BigInteger;
 import java.util.List;
 
 
@@ -20,7 +21,7 @@ public interface ShopZxMapper extends BaseMapper<shopZx> {
      * @param
      * @return 1
      */
-    int zxadd(@Param("zxUrl") String zxUrl,@Param("userId") String userId,@Param("zxName") String zxName,@Param("zxField") String zxField,@Param("imgUrl") String imgUrl,@Param("zxAddress") String zxAddress);
+    int zxadd(@Param("zxUrl") String zxUrl,@Param("zxField") String zxField,@Param("zxAddress") String zxAddress,@Param("inviteCode") String inviteCode,@Param("zxDate") Long zxDate);
 
     /**
      * 查询资讯数据

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

@@ -81,4 +81,29 @@ public interface TradeRecordMapper extends BaseMapper<TradeRecord> {
      */
     Double queryMonthAward(@Param("userId") String userId, @Param("yearMonth") Date yearMonth);
 
+    /**
+     * 获取本月新增奖金（月度肥料）
+     *
+     * @param yearMonth 时间
+     * @return 本月新增奖金
+     */
+    Double queryMonthGrow(@Param("yearMonth") Date yearMonth);
+
+    /**
+     * 获取历史累计奖金 -时间小于yearMonth （月度肥料）
+     *
+     * @param yearMonth 时间
+     * @return 本月新增奖金
+     */
+    Double queryAllAward(@Param("yearMonth") Date yearMonth);
+
+    /**
+     * 获取用户等级 月奖金---时间小于yearMonth （月度肥料）
+     *
+     * @param userLevel 用户等级
+     * @param yearMonth 时间
+     * @return 用户等级 月奖金
+     */
+    Double queryByUserLevel(@Param("userLevel") Integer userLevel, @Param("yearMonth") Date yearMonth);
+
 }

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

@@ -107,7 +107,6 @@ public interface UsersMapper extends BaseMapper<User> {
 
     User edit1(int userLevel, String intiveCode,String userId);
 
-    Integer edit2(User user);
     Integer getuserIdById(@Param("userId")String userId);
     Integer BYQMById(@Param("userId")String userId);
     /**

wisenergy-mapper/src/main/resources/mapper/CustomerServiceMapper.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.CustomerServiceMapper">
+    <resultMap id="bankMap" type="cn.wisenergy.model.app.CustomerService">
+        <id column="id" property="id"/>
+        <result column="wechat_id" property="wechatId"/>
+        <result column="wechat_img_url" property="wechatImgUrl"/>
+        <result column="create_time" property="createTime"/>
+        <result column="update_time" property="updateTime"/>
+    </resultMap>
+
+    <sql id="table">
+        customer_service
+    </sql>
+
+    <sql id="cols_all">
+        id,
+        <include refid="cols_exclude_id"/>
+    </sql>
+
+    <sql id="cols_exclude_id">
+        wechat_id,wechat_img_url,create_time,update_time
+    </sql>
+
+    <sql id="vals">
+        #{wechatId},#{wechatImgUrl},now(),now()
+    </sql>
+
+    <sql id="updateCondition">
+        <if test="wechatId != null">service_id = #{wechatId},</if>
+        <if test="wechatImgUrl != null">wechat_img_url = #{wechatImgUrl},</if>
+        update_time =now()
+    </sql>
+
+    <sql id="criteria">
+        <if test="id != null">id = #{id}</if>
+        <if test="wechatId != null">and service_id = #{wechatId}</if>
+        <if test="wechatImgUrl != null">and wechat_img_url = #{wechatImgUrl}</if>
+        <if test="createTime != null">and create_time &gt;= #{createTime}</if>
+        <if test="updateTime != null">and #{updateTime} &gt;= update_time</if>
+    </sql>
+
+    <select id="randService" resultType="cn.wisenergy.model.app.CustomerService">
+        select
+        <include refid="cols_all"/>
+        from
+        <include refid="table"/>
+        order by rand() limit 1
+    </select>
+
+</mapper>
\ No newline at end of file

wisenergy-mapper/src/main/resources/mapper/MonthManureMapper.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.MonthManureMapper">
+    <resultMap id="monthMap" type="cn.wisenergy.model.app.MonthManure">
+        <id column="id" property="id"/>
+        <result column="year_month" property="yearMonth"/>
+        <result column="manure_award" property="manureAward"/>
+        <result column="create_time" property="createTime"/>
+        <result column="update_time" property="updateTime"/>
+    </resultMap>
+
+    <sql id="table">
+        month_manure
+    </sql>
+
+    <sql id="cols_all">
+        id,
+        <include refid="cols_exclude_id"/>
+    </sql>
+
+    <sql id="cols_exclude_id">
+        year_month,manure_award,create_time,update_time
+    </sql>
+
+    <sql id="vals">
+        #{yearMonth},#{manureAward},now(),now()
+    </sql>
+
+    <sql id="updateCondition">
+        <if test="yearMonth != null">year_month =#{yearMonth},</if>
+        <if test="manureAward != null">manure_award = #{manureAward},</if>
+        update_time =now()
+    </sql>
+
+    <sql id="criteria">
+        <if test="id != null">id = #{id}</if>
+        <if test="yearMonth != null">and year_month =#{yearMonth}</if>
+        <if test="manureAward != null">and manure_award = #{manureAward}</if>
+        <if test="createTime != null">and create_time &gt;= #{createTime}</if>
+        <if test="updateTime != null">and #{updateTime} &gt;= update_time</if>
+    </sql>
+
+    <insert id="add" parameterType="cn.wisenergy.model.app.MonthManure" keyProperty="id" useGeneratedKeys="true">
+        insert into
+        <include refid="table"/>
+        (<include refid="cols_exclude_id"/>)
+        value(
+        <include refid="vals"/>
+        )
+    </insert>
+
+    <update id="edit" parameterType="cn.wisenergy.model.app.MonthManure">
+        UPDATE
+        <include refid="table"/>
+        <set>
+            <include refid="updateCondition"/>
+        </set>
+        <where>
+            id = #{id}
+        </where>
+    </update>
+
+    <select id="queryByTime" resultType="cn.wisenergy.model.app.MonthManure">
+        SELECT
+        <include refid="cols_all"/>
+        FROM
+        <include refid="table"/>
+        <where>
+            <if test="yearMonth != null and yearMonth != ''">
+                year_month=#{yearMonth}
+            </if>
+        </where>
+    </select>
+
+
+</mapper>
\ No newline at end of file

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

@@ -2,31 +2,30 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
     <mapper namespace="cn.wisenergy.mapper.ShopZxMapper">
     <resultMap id="zxMap" type="cn.wisenergy.model.app.shopZx">
-        <id column="zxid" property="zxid"/>
-        <result column="zxUrl" property="zxUrl"/>
-        <result column="zxLikes" property="zxLikes"/>
-        <result column="userid" property="userid"/>
-        <result column="zxName" property="zxName"/>
-        <result column="zxShenHe" property="zxShenHe"/>
-        <result column="zxField" property="zxField"/>
-        <result column="zxAddress" property="zxAddress"/>
-        <result column="imgUrl" property="imgUrl"/>
+        <id column="zx_id" property="zxid"/>
+        <result column="zx_url" property="zxUrl"/>
+        <result column="zx_likes" property="zxLikes"/>
+        <result column="invite_code" property="inviteCode"/>
+        <result column="zx_to_examine" property="zxToExamine"/>
+        <result column="zx_field" property="zxField"/>
+        <result column="zx_address" property="zxAddress"/>
+        <result column="zx_date" property="zxDate"/>
     </resultMap>
     <sql id="table">
         shop_zx
     </sql>
 
     <sql id="cols_all">
-        zxid,
+        zx_id as zxid,
         <include refid="cols_exclude_id"/>
     </sql>
 
     <sql id="cols_exclude_id">
-        zxUrl,userId,zxName,zxField,imgUrl,zxAddress
+        zx_url,zx_field,zx_address,invite_code,zx_date
     </sql>
 
     <sql id="vals">
-        #{zxUrl},#{userId},#{zxName},#{zxField},#{imgUrl},#{zxAddress}
+        #{zxUrl},#{zxField},#{zxAddress},#{inviteCode},#{zxDate}
     </sql>
     <!--资讯内容插入-->
     <insert id="zxadd" parameterType="cn.wisenergy.model.app.shopZx">
@@ -38,35 +37,25 @@
         )
     </insert>
 
-    <!--资讯内容插入-->
-    <!--<insert id="zxadd" parameterType="cn.wisenergy.model.app.shopZx" >-->
-      <!--INSERT INTO-->
-          <!--(zxUrl, userId,zxName,zxField,imgUrl)-->
-      <!--VALUES(-->
-         <!--#{zxUrl},#{userid},#{zxName},#{zxField},#{imgUrl}-->
-       <!--）-->
-    <!--</insert>-->
-
     <!--资讯内容倒叙查询-->
-    <select id="findAll" parameterType="java.lang.Integer" resultType="cn.wisenergy.model.app.shopZx">
-    select zxid as zxid,zxUrl as zxUrl,
-    zxLikes as zxLikes,userid as userid,zxName as zxName,
-    zxShenHe as zxShenHe,zxField as zxField,zxDate as zxDate,
-    imgUrl as imgUrl,zxAddress as zxAddress from shop_zx order by zxid desc limit #{pageNum},#{pageSize}
+    <select id="selectPage" parameterType="java.lang.Integer" resultType="cn.wisenergy.model.app.shopZx">
+      select
+      b.zx_id as zxid,
+      b.zx_url as zxUrl,
+      b.zx_likes as zxLikes,
+      b.zx_field as zxField,
+      b.zx_date as zxDate,
+      b.zx_address as zxAddress,
+      b.invite_code as inviteCode,
+      a.user_id as userId,
+      a.head_image as headImage
+      from shop_zx b inner join user_info a ON a.invite_code=b.invite_code
+      WHERE zx_to_examine!=0
+      order by zxid desc limit #{pageNum},#{pageSize}
     </select>
 
     <!--资讯总记录数查询-->
     <select id="selectAllNum" parameterType="cn.wisenergy.model.app.shopZx" >
     select count (*) from shop_zx
     </select>
-
-    <select id="selectPage"  resultType="cn.wisenergy.model.app.shopZx">
-        select zxid as zxid,zxUrl as zxUrl,
-    zxLikes as zxLikes,userid as userid,zxName as zxName,
-    zxShenHe as zxShenHe,zxField as zxField,zxDate as zxDate,
-    imgUrl as imgUrl,zxAddress as zxAddress from shop_zx order by zxid desc limit #{pageNum},#{pageSize}
-    </select>
-
-
-
 </mapper>
\ No newline at end of file

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

@@ -141,14 +141,62 @@
         from
         <include refid="table"/>
         <where>
-            (trade_type=2 or status=0)
+            (trade_type=4 or trade_type=7)
+            and status=0
             <if test="userId">
                 and user_id=#{userId}
             </if>
             <if test="yearMonth != null">
                 AND(
-                YEAR(update_time) = YEAR(#{yearMonth})
-                AND MONTH(update_time) = MONTH(#{yearMonth}))
+                YEAR(create_time) = YEAR(#{yearMonth})
+                AND MONTH(create_time) = MONTH(#{yearMonth}))
+            </if>
+        </where>
+    </select>
+
+    <select id="queryMonthGrow" resultType="java.lang.Double">
+        select sum(money)
+        from
+        <include refid="table"/>
+        <where>
+            (trade_type=4 or trade_type=7)
+            and status=0
+            <if test="yearMonth != null">
+                AND(
+                YEAR(create_time) = YEAR(#{yearMonth})
+                AND MONTH(create_time) = MONTH(#{yearMonth}))
+            </if>
+        </where>
+    </select>
+
+    <select id="queryAllAward" resultType="java.lang.Double">
+        select sum(money)
+        from
+        <include refid="table"/>
+        <where>
+            (trade_type=4 or trade_type=7)
+            and status=0
+            <if test="yearMonth != null">
+                and create_time &lt; #{yearMonth}
+            </if>
+        </where>
+    </select>
+
+    <select id="queryByUserLevel" resultType="java.lang.Double">
+        select sum(t.money)
+        from trade_record t,user_info u
+        <where>
+            (t.trade_type=4 or t.trade_type=7)
+            and t.status=0
+            and t.user_id=u.user_id
+            <if test="yearMonth != null">
+                and t.create_time &lt; #{yearMonth}
+                AND(
+                YEAR(t.create_time) = YEAR(#{yearMonth})
+                AND MONTH(t.create_time) = MONTH(#{yearMonth}))
+            </if>
+            <if test="userLevel != null">
+                and u.user_level=#{userLevel}
             </if>
         </where>
     </select>

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

@@ -28,7 +28,7 @@
     </sql>
 
     <sql id="cols_exclude_id">
-        user_id,password, head_image,user_level,cross_border_line,id_card_number,fans_nickname,fans_id, invite_code,
+        user_id,password,head_image,user_level,cross_border_line,id_card_number,fans_nickname,fans_id, invite_code,
         be_invited_code,create_time,update_time
     </sql>
 
@@ -100,11 +100,13 @@
         from
         <include refid="table"/>
         <where>
+            be_invited_code=1
            <if test="createTime != null">
-               YEAR(create_time) = YEAR(#{createTime})
-               AND MONTH(create_time) = MONTH(#{createTime})
+              and(YEAR(create_time) = YEAR(#{createTime})
+               AND MONTH(create_time) = MONTH(#{createTime}))
            </if>
         </where>
+        order by create_time desc
     </select>
 
     <select id="getByUserId" resultType="cn.wisenergy.model.app.User">
@@ -237,6 +239,7 @@
         select id as id,
         user_id as userId,
         password as password,
+        userName as userName,
         user_level as userLevel,
         cross_border_line as crossBorderLine,
         id_card_number as idCardNumber,
@@ -308,17 +311,5 @@
         </where>
     </select>
 
-    <update id="updateByUserid">
-        update
-        <include refid="table"/>
-        set
-        (user_level,invite_code,)
-        value
-        (#{userLevel},#{inviteCode})
-        <where>
-            user_id=#{userId}
-        </where>
-    </update>
-
 
 </mapper>

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

+package cn.wisenergy.model.app;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 专属客服实体类
+ */
+@Data
+@ApiModel(value = "customerService")
+public class CustomerService implements Serializable {
+    private static final long serialVersionUID = 4893386302084721578L;
+
+    /**
+     * 主键id
+     */
+    @ApiModelProperty(name = "id", value = "主键id")
+    private int id;
+
+    /**wechatImgUrl
+     * 专属客服id（微信号）
+     */
+    @ApiModelProperty(name = "wechatId", value = "专属客服id（微信号）")
+    private String wechatId;
+
+    /**
+     * 专属客服微信二维码图片地址
+     */
+    @ApiModelProperty(name = "wechatImgUrl", value = "专属客服id（微信号）")
+    private String wechatImgUrl;
+
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty(name = "createTime", value = "创建时间")
+    private Date createTime;
+
+    /**
+     * 修改时间
+     */
+    @ApiModelProperty(name = "updateTime", value = "修改时间")
+    private Date updateTime;
+}

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

@@ -29,50 +29,50 @@ public class MonthAward implements Serializable {
      * 与上一次比较的增长奖金
      */
     @ApiModelProperty(name = "growthAward", value = "与上一次比较的增长额度")
-    private BigDecimal growthAward;
+    private Double growthAward;
 
     /**
      * 历史奖金总额
      */
     @ApiModelProperty(value = "历史奖金总额",name="awardTotal")
-    private BigDecimal awardTotal;
+    private Double awardTotal;
 
     /**
      * 本月累计奖金总额（本月新增+上月没有分出去的月度肥料奖金）
      */
     @ApiModelProperty(value = "本月累计奖金总额",name="monthAwardTotal")
-    private BigDecimal monthAwardTotal;
+    private Double monthAwardTotal;
 
     /**
      * 本月新增
      */
     @ApiModelProperty(value = "本月新增",name="monthIncreased")
-    private BigDecimal monthIncreased;
+    private Double monthIncreased;
 
     /**
      * 黄金树月奖励总额
      */
     @ApiModelProperty(value = "黄金树月奖励总额",name="goldAward")
-    private BigDecimal goldAward;
+    private Double goldAward;
 
 
     /**
      * 农场主月奖励总额
      */
     @ApiModelProperty(value = "农场主月奖励总额",name="farmerAward")
-    private BigDecimal farmerAward;
+    private Double farmerAward;
 
     /**
      * 森林之星月奖励总额
      */
     @ApiModelProperty(value = "森林之星月奖励总额",name="forestStartAward")
-    private BigDecimal forestStartAward;
+    private Double forestStartAward;
 
     /**
      * 森田合伙人月奖励总额
      */
     @ApiModelProperty(value = "森田合伙人月奖励总额",name="partnerAward")
-    private BigDecimal partnerAward;
+    private Double partnerAward;
 
 
     private Date createTime;

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

+package cn.wisenergy.model.app;
+
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+*@ Description: 月度肥料实体类
+*@ Author     : 86187
+*@ Date       : 2021/3/10 10:05
+ * @author 86187
+ */
+@Data
+public class MonthManure {
+    /**
+     * 主键id
+     */
+    private Integer id;
+
+    /**
+     * 年月
+     */
+    private String yearMonth;
+
+    /**
+     * 月度肥料余额
+     */
+    private Double manureAward;
+
+    private Date createTime;
+
+    private Date updateTime;
+}

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

@@ -32,9 +32,9 @@ public class TradeRecord implements Serializable {
     private String userId;
 
     /**
-     * 交易记录类型 1：提现 2：订单返佣 3：订单下单 4：月度肥料 5：培育奖 6：工资奖励
+     * 交易记录类型 1：提现 2：订单返佣 3：订单下单 4：月度肥料 5：培育奖 6：工资奖励  7:进步奖
      */
-    @ApiModelProperty(name = "tradeType", value = "交易类型 1：提现 2：订单返佣 3：订单下单 4：月度肥料 5：培育奖 6：工资")
+    @ApiModelProperty(name = "tradeType", value = "交易类型 1：提现 2：订单返佣 3：订单下单 4：月度肥料 5：培育奖 6：工资 7:进步奖")
     private Integer tradeType;
 
     /**

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

@@ -28,6 +28,7 @@ public class User extends Model<User> implements Serializable{
     @ApiModelProperty(name = "id", value = "用户主键id")
     private Integer id;
 
+
     /**
      * 手机号作为用户账号
      */

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

@@ -44,6 +44,11 @@ public class UsersDto extends User implements Serializable {
      */
     private String beInvitedCode;
 
+    /**
+     * 用户名称
+     */
+    private Integer userName;
+
     /**
      * 创建时间
      */

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

@@ -9,6 +9,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.math.BigInteger;
 import java.util.Date;
 import java.util.List;
 
@@ -27,95 +28,49 @@ public class shopZx extends Model<shopZx> implements Serializable {
     /**
      * 资讯主键id
      */
-    @ApiModelProperty(name = "zxid", value = "资讯主键id")
+    @ApiModelProperty(name = "zx_id", value = "资讯主键id")
     private Integer zxid;
-
     /**
      * 视频存放地址
      */
-    @ApiModelProperty(name = "zxUrl", value = "视频/图片存放地址")
+    @ApiModelProperty(name = "zx_url", value = "视频/图片存放地址")
     private String zxUrl;
-
     /**
-     * 用户id(作者id
+     * 用户本人邀请码
      */
-    @ApiModelProperty(name = "userid", value = "用户id(作者id)")
-    private String userid;
-
+    @ApiModelProperty(name = "invite_code", value = "用户本人邀请码")
+    private String inviteCode;
     /**
      * 获赞数
      */
-    @ApiModelProperty(name = "zxLikes", value = "获赞数")
+    @ApiModelProperty(name = "zx_likes", value = "获赞数")
     private Integer zxLikes;
 
-    /**
-     * 视频/图片名称
-     */
-    @ApiModelProperty(name = "zxName", value = "视频/图片名称")
-    private String zxName;
-
     /**
      * 审核字段
      */
-    @ApiModelProperty(name = "zxShenHe", value = "审核字段")
-    private Integer zxShenHe;
-
+    @ApiModelProperty(name = "zx_to_examine", value = "审核字段")
+    private Integer zxToExamine;
     /**
      * 资讯文字输入字段
      */
-    @ApiModelProperty(name = "zxField", value = "资讯文字输入字段")
+    @ApiModelProperty(name = "zx_field", value = "资讯文字输入字段")
     private String zxField;
-
     /**
-     * 资讯数据创建时间
+     * 用户发布地址
      */
-    @ApiModelProperty(name = "zxDate", value = "资讯数据创建时间")
-    private Date zxDate;
-
+    @ApiModelProperty(name = "zx_address", value = "用户发布地址")
+    private String zxAddress;
     /**
-     * 图片存放地址imgUrl,zxAddress,zxField,zxName,userid,zxUrl
+     * 资讯数据创建时间
      */
-    @ApiModelProperty(name = "imgUrl", value = "图片存放地址")
-    private String imgUrl;
+    @ApiModelProperty(name = "zx_date", value = "资讯数据创建时间")
+    private Long zxDate;
+
 
-    /**
-     * 用户发布地址
-     */
-    @ApiModelProperty(name = "zxAddress", value = "用户发布地址")
-    private String zxAddress;
 
     @TableField(exist = false)
     private List<String> askImgList;
 
-//    /**
-//     * 资讯文件名称
-//     */
-//    @ApiModelProperty(name = "fileName", value = "资讯文件名称")
-//    private String fileName;
-//
-//    /**
-//     * 资讯文件地址
-//     */
-//    @ApiModelProperty(name = "fileDownloadUri", value = "资讯文件地址")
-//    private String fileDownloadUri;
-//
-//    /**
-//     * 资讯文件类型
-//     */
-//    @ApiModelProperty(name = "fileType", value = "资讯文件类型")
-//    private String fileType;
-//
-//    /**
-//     * 资讯文件名称
-//     */
-//    @ApiModelProperty(name = "size", value = "资讯文件大小")
-//    private long size;
-//
-//    public shopZx(String fileName, String fileDownloadUri, String fileType, long size) {
-//        this.fileName = fileName;
-//        this.fileDownloadUri = fileDownloadUri;
-//        this.fileType = fileType;
-//        this.size = size;
-//    }
 
 }

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

@@ -21,50 +21,50 @@ public class MonthAwardVo {
      * 与上一次比较的增长奖金
      */
     @ApiModelProperty(name = "growthAward", value = "与上一次比较的增长额度")
-    private BigDecimal growthAward;
+    private Double growthAward;
 
     /**
      * 历史奖金总额
      */
     @ApiModelProperty(value = "历史奖金总额",name="awardTotal")
-    private BigDecimal awardTotal;
+    private Double awardTotal;
 
     /**
      * 本月累计奖金总额（本月新增+上月没有分出去的月度肥料奖金）
      */
     @ApiModelProperty(value = "本月累计奖金总额",name="monthAwardTotal")
-    private BigDecimal monthAwardTotal;
+    private Double monthAwardTotal;
 
     /**
      * 本月新增
      */
     @ApiModelProperty(value = "本月新增",name="monthIncreased")
-    private BigDecimal monthIncreased;
+    private Double monthIncreased;
 
     /**
      * 黄金树月奖励总额
      */
     @ApiModelProperty(value = "黄金树月奖励总额",name="goldAward")
-    private BigDecimal goldAward;
+    private Double goldAward;
 
 
     /**
      * 农场主月奖励总额
      */
     @ApiModelProperty(value = "农场主月奖励总额",name="farmerAward")
-    private BigDecimal farmerAward;
+    private Double farmerAward;
 
     /**
      * 森林之星月奖励总额
      */
     @ApiModelProperty(value = "森林之星月奖励总额",name="forestStartAward")
-    private BigDecimal forestStartAward;
+    private Double forestStartAward;
 
     /**
      * 森田合伙人月奖励总额
      */
     @ApiModelProperty(value = "森田合伙人月奖励总额",name="partnerAward")
-    private BigDecimal partnerAward;
+    private Double partnerAward;
 
     /**
      * 用户-份额

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

@@ -16,6 +16,12 @@ public class UserAndRecommendVo {
     @ApiModelProperty(value = "用户id", name = "userId")
     private String userId;
 
+    /**
+     * 当月消费金额
+     */
+    @ApiModelProperty(value = "用户头像", name = "headImage")
+    private String headImage;
+
     /**
      * 当月消费金额
      */

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

@@ -14,7 +14,7 @@ import java.util.List;
 public interface AccountService {
 
     /**
-     * 订单返佣
+     * 订单返佣-日任务
      * @return true or false
      */
     R<Boolean> orderRebate();
@@ -45,7 +45,7 @@ public interface AccountService {
 
 
     /**
-     * 进步奖收益统计（最大进步奖）
+     * 进步奖收益统计（最大进步奖） -日任务
      *
      * @return true or false
      */

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

+package cn.wisenergy.service.app;
+
+import cn.wisenergy.common.utils.R;
+import cn.wisenergy.model.app.CustomerService;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.servlet.http.HttpServletRequest;
+import java.io.IOException;
+import java.util.Map;
+
+public interface CustomerServiceService {
+    CustomerService getServiceByRand();
+
+    void setWeChatQRImg(String wechatId, String file);
+
+    /**
+     * 专属客服二维码图片上传
+     * @param file
+     * @param request
+     * @param wechatId
+     * @return
+     */
+    R uploadImage(MultipartFile file, HttpServletRequest request, String wechatId) throws IOException;
+}

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

+package cn.wisenergy.service.app;
+/**
+*@ Description: 月定时任务接口定义
+*@ Author     : 86187
+*@ Date       : 2021/3/10 10:22
+ * @author 86187
+ */
+public interface MonthTaskService {
+}

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

@@ -4,5 +4,10 @@ package cn.wisenergy.service.app;
  * @author 86187
  */
 public interface TradeRecordService {
-
+    /**
+     * 月度奖金统计- 数据写入月度奖金实体类
+     *
+     * @return true or false
+     */
+    Boolean monthAwardCount();
 }

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

@@ -6,6 +6,7 @@ import org.springframework.core.io.Resource;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
+import java.math.BigInteger;
 import java.util.List;
 import java.util.Map;
 
@@ -20,31 +21,24 @@ public interface UploadService {
      * @param request
      * @return
      */
-     Map<String, Object> uploadVideo(MultipartFile file,HttpServletRequest request,String userId,String zxField,String zxAddress) throws Exception;
+     Map<String, Object> uploadVideo(MultipartFile file,HttpServletRequest request,String zxField,String zxAddress,String inviteCode) throws Exception;
 
     /**
      * TODO 图片文件上传
      * @param request
-     * @param userId
      * @param zxField
      * @param zxAddress
      * @return
      */
-     Map<String, Object> uploadImage(MultipartFile file, HttpServletRequest request, String userId, String zxField, String zxAddress) throws Exception;
+     Map<String, Object> uploadImage(MultipartFile file, HttpServletRequest request, String zxField, String zxAddress,String inviteCode) throws Exception;
 
-    /**
-     * TODO 项目目录下的图片文件上传
-     * @param request
-     * @return
-     */
-     Map<String, Object> getImageUrl(HttpServletRequest request) throws Exception;
 
     /**
      * TODO 多文件上传
      * @param file
      * @return
      */
-     List imageUpload( MultipartFile[] file,String userId, String zxField, String zxAddress);
+     List imageUpload( MultipartFile[] file, String zxField, String zxAddress,String inviteCode);
      String storeFile(MultipartFile file);
      Resource loadFileAsResource(String fileName);
 

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

@@ -57,7 +57,19 @@ public interface UserService {
      */
     R<AerialDeliveryVo> queryAerialDelivery();
 
+    /**
+     * 设置用户头像
+     * @param userId 用户id
+     * @param headImage 头像图片地址
+     * @return true or false
+     */
     R<Boolean> setHeadImage(String userId, String headImage);
 
+    /**
+     * 设置页面 -邀请码填写
+     * @param userId 用户id
+     * @param inviteCode 邀请人邀请码
+     * @return true or false
+     */
     R<Boolean> fillInInviteCode(String userId, String inviteCode);
 }

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

+package cn.wisenergy.service.app.impl;
+
+import cn.wisenergy.common.utils.R;
+import cn.wisenergy.mapper.CustomerServiceMapper;
+import cn.wisenergy.model.app.CustomerService;
+import cn.wisenergy.service.app.CustomerServiceService;
+import lombok.extern.slf4j.Slf4j;
+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 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
+public class CustomerServiceServiceImpl implements CustomerServiceService {
+
+    @Autowired
+    private CustomerServiceMapper customerServiceMapper;
+
+    @Value("${uploadFile.location}")
+    private String uploadQRImagesLocation;
+
+    @Override
+    public CustomerService getServiceByRand(){
+        return customerServiceMapper.randService();
+    }
+
+    @Override
+    public void setWeChatQRImg(String wechatId, String wechatImgUrl) {
+        CustomerService customerService = new CustomerService();
+        customerService.setWechatId(wechatId);
+        customerService.setWechatImgUrl(wechatImgUrl);
+        customerService.setCreateTime(new Date());
+        customerService.setUpdateTime(new Date());
+        customerServiceMapper.insert(customerService);
+    }
+    /**
+     *  专属客服二维码图片文件上传
+     */
+    @Override
+    public R uploadImage(MultipartFile file, HttpServletRequest request, String wechatId) throws IOException {
+
+        String basePath = request.getScheme() + "://" + request.getServerName()
+                + ":" + request.getServerPort();
+
+        Long time = System.currentTimeMillis();
+
+        String originalFilename = file.getOriginalFilename();//文件原始名称
+        String suffixName = originalFilename.substring(originalFilename.lastIndexOf("."));//从最后一个.开始截取。截取zxName的后缀名
+        String newName = time+suffixName; //文件新名称
+        //设置文件存储路径，可以存放在你想要指定的路径里面
+        String rootPath="/opt/upload/video/"; //上传图片存放位置
+        String filePath = rootPath + newName;
+        File newFile = new File(filePath);
+        //判断目标文件所在目录是否存在
+        if(!newFile.getParentFile().exists()){
+            //如果目标文件所在的目录不存在，则创建父目录
+            newFile.getParentFile().mkdirs();
+        }
+        //将内存中的数据写入磁盘
+        file.transferTo(newFile);
+
+        //入库地址
+        String serviceUrl = basePath + "/upload/" + newName;
+        CustomerService customerService = new CustomerService();
+        customerService.setWechatId(wechatId);
+        customerService.setWechatImgUrl(serviceUrl);
+        customerServiceMapper.insert(customerService);
+        return R.ok("上传成功");
+    }
+}

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

+package cn.wisenergy.service.app.impl;
+
+import cn.wisenergy.service.app.MonthTaskService;
+
+/**
+ * @author 86187
+ */
+public class MonthTaskServiceImpl implements MonthTaskService {
+}

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

@@ -37,6 +37,13 @@ public class RecommendUserServiceImpl implements RecommendUserService {
         return recommendUserMapper.getByUserId(userId);
     }
 
+    /**
+     * 获取我的直推用户信息表
+     * @param userId
+     * @param userLevel
+     * @return
+     */
+    @Override
     public List<UserAndRecommendVo> getMyRecommendInfo(String userId, Integer userLevel){
 
         //当前用户的邀请码
@@ -46,6 +53,7 @@ public class RecommendUserServiceImpl implements RecommendUserService {
         List<UserAndRecommendVo> userAndRecommendVos = new ArrayList<>();
         for (User user : byInviteCode) {
             UserAndRecommendVo userAndRecommendVo = new UserAndRecommendVo();
+            userAndRecommendVo.setHeadImage(user.getHeadImage());
             userAndRecommendVo.setUserId(user.getUserId());
             userAndRecommendVo.setMonthyCount(recommendUserMapper.getByUserId(userId).getMonthyCount());
             userAndRecommendVo.setHistoryCount(recommendUserMapper.getByUserId(userId).getHistoryCount());

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

 package cn.wisenergy.service.app.impl;
 
+import cn.wisenergy.common.utils.DateUtil;
+import cn.wisenergy.mapper.MonthAwardMapper;
+import cn.wisenergy.mapper.MonthManureMapper;
 import cn.wisenergy.mapper.TradeRecordMapper;
+import cn.wisenergy.model.app.MonthAward;
+import cn.wisenergy.model.app.MonthManure;
 import cn.wisenergy.model.app.TradeRecord;
+import cn.wisenergy.model.enums.UserLevelEnum;
 import cn.wisenergy.service.app.TradeRecordService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.Date;
+
 /**
  * @author 86187
  */
 @Service
 @Slf4j
 public class TradeRecordServiceImpl extends ServiceImpl<TradeRecordMapper, TradeRecord> implements TradeRecordService {
+    @Autowired
+    private MonthManureMapper monthManureMapper;
+
+    @Autowired
+    private MonthAwardMapper monthAwardMapper;
+
+    @Override
+    public Boolean monthAwardCount() {
+        MonthAward result = new MonthAward();
+        //1、获取本月新增奖金
+        Double monthGrow = baseMapper.queryMonthGrow(new Date());
+        result.setMonthIncreased(monthGrow);
+
+        //2、获取历史奖金金额
+        Double awardTotal = baseMapper.queryAllAward(new Date());
+        result.setAwardTotal(awardTotal);
+
+        //3、本月累计奖金 =本月新增奖金+上月剩余月度肥料奖金
+        //获取上月剩余月度肥料奖金
+        Double monthAwardTotal;
+        Date date = DateUtil.getLastMonth(new Date());
+        String yearMonth = DateUtil.convertDateToStr(date, "yyyy-MM");
+        MonthManure monthManure = monthManureMapper.queryByTime(yearMonth);
+        if (null == monthManure) {
+            monthAwardTotal = monthGrow;
+        } else {
+            monthAwardTotal = monthGrow + monthManure.getManureAward();
+        }
+        result.setMonthAwardTotal(monthAwardTotal);
+
+        //4、较上月增长奖金  本月累计奖金-上月累计奖金
+        //获取上月 累计奖金
+        Double growthAward;
+        MonthAward monthAward = monthAwardMapper.getByTime(date);
+        if (null == monthAward) {
+            growthAward = monthAwardTotal;
+        } else {
+            growthAward = monthAwardTotal - monthAward.getMonthAwardTotal();
+        }
+        result.setGrowthAward(growthAward);
+
+        //5、获取黄金树本月奖金
+        Double goldAward = baseMapper.queryByUserLevel(UserLevelEnum.GOLD_TREE.getCode(), new Date());
+        result.setGoldAward(goldAward);
+
+        //6、获取农场主本月奖金
+        Double farmerAward = baseMapper.queryByUserLevel(UserLevelEnum.FARMER.getCode(), new Date());
+        result.setFarmerAward(farmerAward);
+
+        //7、森林之星月奖金
+        Double startAward = baseMapper.queryByUserLevel(UserLevelEnum.FOREST_START.getCode(), new Date());
+        result.setForestStartAward(startAward);
+
+        //8、森田合伙人月奖金
+        Double partnerAward = baseMapper.queryByUserLevel(UserLevelEnum.PARTNER.getCode(), new Date());
+        result.setPartnerAward(partnerAward);
 
+        //9、 判断是否有本月奖金这条数据，没有，新增，有更新值
+        MonthAward currentMonth = monthAwardMapper.getByTime(new Date());
+        if (null == currentMonth) {
+            int count = monthAwardMapper.add(result);
+            return count != 0;
+        } else {
+            int count = monthAwardMapper.edit(result);
+            return count != 0;
+        }
+    }
 }

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

@@ -4,8 +4,6 @@ import cn.wisenergy.common.utils.*;
 
 import cn.wisenergy.model.app.shopZx;
 import com.alibaba.fastjson.JSON;
-import org.apache.commons.io.FilenameUtils;
-import org.apache.ibatis.jdbc.Null;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.core.io.Resource;
 import org.springframework.core.io.UrlResource;
@@ -21,16 +19,12 @@ import java.nio.file.Paths;
 import java.nio.file.StandardCopyOption;
 import cn.wisenergy.service.app.UploadService;
 import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.InputStream;
 import java.util.*;
 import javax.servlet.http.HttpServletRequest;
 import cn.wisenergy.mapper.ShopZxMapper;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.ClassUtils;
 
 
 /**
@@ -51,12 +45,13 @@ public class UploadServiceImpl implements UploadService {
      * 视频文件上传
      */
     @Override
-    public Map<String, Object> uploadVideo(MultipartFile file,HttpServletRequest request,String userId,String zxField, String zxAddress) throws Exception {
+    public Map<String, Object> uploadVideo(MultipartFile file,HttpServletRequest request,String zxField,String zxAddress,String inviteCode) throws Exception {
         Map<String, Object> resultMap=new HashMap<String, Object>();
-
+        /**
+         * http://路径
+         */
         String basePath = request.getScheme() + "://" + request.getServerName()
-                + ":" + request.getServerPort()+"/upload/video/";
-
+                + ":" + request.getServerPort()+"/upload/";
         Long time = new Date().getTime();
 
         String fileName = file.getOriginalFilename();//文件原始名称
@@ -87,8 +82,14 @@ public class UploadServiceImpl implements UploadService {
 
         resultMap.put("videoUrl", videoUrl);
         resultMap.put("imgUrl", imgUrl);
-        resultMap.put("returnCode", 200);
+        resultMap.put("returnCode", 0);
+        String zxUrl=videoUrl;
         //System.out.println("上传的文件名为："+fileName+",后缀名为："+newFileName);
+        /**
+         * 生成当前时间戳
+         */
+        Long zxDate= System.currentTimeMillis();
+        shopZxMapper.zxadd(zxUrl,zxField,zxAddress,inviteCode, zxDate);
         return resultMap;
     }
 
@@ -96,9 +97,14 @@ public class UploadServiceImpl implements UploadService {
          * 图片文件上传
          */
         @Override
-        public Map<String, Object> uploadImage(MultipartFile file, HttpServletRequest request,String userId,String zxField, String zxAddress) throws Exception {
+        public Map<String, Object> uploadImage(MultipartFile file, HttpServletRequest request,String zxField, String zxAddress,String inviteCode) throws Exception {
             Map<String, Object> resultMap=new HashMap<String, Object>();
 
+            /**
+             * 生成当前时间戳
+             */
+            Long zxDate= Long.valueOf(System.currentTimeMillis());
+
             String basePath = request.getScheme() + "://" + request.getServerName()
                     + ":" + request.getServerPort()+"/mimi/upload/images/";
 
@@ -108,7 +114,7 @@ public class UploadServiceImpl implements UploadService {
             String suffixName = zxName.substring(zxName.lastIndexOf("."));//从最后一个.开始截取。截取zxName的后缀名
             String newzxName = time+suffixName; //文件新名称
             //设置文件存储路径，可以存放在你想要指定的路径里面
-            String rootPath="D:/mimi/"+File.separator+"upload/images/"; //上传图片存放位置
+            String rootPath="/opt/upload/video/"; //上传图片存放位置
 
             String filePath = rootPath+newzxName;
             File newFile = new File(filePath);
@@ -121,77 +127,25 @@ public class UploadServiceImpl implements UploadService {
             //将内存中的数据写入磁盘
             file.transferTo(newFile);
             //图片上传保存url
-            String imgUrl = basePath + newzxName;
+            String zxUrl = basePath + newzxName;
 
-            resultMap.put("imgUrl", imgUrl);
+            resultMap.put("zxUrl", zxUrl);
             resultMap.put("returnCode", 0);
-            String zxUrl=null;
-            shopZxMapper.zxadd(zxUrl,userId,zxName,zxField,imgUrl,zxAddress);
+            shopZxMapper.zxadd(zxUrl,zxField,zxAddress,inviteCode, zxDate);
             return resultMap;
         }
 
-        /**
-         * 项目目录下的图片文件上传
-         */
     @Override
-        public Map<String, Object> getImageUrl(HttpServletRequest request) throws Exception {
-            Map<String,Object> result = new HashMap<String,Object>();
-            //获取图片在项目路径下的地址
-            String basePath= ClassUtils.getDefaultClassLoader().getResource("").getPath();
-            String oldPath=basePath+"/static/images/animate.png";
+    public List imageUpload(MultipartFile[] files, String zxField, String zxAddress,String inviteCode) {
 
-            Long res =System.currentTimeMillis();
-            //设置文件存储路径，可以存放在你想要指定的路径里面
-            String rootPath="D:/mimi/"+File.separator+"upload/images/";
-            // 新文件名
-            String newzxName =res + oldPath.substring(oldPath.lastIndexOf("."));
-            //新文件
-            File newFile=new File(rootPath+File.separator+newzxName);
-            //判断文件目录是否存在
-            if(!newFile.getParentFile().exists()){
-                //如果目标文件所在的目录不存在，则创建父目录
-                newFile.getParentFile().mkdirs();
-            }
-
-            //-------把图片文件写入磁盘 start ----------------
-            FileOutputStream fos = new FileOutputStream(newFile);
-            //读取本地文件
-            File localFile = new File(oldPath);
-            //获取本地文件输入流
-            InputStream stream=new FileInputStream(localFile);
-            //写入目标文件
-            byte[] buffer=new byte[1024*1024];
-            int byteRead=0;
-            //stream.read(buffer) 每次读到的数据存放在 buffer 数组中
-            while((byteRead=stream.read(buffer))!=-1){
-                //在 buffer 数组中 取出数据 写到 （输出流）磁盘上
-                fos.write(buffer, 0, byteRead);
-                fos.flush();
-            }
-            fos.close();
-            stream.close();
-            //-------把图片文件写入磁盘 end ----------------
-
-            //服务器图片地址
-            String baseURL = request.getScheme() + "://" + request.getServerName()
-                    + ":" + request.getServerPort()+"/mimi/upload/images/";
-            String imgUrl=baseURL+newzxName;
-
-            result.put("imgUrl", imgUrl);
-            result.put("returnCode", 0);
-            return result;
-        }
-        //, String userId, String zxField, String zxAddress
-
-    @Override
-    public List imageUpload(MultipartFile[] files,String userId, String zxField, String zxAddress) {
+        /**
+         * 生成当前时间戳
+         */
+        Long zxDate= Long.valueOf(System.currentTimeMillis());
         //获取上传图片数量，打印在控制台
         System.out.println("上传图片数量" + files.length);
         //创建集合
         List<Map<String, Object>> root = new ArrayList<Map<String, Object>>();
-
-        String imgUrl = "";
-        String zxName=null;
         String fileName=null;
         String zxUrl=null;
         // 要上传的目标文件存放的绝对路径
@@ -218,16 +172,14 @@ public class UploadServiceImpl implements UploadService {
                 //重新生成文件名
                 fileName = UUID.randomUUID() + suffixName;
 
-                zxUrl="";
-                zxName += fileName+",";
-                imgUrl+=localPath+fileName+",";
+                zxUrl+=localPath+fileName+",";
                // shopZxMapper.zxadd(zxUrl,userId,zxName,zxField,imgUrl,zxAddress);
                 if (FileUtils.upload(file, localPath, fileName)) {
                     //文件存放的相对路径(一般存放在数据库用于img标签的src)
                     String relativePath = "img/" + fileName;
                     result.put("relativePath", relativePath);//前端根据是否存在该字段来判断上传是否成功
                     result_msg = "图片上传成功";
-                    result.put("imgUrl", imgUrl);
+                    result.put("zxUrl", zxUrl);
 
                 } else {
                     result_msg = "图片上传失败";
@@ -242,9 +194,7 @@ public class UploadServiceImpl implements UploadService {
         String root_json = JSON.toJSONString(root);
         System.out.println(root_json);
         result.put("returnCode", 0);
-        System.out.println(zxName);
-        System.out.println(imgUrl);
-        shopZxMapper.zxadd(zxUrl,userId,zxName,zxField,imgUrl,zxAddress);
+        shopZxMapper.zxadd(zxUrl,zxField,zxAddress,inviteCode, zxDate);
         return root;
     }
 
@@ -312,15 +262,14 @@ public class UploadServiceImpl implements UploadService {
     public List selectPage(Integer pageNum, Integer pageSize) {
         List<shopZx> shopZxList = shopZxMapper.selectPage(pageNum,pageSize);
         for (shopZx shopZx : shopZxList) {
-            String imgUrl = shopZx.getImgUrl();
-            String[] split = StringUtils.split(imgUrl, ",");
+            String zxUrl = shopZx.getZxUrl();
+            String[] split = StringUtils.split(zxUrl, ",");
             if (null != split){
                 List<String> strings = Arrays.asList(split);
                 shopZx.setAskImgList(strings);
+
             }
-//            if(null!=shopZx.getImgUrl()){
-//                    shopZx.setAskImgList(Arrays.asList(StringUtils.split(shopZx.getImgUrl(), ",")));
-//            }
+
         }
         return shopZxList;
     }

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

@@ -36,17 +36,15 @@ public class UserServiceImpl extends ServiceImpl<UsersMapper, User> implements U
     @Autowired
     private UsersMapper usersMapper;
 
-    //直推表userId
     @Autowired
     private RecommendUserMapper recommendUserMapper;
 
-    //团队表
     @Autowired
     private TeamUserInfoMapper teamUserInfoMapper;
 
     @Override
     public User getById(String userId) {
-        return null;
+        return usersMapper.getByUserId(userId);
     }
 
     @Override

wisenergy-web-admin/src/main/java/cn/wisenergy/web/admin/controller/app/CustomerServiceController.java

+package cn.wisenergy.web.admin.controller.app;
+
+import cn.wisenergy.common.utils.R;
+import cn.wisenergy.model.app.CustomerService;
+import cn.wisenergy.service.app.CustomerServiceService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.servlet.http.HttpServletRequest;
+import java.io.IOException;
+
+/**
+ * 专属客服
+ */
+@Api(tags = "专属客服")
+@RestController
+@RequestMapping("/customerService")
+@Slf4j
+public class CustomerServiceController {
+
+    @Autowired
+    private CustomerServiceService customerServiceService;
+
+    @ApiOperation(value = "获取专属客服", notes = "获取专属客服")
+    @GetMapping("/service")
+    public R getServiceByRand(){
+        try {
+            CustomerService serviceByRand = customerServiceService.getServiceByRand();
+            String wechatImgUrl = serviceByRand.getWechatImgUrl();
+            return R.ok(wechatImgUrl);
+        }catch (Exception e){
+            return R.error("获取失败，请重试");
+        }
+    }
+
+    /**
+     * String wechatId ,@RequestParam("file") MultipartFile file,
+     * 上传专属客服微信二维码图片
+     */
+    @ResponseBody
+    @PostMapping("/uploadWeChatImg")
+    public R uploadWeChatQRImg(@RequestParam("file")MultipartFile file,HttpServletRequest request,String wechatId){
+
+        try {
+            customerServiceService.uploadImage(file,request,wechatId);
+        } catch (IOException e) {
+            e.printStackTrace();
+            R.error("上传失败");
+        }
+        return R.ok("上传成功");
+    }
+
+}

wisenergy-web-admin/src/main/java/cn/wisenergy/web/admin/controller/app/TestController.java

@@ -13,6 +13,8 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.math.BigInteger;
+
 @Api(tags = "短信服务测试，邀请码测试")
 @RestController
 @RequestMapping("/ZX")
@@ -53,13 +55,32 @@ public class TestController {
 
     public static void main(String [] args){
 
-        String str = "1,2,3,4,5,6,7,8,9";
-        String repStr = str.replaceAll(",","");
+        /**
+         * 隐藏中间四位的方法
+         */
+        String phone = "18501234234";
+
+        String hidenPhone = phone.replaceAll("(\\d{3})\\d{4}(\\d{4})","$1****$2");
+
 
-        String b = ShareCodeUtil.idToCode(1);
-       String a= ShareCodeUtil.idToCode(1,0+1);
+//        /**
+//         * 生成当前时间戳
+//         */
+//        BigInteger zxDate= BigInteger.valueOf(System.currentTimeMillis());
+
+//        /**
+//         * 去，的写法
+//         */
+//        String str = "1,2,3,4,5,6,7,8,9";
+//        String repStr = str.replaceAll(",","");
+//
+//        /**
+//         * 调用工具类生成六位邀请码
+//         */
+//        String b = ShareCodeUtil.idToCode(1);
+//       String a= ShareCodeUtil.idToCode(1,0+1);
 
-        System.out.println(repStr);
+       System.out.println(hidenPhone);
     }
 
     @ApiOperation(value = "测试短信服务，发送手机号", notes = "测试短信服务，发送手机号", httpMethod = "POST", produces = "application/json; charset=UTF-8")

wisenergy-web-admin/src/main/java/cn/wisenergy/web/admin/controller/app/UploadController.java

@@ -45,7 +45,6 @@ public class UploadController {
      *
      * @param file
      * @param request
-     * @param userId
      * @param zxField
      * @param zxAddress
      * @return
@@ -56,39 +55,32 @@ public class UploadController {
             @ApiImplicitParam(name = "zxField", value = "资讯文字", dataType = "String"),
             @ApiImplicitParam(name = "file", value = "视频文件", dataType = "MultipartFile"),
             @ApiImplicitParam(name = "zxAddress", value = "资讯发布地址", dataType = "String"),
-            @ApiImplicitParam(name = "userId", value = "用户手机号（发布人）", required = true, dataType = "String")})
+            @ApiImplicitParam(name = "inviteCode", value = "用户本人邀请码（发布人）", required = true, dataType = "String")})
     @RequestMapping(value = "/uploadVideo", method = RequestMethod.POST)
-    public Map<String, Object> uploadVideo(@RequestParam(value = "files")MultipartFile file, HttpServletRequest request, String userId, String zxField, String zxAddress) throws Exception {
-        return uploadService.uploadVideo(file, request, userId, zxField, zxAddress);
+    public Map<String, Object> uploadVideo(@RequestParam(value = "files")MultipartFile file, HttpServletRequest request, String zxField, String zxAddress,String inviteCode) throws Exception {
+        return uploadService.uploadVideo(file, request, zxField, zxAddress,inviteCode);
     }
 
     /**
-     * 单图片文件上传
+     * TODO 单图片文件上传
      *
      * @param request
      * @return
      * @throws Exception
      */
-    @ApiOperation(value = "资讯信息-文字/单图片上传接口", notes = "返回路径给前台", httpMethod = "POST", produces = "application/json; charset=UTF-8")
+    @ApiOperation(value = "用户头像上传接口", notes = "返回路径给前台", httpMethod = "POST", produces = "application/json; charset=UTF-8")
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "zxField", value = "资讯文字", dataType = "String"),
             @ApiImplicitParam(name = "file", value = "单图片", dataType = "MultipartFile"),
-            @ApiImplicitParam(name = "zxAddress", value = "资讯发布地址", dataType = "String"),
-            @ApiImplicitParam(name = "userId", value = "用户手机号", required = true, dataType = "String")})
+            @ApiImplicitParam(name = "inviteCode", value = "用户本人邀请码（发布人）", required = true, dataType = "String")})
     @RequestMapping(value = "/uploadImage", method = RequestMethod.POST)
-    public Map<String, Object> uploadImage(@RequestParam(value = "files")MultipartFile file, HttpServletRequest request, String userId, String zxField, String zxAddress) throws Exception {
-
-
-        return uploadService.uploadImage(file, request, userId, zxField, zxAddress);
+    public Map<String, Object> uploadImage(@RequestParam(value = "files")MultipartFile file, HttpServletRequest request, String zxField, String zxAddress ,String inviteCode) throws Exception {
+        return uploadService.uploadImage(file,request,zxField,zxAddress,inviteCode);
     }
 
 
     /**
-     * 多文件上传
-     *
-     * @param files    @RequestParam("file")    /**
-     * *  多文件上传接口
-     * *  T0D0 value = "/fileUpload", produces = "application/json;charset=UTF-8
+     * *
+     * *  TODO  多文件上传接口
      * *
      * @return
      */
@@ -99,13 +91,20 @@ public class UploadController {
             @ApiImplicitParam(name = "zxField", value = "资讯文字", dataType = "String"),
             @ApiImplicitParam(name = "files", value = "多图片", paramType = "form", allowMultiple=true, dataType = "__file"),
             @ApiImplicitParam(name = "zxAddress", value = "发表地址", dataType = "String"),
-            @ApiImplicitParam(name = "userId", value = "用户手机号", required = true, dataType = "String")})
+            @ApiImplicitParam(name = "inviteCode", value = "用户本人邀请码（发布人）", required = true, dataType = "String")})
+
     @RequestMapping(method = RequestMethod.POST, value = "/multipleImageUpload", headers = "content-type=multipart/form-data")
-    public List multipleImageUpload(@RequestParam(value = "files") MultipartFile[] files, String userId, String zxField, String zxAddress) {
-        return uploadService.imageUpload(files, userId, zxField, zxAddress);
+    public List multipleImageUpload(@RequestParam(value = "files") MultipartFile[] files, String zxField, String zxAddress,String inviteCode) {
+        return uploadService.imageUpload(files, zxField, zxAddress,inviteCode);
 
     }
 
+    /**
+     * 资讯展示
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
     @ApiImplicitParams({
             @ApiImplicitParam(name = "pageNum", value = "从几开始", required = true,dataType = "integer"),
             @ApiImplicitParam(name = "pageSize", value = "一页展示数量", required = true, dataType = "Integger")})

wisenergy-web-admin/src/main/java/cn/wisenergy/web/admin/controller/app/UserController.java

@@ -15,10 +15,7 @@ import cn.wisenergy.service.app.UserService;
 import cn.wisenergy.web.common.BaseController;
 import cn.wisenergy.web.config.JwtConfig;
 import cn.wisenergy.web.shiro.JwtUtil;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.*;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -110,7 +107,9 @@ public class UserController extends BaseController {
     @ApiOperation(value = "获取用户我的直推信息", notes = "获取用户我的直推信息", httpMethod = "GET")
     @GetMapping("/myRecommend")
     public R<Map> getMyRecommend(String userId) {
+        //用户id
         int userLevel = userService.getByUserId(userId).getUserLevel();
+        //用户各等级人数
         RecommendUser myRecommed = recommendUserService.getMyRecommed(userId);
         Map myRecommedMap = new HashMap();
         myRecommedMap.put("userlevel", userLevel);

wisenergy-web-admin/src/main/resources/application-dev.yml

@@ -62,7 +62,7 @@ uploadFile:
   location: /opt/images/upload_flowChart/ #自定义上传文件服务器硬盘保存路径  ，linux服务器保存路径 /home/changfa/app/wxbjgkpt/upload_flowChart/
 file:
   upload:
-    path: /opt/images/
+    path: /opt/upload/video/
 jwt:
   # 加密秘钥
   secret: f4e2e52034348f86b67cde581c0f9eb5