Merge branch 'dev_v1' of http://192.168.0.115:3000/4dzfb-2.0/shop into dev_v1

platform-common/src/main/java/com/platform/controller/SysLoginController.java

@@ -263,7 +263,7 @@ public class SysLoginController {
             return Result.failure(defaultFailMsg);
         }
         int code = res.containsKey("code") ? res.getIntValue("code") : -10;
-        if (Result.CODE_SUCCESS != code) {
+        if (200 != code) {
             return Result.failure(res.getString("message"));
         }
         Map<String, Object> resultMap = new HashMap<>();

platform-common/src/main/java/com/platform/service/impl/ZhiHouseService.java

@@ -1,7 +1,6 @@
 package com.platform.service.impl;
 
 import com.alibaba.fastjson.JSONObject;
-import com.platform.entity.Result;
 import com.platform.enums.ResultCodeEnum;
 import com.platform.exception.CommonBaseException;
 import com.platform.vos.RequestScene;
@@ -59,7 +58,7 @@ public class ZhiHouseService {
         if(responseEntity.getStatusCode()!= HttpStatus.OK){
             throw new CommonBaseException(ResultCodeEnum.D100,"连接失败");
         }
-        if (responseEntity.getBody().getCode() != Result.CODE_SUCCESS) {
+        if (responseEntity.getBody().getCode() != 200) {
             throw new CommonBaseException(ResultCodeEnum.D100,responseEntity.getBody().getError());
         }
 
@@ -79,7 +78,7 @@ public class ZhiHouseService {
         if(responseEntity.getStatusCode()!= HttpStatus.OK){
             throw new CommonBaseException(ResultCodeEnum.D100);
         }
-        if (responseEntity.getBody().getCode() != Result.CODE_SUCCESS) {
+        if (responseEntity.getBody().getCode() != 200) {
             throw new CommonBaseException(ResultCodeEnum.D100,responseEntity.getBody().getError());
         }
         return responseEntity.getBody();
@@ -97,7 +96,7 @@ public class ZhiHouseService {
         if(responseEntity.getStatusCode()!= HttpStatus.OK){
             throw new CommonBaseException(ResultCodeEnum.D100);
         }
-        if (responseEntity.getBody().getCode() != Result.CODE_SUCCESS) {
+        if (responseEntity.getBody().getCode() != 200) {
             throw new CommonBaseException(ResultCodeEnum.D100,responseEntity.getBody().getError());
         }
         //把信息封装为json
@@ -121,7 +120,7 @@ public class ZhiHouseService {
         if(responseEntity.getStatusCode()!= HttpStatus.OK){
             throw new CommonBaseException(ResultCodeEnum.D100);
         }
-        if (responseEntity.getBody().getCode() != Result.CODE_SUCCESS) {
+        if (responseEntity.getBody().getCode() != 200) {
             throw new CommonBaseException(ResultCodeEnum.D100,responseEntity.getBody().getError());
         }
     }