修改

YijiaRestful/src/main/java/com/platform/yijia/controller/PosMachineController.java

@@ -59,14 +59,26 @@ public class PosMachineController {
         if(loginBody.getUserName() !=null && loginBody.getPassword() !=null){
             SysUser sysUser = posMachineService.selectUserByUserName(loginBody.getUserName());
             if(sysUser !=null){
-                String password = sysUser.getPassword();
-                BCryptPasswordEncoder bCryptPasswordEncoder = new BCryptPasswordEncoder();
-                //密码加密判断已加密密码是否与真实密码相同
-                boolean matches = bCryptPasswordEncoder.matches(loginBody.getPassword(), password);
-                if(matches){
-                    resultData = ResultData.success(sysUser);
-                }else{
-                    resultData = ResultData.error(CodeMsg.PASSWORD_ERROR);
+                if(sysUser.getStatus().equals("0")){
+                    String password = sysUser.getPassword();
+                    BCryptPasswordEncoder bCryptPasswordEncoder = new BCryptPasswordEncoder();
+                    //密码加密判断已加密密码是否与真实密码相同
+                    boolean matches = bCryptPasswordEncoder.matches(loginBody.getPassword(), password);
+                    if(matches){
+                        SysUser s = new SysUser();
+                        s.setNickName(sysUser.getNickName());
+                        s.setDeptId(sysUser.getDeptId());
+                        s.setAvatar(sysUser.getAvatar());
+                        s.setUserName(sysUser.getUserName());
+                        s.setPhonenumber(sysUser.getPhonenumber());
+                        s.setSex(sysUser.getSex());
+                        s.setUserId(sysUser.getUserId());
+                        resultData = ResultData.success(s);
+                    }else{
+                        resultData = ResultData.error(CodeMsg.PASSWORD_ERROR);
+                    }
+                }else if(sysUser.getStatus().equals("1")){
+                    resultData = ResultData.error(CodeMsg.ACCOUNT_DISABLE);
                 }
             }else {
                 resultData = ResultData.error(CodeMsg.USER_NOT_EXSIST);
@@ -75,6 +87,10 @@ public class PosMachineController {
         return gson.toJson(resultData);
     }
 
+
+
+
+
     /**
      * pos机班结
      * @param stationClassStructure
@@ -217,7 +233,6 @@ public class PosMachineController {
                 }else{
                     stationclass.setPrintNum(Integer.valueOf("0"));
                 }
-
                 i= stationClassStructureService.insertStationClassStructure(stationclass);
             }
         }else{
@@ -382,14 +397,11 @@ public class PosMachineController {
                     map.put("code","200");
                     map.put("msg","班结成功");
                     map.put("oilList",list);
-                }else{
-                    map.put("code","500");
-                    map.put("msg","班结失败");
                 }
             }
         }else{
-            map.put("code","500");
-            map.put("msg","班结失败");
+            map.put("code","100");
+            map.put("msg","已班结");
         }
         return map;
     }

YijiaRestful/src/main/java/com/platform/yijia/utils/CodeMsg.java

@@ -9,6 +9,7 @@ public class CodeMsg {
     public static CodeMsg SERVER_EXCEPTION = new CodeMsg(500100,"服务端异常");
     public static CodeMsg USER_NOT_EXSIST = new CodeMsg(-1,"用户不存在");
     public static CodeMsg USER_EXSIST = new CodeMsg(-1,"用户已存在");
+    public static CodeMsg ACCOUNT_DISABLE = new CodeMsg(-3,"该账号已被停用");
     public static CodeMsg PASSWORD_ERROR = new CodeMsg(-2,"密码错误");
     public static CodeMsg SEARCH_FAIL = new CodeMsg(001,"查询失败");
     public static CodeMsg INSERT_FAIL = new CodeMsg(001,"添加失败");

YijiaRestful/src/main/resources/mapper/PosMachineMapper.xml

@@ -65,6 +65,7 @@
         FROM
             sys_user AS u
         WHERE
-            u.user_name = #{userName}
+            u.del_flag ="0"
+            AND u.user_name = #{userName}
     </select>
 </mapper>