改了电话

CODE/smart-community/app-api/src/main/java/com/community/huiju/controller/SocialController.java

@@ -2,9 +2,11 @@ package com.community.huiju.controller;
 
 import com.community.commom.constant.Constant;
 import com.community.commom.mode.ResponseBean;
+import com.community.huiju.config.entity.UserElement;
 import com.community.huiju.model.TpActivity;
 import com.community.huiju.model.TpAnnouncement;
 import com.community.huiju.model.TpMessage;
+import com.community.huiju.model.TpTransaction;
 import com.community.huiju.service.SocialServiceI;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -14,6 +16,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cloud.context.config.annotation.RefreshScope;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpSession;
 import java.util.List;
 
 /**
@@ -103,4 +106,17 @@ public class SocialController {
         return responseBean;
     }
 
+    @ApiOperation(value = "二手租赁详情", notes = "二手租赁详情")
+    @ApiImplicitParams({ @ApiImplicitParam(paramType = "path", dataType = "integer", name = "communityId", value = "小区Id"),
+            @ApiImplicitParam(paramType = "query", dataType = "integer", name = "activityId", value = "活动帖子id")})
+    @RequestMapping(value = "/secondHand/{communityId}", method = RequestMethod.GET)
+    public ResponseBean findUsedDetails(@PathVariable(value = "communityId")Integer communityId, @RequestParam("activityId") Integer activityId, HttpSession session){
+        ResponseBean responseBean = new ResponseBean();
+        UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
+        Integer userId=userElement.getId();
+        TpTransaction activity = socialServiceI.findUsedDetails(activityId, communityId,userId);
+        responseBean.addSuccess(activity);
+        return responseBean;
+    }
+
 }

CODE/smart-community/app-api/src/main/java/com/community/huiju/controller/UserController.java

@@ -11,6 +11,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
+import org.apache.catalina.User;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cloud.context.config.annotation.RefreshScope;
@@ -55,7 +56,19 @@ public class UserController {
         return responseBean;
 
     }
-
+    @ApiOperation(value = "修改手机号", notes = "修改手机号")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "query",dataType = "String",name = "phone",value = "登陆(手机号)"),
+            @ApiImplicitParam(paramType = "query",dataType = "String",name = "code",value = "验证码")
+    })
+            @RequestMapping(value = "/user/phone",method = RequestMethod.PUT)
+    public ResponseBean update(@RequestParam(value = "phone") String phone,@RequestParam(value = "code")String code,HttpSession session){
+        ResponseBean responseBean = new ResponseBean();
+        UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
+        Integer userId=userElement.getId();
+        ResponseBean response=iTaUserService.selectloginName(userId,phone,code);
+        return response;
+    }
 
 
 }

CODE/smart-community/app-api/src/main/java/com/community/huiju/dao/TaUserMapper.java

@@ -32,4 +32,11 @@ public interface TaUserMapper {
      * @return 用户
      */
     TaUser selectByLoginName(Map<String, Object> map);
+
+    /**
+     * 更新当前用户电话
+     * @param record
+     * @return
+     */
+    TaUser ubdateLongName(TaUser record);
 }

CODE/smart-community/app-api/src/main/java/com/community/huiju/dao/TpTransactionMapper.java

@@ -2,6 +2,7 @@ package com.community.huiju.dao;
 
 import com.community.huiju.model.TpTransaction;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 @Mapper
 public interface TpTransactionMapper {
@@ -11,7 +12,7 @@ public interface TpTransactionMapper {
 
     int insertSelective(TpTransaction record);
 
-    TpTransaction selectByPrimaryKey(Integer id);
+    TpTransaction selectByPrimaryKey(@Param("id") Integer id,@Param("communityId")  Integer communityId);
 
     int updateByPrimaryKeySelective(TpTransaction record);
 

CODE/smart-community/app-api/src/main/java/com/community/huiju/service/ITaUserService.java

@@ -2,7 +2,6 @@ package com.community.huiju.service;
 
 import com.community.commom.mode.ResponseBean;
 import com.community.huiju.model.TaUser;
-import org.springframework.web.bind.annotation.RequestParam;
 
 /**
  * 用户业务 接口
@@ -33,6 +32,13 @@ public interface ITaUserService {
      */
     ResponseBean register(TaUser user);
 
+    /**
+     * 查询当前用户信息
+     * @param id
+     * @return
+     */
+    ResponseBean selectloginName(Integer id, String phone, String code);
+
 
 
 }

CODE/smart-community/app-api/src/main/java/com/community/huiju/service/SocialServiceI.java

@@ -1,10 +1,7 @@
 package com.community.huiju.service;
 
 import com.community.commom.mode.ResponseBean;
-import com.community.huiju.model.TaUser;
-import com.community.huiju.model.TpActivity;
-import com.community.huiju.model.TpAnnouncement;
-import com.community.huiju.model.TpSocialView;
+import com.community.huiju.model.*;
 
 import java.util.List;
 
@@ -53,4 +50,12 @@ public interface SocialServiceI {
 	TpActivity findActivityDetail(Integer activityId, Integer communityId);
 
 	ResponseBean findTaUserInfo(Integer id, Integer communityId);
+
+	/**
+	 * 获取二手租赁详情
+	 * @param activityId
+	 * @param communityId
+	 * @return
+	 */
+	TpTransaction findUsedDetails(Integer activityId, Integer communityId, Integer userId);
 }

CODE/smart-community/app-api/src/main/java/com/community/huiju/service/impl/SocialServiceImpl.java

@@ -2,12 +2,8 @@ package com.community.huiju.service.impl;
 
 import com.community.commom.constant.Constant;
 import com.community.commom.mode.ResponseBean;
-import com.community.commom.utils.DateUtils;
 import com.community.huiju.dao.*;
-import com.community.huiju.model.TaUser;
-import com.community.huiju.model.TpActivity;
-import com.community.huiju.model.TpAnnouncement;
-import com.community.huiju.model.TpSocialView;
+import com.community.huiju.model.*;
 import com.community.huiju.service.SocialServiceI;
 import com.github.pagehelper.PageHelper;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -39,6 +35,9 @@ public class SocialServiceImpl implements SocialServiceI {
 
     @Autowired
     private TpActivitySignupMapper tpActivitySignupMapper;
+
+    @Autowired
+    private TpTransactionMapper tpTransactionMapper;
     
     @Override
     @Transactional
@@ -168,4 +167,17 @@ public class SocialServiceImpl implements SocialServiceI {
 //        //身份为业主，状态为已停用
         return null;
     }
+
+    @Override
+    public TpTransaction findUsedDetails(Integer activityId, Integer communityId, Integer userId) {
+        Integer num = updateSocialView(userId,Constant.LEASE,communityId,activityId);
+        if (null != num){
+            TpTransaction transaction = new TpTransaction();
+            transaction.setId(activityId);
+            transaction.setViewCount(num);
+            tpTransactionMapper.updateByPrimaryKeySelective(transaction);
+        }
+        return tpTransactionMapper.selectByPrimaryKey(activityId,communityId);
+
+    }
 }

CODE/smart-community/app-api/src/main/java/com/community/huiju/service/impl/TaUserServiceImpl.java

@@ -137,4 +137,30 @@ public class TaUserServiceImpl implements ITaUserService {
         response.addSuccess(taUserVO);
         return response;
     }
+
+    @Override
+    public ResponseBean selectloginName(Integer id, String phone, String code) {
+        ResponseBean response = new ResponseBean();
+        TaUser user=taUserMapper.selectByPrimaryKey(id);
+        //系统验证码
+        String  codes= (String) AppkeyCache.getCache(user.getLoginName());
+        //用户电话
+            /*String  phones=user.getLoginName();*/
+        if(codes.equals(code)){
+            TaUser taUser=new TaUser();
+            taUser.setLoginName(phone);
+            taUser.setId(user.getId());
+            taUserMapper.ubdateLongName(taUser);
+             response.addSuccess("修改成功");
+            AppkeyCache.setCache(user.getLoginName(),"null");
+            return response;
+        }else {
+            response.addError("验证码错误");
+            return response;
+        }
+
+
+
+    }
+
 }

CODE/smart-community/app-api/src/main/resources/mapper/TaUserMapper.xml

@@ -258,4 +258,11 @@
     where login_name=#{loginName}
   </select>
 
+  <select id="ubdateLongName" parameterType="com.community.huiju.model.TaUser" resultMap="BaseResultMap">
+    update ta_user
+    set
+    login_name = #{loginName,jdbcType=VARCHAR}
+    where id = #{id,jdbcType=INTEGER}
+  </select>
+
 </mapper>

CODE/smart-community/app-api/src/main/resources/mapper/TpTransactionMapper.xml

@@ -29,7 +29,7 @@
     select 
     <include refid="Base_Column_List" />
     from tp_transaction
-    where id = #{id,jdbcType=INTEGER}
+    where id = #{id,jdbcType=INTEGER} and #{communityId,jdbcType=INTEGER}
   </select>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
     delete from tp_transaction