by su 4 éve
szülő
commit
02626db659

+ 4 - 14
house-biz/src/main/java/com/ljq/house/biz/model/LoginVo.java

@@ -44,30 +44,20 @@ public class LoginVo  implements Serializable {
     private String signature;
 
     //不包括敏感信息的原始数据字符串,用于计算签名
-    @ApiModelProperty(value="用户id",name="rawData",example="dfsdfsfxxfdsfddfasdaffa")
+    @ApiModelProperty(value="用户id",name="userId",example="dfsdfsfxxfdsfddfasdaffa")
     @JsonProperty("user_id")
     private String userId;
 
     //不包括敏感信息的原始数据字符串,用于计算签名
-    @ApiModelProperty(value="经纪人id",name="rawData",example="dfsdfsfxxfdsfddfasdaffa")
+    @ApiModelProperty(value="经纪人id",name="agencyUserId",example="dfsdfsfxxfdsfddfasdaffa")
     @JsonProperty("agency_user_id")
     private String agencyUserId;
 
     //不包括敏感信息的原始数据字符串,用于计算签名
-    @ApiModelProperty(value="信息",name="rawData",example="dfsdfsfxxfdsfddfasdaffa")
+    @ApiModelProperty(value="信息",name="WxUserInfoDto",example="dfsdfsfxxfdsfddfasdaffa")
     @JsonProperty("userInfo")
     private WxUserInfoDto wxUserInfoDto;
 
-    @Override
-    public String toString() {
-        return "LoginVo{" +
-                "wxCode='" + wxCode + '\'' +
-                ", phoneNum='" + phoneNum + '\'' +
-                ", iv='" + iv + '\'' +
-                ", encryptedData='" + encryptedData + '\'' +
-                ", rawData='" + rawData + '\'' +
-                ", signature='" + signature + '\'' +
-                '}';
-    }
+
 
 }

+ 1 - 1
house-biz/src/main/java/com/ljq/house/biz/model/TmAdmin.java

@@ -8,6 +8,7 @@ import javax.persistence.Column;
 import javax.persistence.Temporal;
 import javax.persistence.TemporalType;
 import java.io.Serializable;
+import java.math.BigInteger;
 import java.util.Date;
 
 /**
@@ -17,7 +18,6 @@ import java.util.Date;
  */
 @Data
 public class TmAdmin extends BaseEntity implements Serializable {
-    @JsonProperty("admin_id")
     private String adminId;
 
     private Integer type;

+ 4 - 0
house-biz/src/main/java/com/ljq/house/biz/model/TmHouse.java

@@ -241,4 +241,8 @@ public class TmHouse extends BaseEntity implements Serializable {
     @ApiModelProperty(value = "附加信息图地址 封面")
     @JsonProperty("cover_additions_images ")
     private String coverAdditionsImages;
+
+    @ApiModelProperty(value = "附加信息图地址")
+    @JsonProperty("addres_images")
+    private String addresImages;
 }

+ 1 - 1
house-biz/src/main/resources/mapper/TmHouseMapper.xml

@@ -141,7 +141,7 @@
             <if test="tmHouse.additionsImages != null and tmHouse.additionsImages.trim() != ''">additions_images=#{tmHouse.additionsImages},</if>
             <if test="tmHouse.coverAdditionsImages != null and tmHouse.coverAdditionsImages.trim() != ''">cover_additions_images=#{tmHouse.coverAdditionsImages},</if>
             <if test="tmHouse.constructionYear != null and tmHouse.constructionYear.trim() != ''">construction_year=#{tmHouse.constructionYear},</if>
-
+            <if test="tmHouse.addresImages != null and tmHouse.addresImages.trim() != ''">addres_images=#{tmHouse.addresImages},</if>
             last_modify_datetime = now()
         </set>
         where `house_id` = #{tmHouse.houseId}

+ 2 - 0
house-common/src/main/java/com/ljq/house/common/service/HouseHelperService.java

@@ -254,6 +254,8 @@ public class HouseHelperService {
             result.put("additionsImages" , tmHouse.getAdditionsImages());
             result.put("coverAdditionsImages" , tmHouse.getCoverAdditionsImages());
             result.put("unitPrice",tmHouse.getUnitPrice());
+            result.put("addresImages",tmHouse.getAddresImages());
+
         }
 
         if(null != tmEstate){

+ 2 - 1
house-common/src/main/java/com/ljq/house/common/service/UserService.java

@@ -74,7 +74,8 @@ public class UserService {
 
     public int addUserToAgency(TmAgency tmAgency , TmUser tmUser){
         TmAgencyUserRelation tmAgencyUserRelation = new TmAgencyUserRelation();
-        tmAgencyUserRelation.setAgencyId(tmAgency.getAgencyUserId());
+        tmAgencyUserRelation.setAgencyUserId(tmAgency.getAgencyUserId());
+        tmAgencyUserRelation.setAgencyId(tmAgency.getAgencyId());
         tmAgencyUserRelation.setUserId(tmUser.getUserId());
         tmAgencyUserRelation.setUserName(tmUser.getName());
         tmAgencyUserRelation.setUserPhone(tmUser.getPhone());

+ 1 - 1
house-web/src/main/java/com/ljq/house/admin/controller/AdminTmRegionController.java

@@ -28,7 +28,7 @@ import org.springframework.web.bind.annotation.*;
  */
 @Api(description = "管理后台-地区管理接口")
 @Controller
-@RequestMapping("/admin/region")
+@RequestMapping("/region")
 @Log4j2
 public class AdminTmRegionController {
 

+ 3 - 3
house-web/src/main/java/com/ljq/house/app/controller/AppAgencyController.java

@@ -67,11 +67,11 @@ public class AppAgencyController {
     @ResponseBody
     public Result userLogin(@RequestBody @ApiParam(name="登录请求实体",value="传入json格式",required=true) LoginVo loginVo) {
 
+
+
         if (!StringUtils.isNoneBlank(loginVo.getWxCode(), loginVo.getIv()
                 ,loginVo.getRawData()
-                ,loginVo.getEncryptedData()
-                ,loginVo.getWxUserInfoDto().getAvatarUrl()
-                ,loginVo.getWxUserInfoDto().getNickName())) {
+                ,loginVo.getEncryptedData())) {
             throw new CommonBaseException(ResultCodeEnum.D017);
         }
 

+ 29 - 27
house-web/src/main/java/com/ljq/house/app/controller/AppTmUserController.java

@@ -79,10 +79,9 @@ public class AppTmUserController {
     @ResponseBody
     public Result userLogin(@RequestBody @ApiParam(name="登录请求实体",value="传入json格式",required=true) LoginVo loginVo) {
 
+
         if (!StringUtils.isNoneBlank(loginVo.getWxCode(), loginVo.getIv(),
-                loginVo.getRawData(), loginVo.getEncryptedData()
-                ,loginVo.getWxUserInfoDto().getAvatarUrl()
-                ,loginVo.getWxUserInfoDto().getNickName())) {
+                loginVo.getRawData(), loginVo.getEncryptedData())) {
             throw new CommonBaseException(ResultCodeEnum.D017);
         }
 
@@ -356,32 +355,35 @@ public class AppTmUserController {
             throw new CommonBaseException(ResultCodeEnum.D017);
         }
 
-        Map<String, Object> wxResult =  WxOpUtils.tryLoginWx(delegationVo.getWxCode() , userWxAppId, userWxAppSecret);
-        String wxSessionKey = (String) wxResult.get(WxOpUtils.SESSION_KEY);
-        String wxOpenId = (String) wxResult.get(WxOpUtils.WX_OPEN_ID_KEY);
-        String decryptPhoneNum = null;
-        try {
-            JSONObject resultJson = WXCore.decrypt(wxOpenId, delegationVo.getEncryptedData(), wxSessionKey, delegationVo.getIv());
-            decryptPhoneNum = null != resultJson ? resultJson.getString(CommonConstants.WxConstant.WX_PHONE_NUMBER) : "";
-            log.info("解密出来的手机号码为:{}", decryptPhoneNum);
-        } catch (Exception e) {
-            log.error("解密手机号出现异常:{}", e);
-            throw new CommonBaseException(ResultCodeEnum.D039);
-        }
-        if(StringUtils.isBlank(decryptPhoneNum)){
-            throw new CommonBaseException(ResultCodeEnum.D039);
-        }
-        log.info("上送的userId={}" , delegationVo.getUserId());
-        //TODO这里获取的地方要改
+//        Map<String, Object> wxResult =  WxOpUtils.tryLoginWx(delegationVo.getWxCode() , userWxAppId, userWxAppSecret);
+//        String wxSessionKey = (String) wxResult.get(WxOpUtils.SESSION_KEY);
+//        String wxOpenId = (String) wxResult.get(WxOpUtils.WX_OPEN_ID_KEY);
+//        String decryptPhoneNum = null;
+        String wxOpenId = "122";
+        String decryptPhoneNum = "12";
+
+//        try {
+//            JSONObject resultJson = WXCore.decrypt(wxOpenId, delegationVo.getEncryptedData(), wxSessionKey, delegationVo.getIv());
+//            decryptPhoneNum = null != resultJson ? resultJson.getString(CommonConstants.WxConstant.WX_PHONE_NUMBER) : "";
+//            log.info("解密出来的手机号码为:{}", decryptPhoneNum);
+//        } catch (Exception e) {
+//            log.error("解密手机号出现异常:{}", e);
+//            throw new CommonBaseException(ResultCodeEnum.D039);
+//        }
+//        if(StringUtils.isBlank(decryptPhoneNum)){
+//            throw new CommonBaseException(ResultCodeEnum.D039);
+//        }
+//        log.info("上送的userId={}" , delegationVo.getUserId());
+//        //TODO这里获取的地方要改
         TmUser tmUser = tmUserDao.selectTmUsers(delegationVo.getUserId());
         TmAgency tmAgency = tmAgencyDao.selectTmAgencyById(delegationVo.getAgencyUserId());
-        if(null == tmUser || null == tmAgency){
-            throw new CommonBaseException(ResultCodeEnum.D101 , "用户或者经纪人数据缺失");
-        }
-        if(StringUtils.isNotBlank(tmUser.getWxOpenId()) && !StringUtils.equals(tmUser.getWxOpenId() , wxOpenId)){
-            log.info("上送的wxOpenId={}, 数据库中的是openId={}" , wxOpenId , tmUser.getWxOpenId());
-            throw new CommonBaseException(ResultCodeEnum.D101 , "上送的openId和数据中的不一致");
-        }
+//        if(null == tmUser || null == tmAgency){
+//            throw new CommonBaseException(ResultCodeEnum.D101 , "用户或者经纪人数据缺失");
+//        }
+//        if(StringUtils.isNotBlank(tmUser.getWxOpenId()) && !StringUtils.equals(tmUser.getWxOpenId() , wxOpenId)){
+//            log.info("上送的wxOpenId={}, 数据库中的是openId={}" , wxOpenId , tmUser.getWxOpenId());
+//            throw new CommonBaseException(ResultCodeEnum.D101 , "上送的openId和数据中的不一致");
+//        }
 
         if(StringUtils.isBlank(tmUser.getWxOpenId())){
             tmUser.setWxOpenId(wxOpenId);