user_info 表增加冻结字段 0正常（默认） 1冻结

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

@@ -123,7 +123,7 @@ public interface UsersMapper extends BaseMapper<User> {
      * @param beInvitedCode
      * @param userLevel
      */
-    Integer insertbyint(@Param("userId") String userId, @Param("inviteCode") String inviteCode, @Param("beInvitedCode") String beInvitedCode, @Param("userLevel") Integer userLevel, @Param("headImage") String headImage);
+    Integer insertbyint(@Param("userId") String userId, @Param("inviteCode") String inviteCode, @Param("beInvitedCode") String beInvitedCode, @Param("userLevel") Integer userLevel, @Param("headImage") String headImage,@Param("frozen") Integer frozen);
 
     Integer save(@Param("userId") String userId, @Param("beInvitedCode") String beInvitedCode);
 

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

@@ -67,6 +67,7 @@
       a.head_image as headImage
       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
       order by zxid desc limit #{pageNum},#{pageSize}
     </select>
     <!--资讯总记录数查询-->

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

@@ -15,6 +15,7 @@
         <result column="invite_code" property="inviteCode"/>
         <result column="be_invited_code" property="beInvitedCode"/>
         <result column="customer_service_id" property="customerServiceId"/>
+        <result column="frozen" property="frozen"/>
         <result column="create_time" property="createTime"/>
         <result column="update_time" property="updateTime"/>
     </resultMap>
@@ -193,8 +194,8 @@
 
     <!--用户注册-->
     <insert id="insertbyint">
-        insert into user_info(user_id,invite_code,be_invited_code,user_level,head_image) value
-        (#{userId},#{inviteCode},#{beInvitedCode},#{userLevel},#{headImage})
+        insert into user_info(user_id,invite_code,be_invited_code,user_level,head_image,frozen) value
+        (#{userId},#{inviteCode},#{beInvitedCode},#{userLevel},#{headImage},#{frozen})
     </insert>
     <insert id="save">
         insert into user_info(user_id,be_invited_code) value (#{userId},#{beInvitedCode})

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

@@ -107,6 +107,20 @@ public class User  implements Serializable{
     @ApiModelProperty(name = "updateTime", value = "修改时间")
     private Date updateTime;
 
+    /**
+     * 账户冻结字段 0正常  1冻结
+     */
+    @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;
     }

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

@@ -134,14 +134,12 @@ public class UploadServiceImpl implements UploadService {
                 //如果目标文件所在的目录不存在，则创建父目录
                 newFile.getParentFile().mkdirs();
             }
-
             User user=usersMapper.InvitedCode2(inviteCode);
             String userId=user.getUserId();
             //将内存中的数据写入磁盘
             file.transferTo(newFile);
             //图片上传保存url
             String zxUrl = basePath + newzxName;
-
             resultMap.put("zxUrl", zxUrl);
             resultMap.put("code", 0);
             resultMap.put("msg","头像上传成功！！！");
@@ -158,88 +156,92 @@ public class UploadServiceImpl implements UploadService {
      */
     @Override
     public Map imageUpload(MultipartFile[] files, String zxField, String inviteCode) {
-
+        if(null==inviteCode||"".equals(inviteCode)){
+            inviteCode="0";
+        }
+        HashMap map = new HashMap();
         //正则去除特殊符号
         //String a = inviteCode.replaceAll("\"(\\b[^\"]+|\\s+)?\"(\\b[^\"]+\\b)?\"([^\"]+\\b|\\s+)?\"","\"$1$2$3\"");
-        inviteCode = inviteCode.replace("\"","").replace("\"","");
-        //获取上传图片数量，打印在控制台
-        System.out.println("上传图片数量" + files.length);
-        String zxUrl = new String();
-        //创建集合
-        List<Map<String, Object>> root = new ArrayList<Map<String, Object>>();
-        String fileName1=null;
-        // 要上传的目标文件存放的绝对路径
+        //过滤传入的邀请码带有“”的符号
+        inviteCode = inviteCode.replace("\"", "").replace("\"", "");
+        //上传图片不为空时
+        if (null != files && 0 != files.length) {
+            //获取上传图片数量，打印在控制台
+            System.out.println("上传图片数量" + files.length);
+            String zxUrl = new String();
+            //创建集合
+            List<Map<String, Object>> root = new ArrayList<Map<String, Object>>();
+            String fileName1 = null;
+            // 要上传的目标文件存放的绝对路径
 //        final String localPath = path;
-        Long time = System.currentTimeMillis();
-        String localPath = "/upload/";
-        Map<String, Object> result = new HashMap<String, Object>();//一个文件上传的结果
-        String msg = "";//上传结果信息
-        //遍历图片数据
-        for (MultipartFile file : files) {
-            if (file.isEmpty()) {
-                System.out.println("上传图片为空，请重新上传");
-                Map map=new HashMap();
-                map.put("code",0);
-                map.put("msg","上传图片为空，请重新上传");
-             return map;
-
-            }
-            //判断上传文件格式
-            String fileType = file.getContentType();
-            if (fileType.equals("image/jpeg") || fileType.equals("image/png") || fileType.equals("image/gif") || fileType.equals("image/jpg") ||fileType.equals("image/bmp") || fileType.equals("application/octet-stream")) {
-                //上传后保存的文件名(需要防止图片重名导致的文件覆盖)
-                //获取文件名
-                fileName1 = file.getOriginalFilename();
-                String fileName;
-
-                //获取文件后缀名
-                try {
-                    String suffixName = fileName1.substring(fileName1.lastIndexOf("."));
-                    //重新生成文件名
-                    fileName ="1"+UUID.randomUUID()+suffixName;//文件新名称
-                    //重新生成文件名
-
-                }catch (
-                     Exception e
-                ){
-                    //重新生成文件名
-                    fileName ="1"+UUID.randomUUID()+fileName1+".jpg";//文件新名称
-                }
-
-
-//                String suffixName = fileName1.substring(fileName1.lastIndexOf("."));
-//                if(null==suffixName){
-//
-//                }
-
-                //设置文件存储路径，可以存放在你想要指定的路径里面
-                String Path="/opt/upload/video/"; //上传图片存放位置
-                zxUrl+=localPath+fileName+",";
-                if (FileUtils.upload(file,Path, fileName)) {
-                    //文件存放的相对路径(一般存放在数据库用于img标签的src)
-                    String relativePath ="用于判断是否图片上传成功，返回值有："+fileName;
-                    result.put("relativePath", relativePath);//前端根据是否存在该字段来判断上传是否成功
-                    msg = "图片上传成功";
-                    result.put("zxUrl", zxUrl);
+            Long time = System.currentTimeMillis();
+            String localPath = "/upload/";
+            Map<String, Object> result = new HashMap<String, Object>();//一个文件上传的结果
+            String msg = "";//上传结果信息
+            //遍历图片数据
+            for (MultipartFile file : files) {
+                //判断上传文件格式
+                String fileType = file.getContentType();
+                if (fileType.equals("image/jpeg") || fileType.equals("image/png") || fileType.equals("image/gif") || fileType.equals("image/jpg") || fileType.equals("image/bmp") || fileType.equals("application/octet-stream")) {
+                    //上传后保存的文件名(需要防止图片重名导致的文件覆盖)
+                    //获取文件名
+                    fileName1 = file.getOriginalFilename();
+                    String fileName;
+                    //获取文件后缀名
+                    try {
+                        String suffixName = fileName1.substring(fileName1.lastIndexOf("."));
+                        //重新生成文件名
+                        fileName = "1" + UUID.randomUUID() + suffixName;//文件新名称
+                    } catch (
+                            Exception e
+                    ) {
+                        //重新生成文件名
+                        fileName = "1" + UUID.randomUUID() + fileName1 + ".jpg";//文件新名称
+                    }
+                    //设置文件存储路径，可以存放在你想要指定的路径里面
+                    String Path = "/opt/upload/video/"; //上传图片存放位置
+                    zxUrl += localPath + fileName + ",";
+                    if (FileUtils.upload(file, Path, fileName)) {
+                        //文件存放的相对路径(一般存放在数据库用于img标签的src)
+                        String relativePath = "用于判断是否图片上传成功，返回值有：" + fileName;
+                        result.put("relativePath", relativePath);//前端根据是否存在该字段来判断上传是否成功
+                        msg = "图片上传成功";
+                        result.put("zxUrl", zxUrl);
+                    } else {
+                        msg = "图片上传失败";
+                    }
                 } else {
-                    msg = "图片上传失败";
+                    msg = "图片格式不正确";
                 }
-            } else {
-                msg = "图片格式不正确";
+            }
+            result.put("code", 0);
+            result.put("msg", msg);
+            /**
+             * 生成当前时间戳
+             */
+            Long zxDate = Long.valueOf(System.currentTimeMillis());
+            shopZxMapper.zxadd(zxUrl, zxField, inviteCode, zxDate);
+            return result;
+            //用户只上传文字时
+        } else if (null != zxField&&files==null) {
+            /**
+             * 生成当前时间戳
+             */
+            Long zxDate = Long.valueOf(System.currentTimeMillis());
+
+            String zxUrl="0";
+            shopZxMapper.zxadd(zxUrl, zxField, inviteCode, zxDate);
+            //图片与文字都为null的时候，给前端返回提示！
+        }else {
+            if (null==files&&null==zxField) {
+                map.put("code", 1);
+                map.put("msg", "上传资讯不能为空，请重新上传！");
+                return map;
             }
         }
-//        result.put("msg", result_msg);
-        //root.add(result);
-       // String root_json = JSON.toJSONString(root);
-       // System.out.println(root_json);
-        result.put("code", 0);
-        result.put("msg",msg);
-        /**
-         * 生成当前时间戳
-         */
-        Long zxDate= Long.valueOf(System.currentTimeMillis());
-        shopZxMapper.zxadd(zxUrl,zxField,inviteCode, zxDate);
-        return result;
+            map.put("code", 0);
+            map.put("msg", "资讯上传成功！");
+            return map;
     }
 
     /**
@@ -267,7 +269,6 @@ public class UploadServiceImpl implements UploadService {
     public String storeFile(MultipartFile file) {
         // Normalize file name
         String fileName = StringUtils.cleanPath(file.getOriginalFilename());
-
         try {
             // Check if the file's name contains invalid characters
             if(fileName.contains("..")) {
@@ -311,9 +312,7 @@ public class UploadServiceImpl implements UploadService {
           ArrayList list =new ArrayList();
             if (null != zxUrl){
             for (String split:zxUrl) {
-
                 boolean arrayList=Collections.addAll(list,split);
-
                     shopZx.setAskImgList(list);
                 }
             }
@@ -334,7 +333,6 @@ public class UploadServiceImpl implements UploadService {
                     map.put("code",1);
                     map.put("msg","用户不存在,请重新登陆!");
                     return map;
-
                 }
                 userLikes d = LikesMapper.selectlikes(userLikeId, likedId);
                 if (null == d) {
@@ -342,13 +340,9 @@ public class UploadServiceImpl implements UploadService {
                 } else {
                     shopZx.setLikedStatus(1);
                 }
-
             }
-
         }
-
         map.put("data",shopZxList);
-
         return map;
     }
 
@@ -362,7 +356,6 @@ public class UploadServiceImpl implements UploadService {
         Map map = new HashMap();
         //用户个人邀请码查询用户数据
         User user=usersMapper.InvitedCode2(inviteCode);
-
         //用户等于null
         if(null == user || "".equals(user)){
             map.put("code",1);
@@ -374,15 +367,11 @@ public class UploadServiceImpl implements UploadService {
             String userLikeId=user.getUserId();
             int likedId= zxid;
             userLikes b= LikesMapper.selectlikes(userLikeId, likedId);
-
-
             if(b==null){
-
                 // 没有点过的话，就进行插入点赞记录表，更新点赞数
                 Integer likedType=0;//点赞类型为扩展类型，暂时默认0
                 Integer likedStaus=1; //更新点赞状态
                 LikesMapper.addlikes(userLikeId,likedId,likedStaus,likedType);
-
                     shopZx shopZx = shopZxMapper.selectByzxid(zxid);
                     int a = shopZx.getZxLikes();
                     Integer zxLikes=shopZx.setZxLikes(a + 1);
@@ -391,16 +380,12 @@ public class UploadServiceImpl implements UploadService {
                     map.put("code",0);
                     map.put("msg","点赞成功！");
                 }else {
-
                     map.put("code",1);
                     map.put("msg","点赞失败！");
                 };
-
         }
-
         return map;
     }
-
     /**
      * 资讯审核
      * @param zxid

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

@@ -124,16 +124,18 @@ public class UserServiceImpl extends ServiceImpl<UsersMapper, User> implements U
             String inviteCode = "0";
             beInvitedCode = "1";
             int userLevel = 0;
+            int frozen=0;
             String headImage = Constants.Common.HEAD_POTRAIT;
-            usersMapper.insertbyint(userId, inviteCode, beInvitedCode, userLevel, headImage);
+            usersMapper.insertbyint(userId, inviteCode, beInvitedCode, userLevel, headImage,frozen);
             //初始化六张表
             registUserMoudleInit.registUserMoudleInit(userId);
         } else {
             //插入用户手机号与推荐人邀请码
             String inviteCode = "0";
             int userLevel = 0;
+            int frozen=0;
             String headImage = Constants.Common.HEAD_POTRAIT;
-            usersMapper.insertbyint(userId, inviteCode, beInvitedCode, userLevel, headImage);
+            usersMapper.insertbyint(userId, inviteCode, beInvitedCode, userLevel, headImage,frozen);
             //初始化六张表
             registUserMoudleInit.registUserMoudleInit(userId);
             //用户的被邀请码，查询到推荐人用户，根据推荐人用户的邀请码查询/修改
@@ -192,7 +194,7 @@ public class UserServiceImpl extends ServiceImpl<UsersMapper, User> implements U
         User byUserId1 = usersMapper.getByUserId(userId);
         byUserId1.setInviteCode(inviteCode);
         byUserId1.setUserLevel(0);
-
+        byUserId1.setFrozen(0);
         usersMapper.updateById(byUserId1);
 
         String BYQM = usersMapper.BYQMById(userId);