修复 bug

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

@@ -59,13 +59,13 @@ public class AliPayController {
 	@ApiOperation(value = "统一下单", notes = "统一下单")
 	@ApiImplicitParams({ @ApiImplicitParam(paramType = "path", dataType = "Integer", name = "billInvoiceId", value = "账单Id"),
 			@ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token") })
-	@RequestMapping(value = "/aliPayOrder/{billInvoiceId}",method = RequestMethod.GET)
-	public ResponseBean wxUnifiedOrder(@PathVariable("billInvoiceId") Integer billInvoiceId, HttpSession session){
+	@RequestMapping(value = "/aliPayOrder/{outTradeNo}",method = RequestMethod.GET)
+	public ResponseBean wxUnifiedOrder(@PathVariable("outTradeNo") String outTradeNo, HttpSession session){
 		ResponseBean responseBean = new ResponseBean();
 		UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
 		String resp = "";
 		try {
-			resp = aliPayService.AliPayOrder(billInvoiceId,userElement);
+			resp = aliPayService.AliPayOrder(outTradeNo,userElement);
 		} catch (Exception e) {
 			e.printStackTrace();
 			responseBean.addError(e.getMessage());

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

@@ -65,4 +65,13 @@ public class BaseController {
         return userElement;
     }
 
+    /**
+     * 删除 用户 session
+     * @param session
+     */
+    protected void removeUserElement(HttpSession session) {
+        log.info("用户当前sessionId：{}", session.getId());
+        session.removeAttribute(Constant.APP_USER_SESSION);
+    }
+
 }

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

@@ -87,15 +87,14 @@ public class UserController extends BaseController {
 
     @ApiOperation(value = "修改手机号", notes = "修改手机号")
     @ApiImplicitParams({
-            @ApiImplicitParam(paramType = "body",dataType = "String",name = "paramets",value = "phone：登陆(手机号)，code：(手机验证码),otherUserId:(租客或者家属ID，空为业主本人)"),
+            @ApiImplicitParam(paramType = "body",dataType = "String",name = "paramets",value = "phone：登陆(手机号)，code：(手机验证码)"),
             @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token")
     })
             @RequestMapping(value = "/user/phone",method = RequestMethod.PUT)
     public ResponseBean update(@RequestBody String paramets, HttpSession session){
         ResponseBean responseBean = new ResponseBean();
-        UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
-        Integer userId=userElement.getId();
-        ResponseBean response=iTaUserService.upDateloginName(userId,paramets,userElement.getCommunityId());
+        UserElement userElement = getUserElement(session);
+        ResponseBean response=iTaUserService.updateLoginName(userElement, paramets);
         return response;
     }
 
@@ -120,13 +119,8 @@ public class UserController extends BaseController {
     public ResponseBean updateUserNameAndGender(@RequestBody String parameter,
                                                 HttpSession session){
         ResponseBean response = new ResponseBean();
-
-        UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
-
-        TaUser user = JSONObject.parseObject(parameter,TaUser.class);
-        user.setId(userElement.getId());
-
-        response = iTaUserService.modifyUser(user);
+        UserElement userElement = getUserElement(session);
+        response = iTaUserService.modifyUser(userElement, parameter);
         return response;
 
     }
@@ -231,6 +225,11 @@ public class UserController extends BaseController {
         ResponseBean response = new ResponseBean();
         UserElement userElement = getUserElement(session);
         response = iTaUserService.getUserInfo(userElement,userId);
+        if ("1".equals(response.getCode())) {
+            // 清空 session
+            removeUserElement(session);
+            return response;
+        }
         TaUserVO userVO = (TaUserVO) response.getData();
         userVO.setToken(session.getId());
 
@@ -244,6 +243,7 @@ public class UserController extends BaseController {
             @ApiImplicitParam(paramType = "path", dataTypeClass = Integer.class, name = "communityId", value = "小区Id"),
     })
     @RequestMapping(value = "/user/temporary/{communityId}", method = RequestMethod.POST)
+    @Deprecated
     public ResponseBean temporaryLogin(@PathVariable Integer communityId, HttpSession session) {
         ResponseBean responseBean = new ResponseBean();
         responseBean = iTaUserService.temporaryLogin(communityId);

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

@@ -1,12 +1,14 @@
 package com.community.huiju.dao;
 
 import com.community.huiju.model.TpBillOrder;
+import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.ResultMap;
 import org.apache.ibatis.annotations.Select;
 
 import java.util.List;
 
+@Mapper
 public interface TpBillOrderMapper {
     int deleteByPrimaryKey(Integer id);
 

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

@@ -8,9 +8,9 @@ public interface AliPayServiceI {
 	/**
 	 * 微信支付统一下单
 	 * @return
-	 * @param billInvoiceId
+	 * @param outTradeNo
 	 * @param userElement
 	 */
-	String AliPayOrder(Integer billInvoiceId, UserElement userElement) throws Exception;
+	String AliPayOrder(String outTradeNo, UserElement userElement) throws Exception;
 	
 }

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

@@ -43,10 +43,11 @@ public interface ITaUserService {
 
     /**
      * 修改当前用户手机号
-     * @param id
+     * @param userElement
+     * @param paramets
      * @return
      */
-    ResponseBean upDateloginName(Integer id, String paramets,Integer communityId);
+    ResponseBean updateLoginName(UserElement userElement, String paramets);
 
     /**
      * 获取房屋成员列表
@@ -57,10 +58,11 @@ public interface ITaUserService {
 
     /**
      * 修改用户
-     * @param user
+     * @param userElement
+     * @param parameter
      * @return
      */
-    ResponseBean modifyUser(TaUser user);
+    ResponseBean modifyUser(UserElement userElement, String parameter);
 
     /**
      * 停用用户 或者 启用用户

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

@@ -11,15 +11,13 @@ import com.community.huiju.common.wxpay.HfWxConfig;
 import com.community.huiju.common.wxpay.WXPay;
 import com.community.huiju.common.wxpay.WXPayConstants;
 import com.community.huiju.common.wxpay.WXPayUtil;
-import com.community.huiju.dao.TaSysRoleMapper;
-import com.community.huiju.dao.TaUserMapper;
-import com.community.huiju.dao.TpBillInvoiceMapper;
-import com.community.huiju.dao.TpBillMapper;
-import com.community.huiju.dao.TpBillStatementMapper;
+import com.community.huiju.dao.*;
 import com.community.huiju.model.TaSysRole;
 import com.community.huiju.model.TaUser;
 import com.community.huiju.model.TpBillInvoice;
+import com.community.huiju.model.TpBillOrder;
 import com.community.huiju.service.AliPayServiceI;
+import org.apache.commons.collections.CollectionUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -28,6 +26,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
+import java.util.List;
 
 import static com.alipay.api.AlipayConstants.CHARSET_UTF8;
 
@@ -54,6 +53,9 @@ public class AliPayServiceImpl implements AliPayServiceI {
 
 	@Autowired
 	private TaSysRoleMapper taSysRoleMapper;
+
+	@Autowired
+	private TpBillOrderMapper tpBillOrderMapper;
 	
 	@Value("${alipay.APP_PRIVATE_KEY}")
 	private String APP_PRIVATE_KEY;
@@ -68,29 +70,23 @@ public class AliPayServiceImpl implements AliPayServiceI {
 	 * 支付宝统一下单
 	 *
 	 * @return
-	 * @param billInvoiceId
+	 * @param outTradeNo
 	 * @param userElement
 	 */
 	@Override
 	@Transactional(rollbackFor = Exception.class)
-	public String AliPayOrder(Integer billInvoiceId, UserElement userElement) throws Exception {
+	public String AliPayOrder(String outTradeNo, UserElement userElement) throws Exception {
 		Integer userId = userElement.getId();
 
-		// 如果是家属/租客, 应该用业主的用户id
-		TaUser taUser = taUserMapper.selectByPrimaryKey(userId);
-		TaSysRole taSysRole = taSysRoleMapper.findRoleByUserId(userId);
-		if (null != taSysRole && taSysRole.getId().intValue() != 1) {
-			TaUser ownerUser = taUserMapper.selectByPrimaryKey(taUser.getParentId());
-			userId = ownerUser.getId();
-		}
-
 		//获取支付金额
-		TpBillInvoice tpBillInvoice = tpBillInvoiceMapper.selectByIdAndUserId(billInvoiceId,userId,userElement.getCommunityId());
-		if (null == tpBillInvoice){
+		List<TpBillOrder> billOrderList = tpBillOrderMapper.selectByOrderBumber(outTradeNo);
+		if (CollectionUtils.isEmpty(billOrderList)){
 			throw new Exception("订单不存在");
-		}else if (!tpBillInvoice.getBillStatus().equals("3")){
-			throw new Exception("不是正在支付的订单");
 		}
+
+		// 计算金额
+		Integer payPrice = billOrderList.stream().mapToInt(e -> tpBillInvoiceMapper.selectByPrimaryKey(e.getTpBillInvoiceId()).getPayPrice()).sum();
+
 		
 		//下单
 		AlipayClient alipayClient = new DefaultAlipayClient("https://openapi.alipay.com/gateway.do", ALI_APP_ID, APP_PRIVATE_KEY, "json", CHARSET_UTF8, ALIPAY_PUBLIC_KEY, "RSA2");
@@ -98,11 +94,11 @@ public class AliPayServiceImpl implements AliPayServiceI {
 		AlipayTradeAppPayRequest request = new AlipayTradeAppPayRequest();
 		//SDK已经封装掉了公共参数，这里只需要传入业务参数。以下方法为sdk的model入参方式(model和biz_content同时存在的情况下取biz_content)。
 		AlipayTradeAppPayModel model = new AlipayTradeAppPayModel();
-		model.setBody(tpBillInvoice.getBillName());
-		model.setSubject(tpBillInvoice.getBillName());
-		model.setOutTradeNo(tpBillInvoice.getOutTradeNo());
+		model.setBody("缴费");
+		model.setSubject("缴费");
+		model.setOutTradeNo(outTradeNo);
 		model.setTimeoutExpress("30m");
-		model.setTotalAmount(BigDecimal.valueOf(Long.valueOf(tpBillInvoice.getPayPrice())).divide(new BigDecimal(100)).toString());
+		model.setTotalAmount(BigDecimal.valueOf(Long.valueOf(payPrice)).divide(new BigDecimal(100)).toString());
 		model.setProductCode("QUICK_MSECURITY_PAY");
 		request.setBizModel(model);
 		request.setNotifyUrl("http://106.14.20.193:8086/app-api/aliPayNotify");

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

@@ -239,35 +239,18 @@ public class TaUserServiceImpl implements ITaUserService {
 
     @Transactional(rollbackFor = Exception.class)
     @Override
-    public ResponseBean upDateloginName(Integer id, String paramets,Integer communityId) {
+    public ResponseBean updateLoginName(UserElement userElement, String paramets) {
         ResponseBean response = new ResponseBean();
 
         JSONObject jsonObject = JSONObject.parseObject(paramets);
         String phone = (String) jsonObject.get("phone");
         String code = (String) jsonObject.get("code");
-        String otherUserId = (String) jsonObject.get("otherUserId");
 
-        // 默认为当前用户
-        Integer userId = id;
+        TaUser user=taUserMapper.selectByPrimaryKey(userElement.getId());
 
-        if (StringUtils.isNotBlank(otherUserId)) {
-            /**校验otherUserId是否为当前登入用户的家属和业主**/
-            response=getTaFaceParentId( id, Integer.valueOf(otherUserId));
-            if ("1".equals(response.getCode())) {
-                return response;
-            }
-            userId = Integer.valueOf(otherUserId.trim());
-        }
+        // 校验手机号和验证码
+        iCode.checkPhoneAndCode(phone, code);
 
-        TaUser user=taUserMapper.selectByPrimaryKey(userId);
-        //系统验证码
-        String  codes= (String) AppkeyCache.getCache(phone);
-        //用户电话
-            /*String  phones=user.getLoginName();*/
-        if (!AccountValidatorUtil.isPhone(phone)){
-            response.addError("请输入正确的手机号!");
-            return response;
-        }
         //当前小区下的电话校验
         TaUser loginName=taUserMapper.getByLoginName(user.getCommunityId(),phone);
         if (null!=loginName)  {
@@ -282,42 +265,35 @@ public class TaUserServiceImpl implements ITaUserService {
             return response;
         }
 
-        if ("1234".equals(code)) {
+        // 修改号码
+        TaUser taUser=new TaUser();
+        taUser.setLoginName(phone);
+        taUser.setId(user.getId());
+        taUser.setUpdateDate(new Date());
+        taUser.setUpdateUser(user.getId());
+        taUserMapper.updateLongName(taUser);
+        response.addSuccess("修改成功");
 
-        }else if (StringUtils.isBlank(code) || !codes.equals(code)) {
-            response.addError("验证码错误!");
-            return response;
-        }
-            TaUser taUser=new TaUser();
-            taUser.setLoginName(phone);
-            taUser.setId(userId);
-            taUser.setUpdateDate(new Date());
-            taUser.setUpdateUser(id);
-            taUserMapper.updateLongName(taUser);
-            response.addSuccess("修改成功");
-            AppkeyCache.setCache(user.getLoginName(),"null");
+        /**
+         * 如果是 家属或者租客,修改手机号, 就不允许修改资料库的信息
+         * 根据房产判断 当前是否是 业主
+         */
 
+        TaUserVerify userVerify = taUserVerifyMapper.selectByPrimaryKey(userElement.getUserVerifyId());
+        TaSysRole sysRole = taSysRoleMapper.selectByPrimaryKey(userVerify.getRoleId());
 
-            /**
-             * 如果是家属或者租客,修改手机号, 就不允许修改资料库的信息
-             */
+        // 修改楼栋信息资料库的手机号
+        // 1 业主 2 租客 3 家属
+        // 只允许业主修改
+        if (null != sysRole && sysRole.getId().intValue() == 1) {
+            TpBuildingOwnerInfo buildingOwnerInfo = tpBuildingOwnerInfoMapper.selectByPrimaryKey(userVerify.getRoomNoId());
+            buildingOwnerInfo.setOwnerTel(phone);
+            tpBuildingOwnerInfoMapper.updateByPrimaryKeySelective(buildingOwnerInfo);
+        }
 
-            // 修改楼栋信息资料库的手机号
-            Map<String, Object> roleMap = Maps.newHashMap();
-            roleMap.put("communityId", user.getCommunityId());
-            roleMap.put("userId", userId);
-            TaSysUserRole taSysUserRole = taSysUserRoleMapper.selectByCommunityIdAndUserId(roleMap);
-            // 1 业主 2 租客 3 家属
-            // 只允许业主修改
-            if (taSysUserRole.getRoleId().intValue() == 1) {
-                // TODO 后期可能会有一个业主对应多个小区, 也就是会有多个资料, 具体看需求
-                // TODO 目前是一对一
-                TpBuildingOwnerInfo buildingOwnerInfo = tpBuildingOwnerInfoMapper.selectByPrimaryKey(user.getBuildingOwnerInfoId());
-                buildingOwnerInfo.setOwnerTel(phone);
-                tpBuildingOwnerInfoMapper.updateByPrimaryKeySelective(buildingOwnerInfo);
-            }
-            response.addSuccess(new String[0]);
-            return response;
+        // 给前端返回一个空数组
+        response.addSuccess(new String[0]);
+        return response;
     }
 
     public ResponseBean getTaFaceParentId(Integer userId,Integer otherUserId){
@@ -346,28 +322,33 @@ public class TaUserServiceImpl implements ITaUserService {
 
     @Transactional(rollbackFor = Exception.class)
     @Override
-    public ResponseBean modifyUser(TaUser user) {
+    public ResponseBean modifyUser(UserElement userElement, String parameter) {
 
         ResponseBean response = new ResponseBean();
 
-        TaUser taUser = taUserMapper.selectByPrimaryKey(user.getId());
-        HashMap map= new HashMap<>();
-                map.put("communityId",taUser.getCommunityId());
-                map.put("userId",taUser.getId());
-        TaSysUserRole TaSysUserRole= taSysUserRoleMapper.selectByCommunityIdAndUserId(map);
+        // 前台提交的数据
+        TaUser user = JSONObject.parseObject(parameter, TaUser.class);
+        // 数据库数据
+        TaUser taUser = taUserMapper.selectByPrimaryKey(userElement.getId());
+
+        /**
+         * 判断是否 是业主，如果业主就连着 楼栋资料库 信息修改
+         */
+
+        TaSysRole sysRole = taSysRoleMapper.selectByPrimaryKey(userElement.getUserVerifyId());
+
         BeanTools.copyProperties(user, taUser);
-            int result = taUserMapper.updateByPrimaryKeySelective(taUser);
-            int VerifyStatus= Integer.parseInt(taUser.getVerifyStatus());
-            int Role= TaSysUserRole.getRoleId();
-            if (1==VerifyStatus &&1==Role) {
-            TpBuildingOwnerInfo TpBuildingOwnerInfo = new TpBuildingOwnerInfo();
-            TpBuildingOwnerInfo.setOwnerName(user.getUserName());
-            TpBuildingOwnerInfo.setGender(user.getGender());
-            TpBuildingOwnerInfo.setOwnerTel(user.getLoginName());
-            TpBuildingOwnerInfo.setUpdateDate(new Date());
-            TpBuildingOwnerInfo.setUpdateUser(taUser.getId());
-            TpBuildingOwnerInfo.setId(taUser.getBuildingOwnerInfoId());
-            tpBuildingOwnerInfoMapper.updateByPrimaryKeySelective(TpBuildingOwnerInfo);
+        int result = taUserMapper.updateByPrimaryKeySelective(taUser);
+        // int VerifyStatus= Integer.parseInt(taUser.getVerifyStatus());
+        if (1 == sysRole.getId()) {
+            TpBuildingOwnerInfo tpBuildingOwnerInfo = new TpBuildingOwnerInfo();
+            tpBuildingOwnerInfo.setOwnerName(user.getUserName());
+            tpBuildingOwnerInfo.setGender(user.getGender());
+            tpBuildingOwnerInfo.setOwnerTel(user.getLoginName());
+            tpBuildingOwnerInfo.setUpdateDate(new Date());
+            tpBuildingOwnerInfo.setUpdateUser(taUser.getId());
+            tpBuildingOwnerInfo.setId(userElement.getRoomNoId());
+            tpBuildingOwnerInfoMapper.updateByPrimaryKeySelective(tpBuildingOwnerInfo);
         }
         if (result > 0){
             response.addSuccess("修改成功!");
@@ -520,10 +501,10 @@ public class TaUserServiceImpl implements ITaUserService {
             response.addError("当前用户不存在!");
             return response;
         }
-        if (taUser.getVerifyStatus().equals("0") || taUser.getVerifyStatus().equals("2")) {
-            response.addError("对不起,您未认证或认证已作废!");
-            return response;
-        }
+//        if (taUser.getVerifyStatus().equals("0") || taUser.getVerifyStatus().equals("2")) {
+//            response.addError("对不起,您未认证或认证已作废!");
+//            return response;
+//        }
         // 当前用户的身份
         TaSysRole role = taSysRoleMapper.findRoleByUserId(taUser.getId());
         if (!"OWNER".equals(role.getRoleName())) {
@@ -810,6 +791,14 @@ public class TaUserServiceImpl implements ITaUserService {
             response.addError("用户不存在！");
             return response;
         }
+        // 当 解除了这个房产关联关系的时候，就不能获取到用户信息
+        TaUserVerify userVerify = taUserVerifyMapper.selectByPrimaryKey(userElement.getUserVerifyId());
+        if (null == userVerify) {
+            response.addError("无关联该房产");
+            return response;
+        }
+
+        // 查询 家属或者租客
         if (null != userId) {
             TaUser todUser = taUserMapper.selectByPrimaryKey(userId);
             TaUserVerify todUserVerify = taUserVerifyMapper.selectCommunityAndAddress(userId, userElement.getCommunityId(), userElement.getPhaseId(), userElement.getBuildingId(), userElement.getUnitId(), userElement.getLevelId(), userElement.getRoomNoId());

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

@@ -76,7 +76,7 @@ public class WxPayServiceImpl implements WxPayServiceI {
 		
 		//下单
 		Map<String, String> data = new HashMap<String, String>();
-		data.put("body", "订单");
+		data.put("body", "缴费");
 		//商品号唯一
 		data.put("out_trade_no", orderNo);
 		data.put("device_info", "");