提交

CODE/smart-community/app-api/src/main/java/com/community/huiju/common/hk/HKOpenApi.java

@@ -11,6 +11,7 @@ import org.omg.CORBA.OBJ_ADAPTER;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.io.IOException;
+import java.io.UnsupportedEncodingException;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -613,26 +614,6 @@ public class HKOpenApi {
     
         return data;
     }
-    
-    public static void main(String[] args) {
-//        Map<String,Object> parMap = Maps.newHashMap();
-//        parMap.put("pageNo", 1);
-//        parMap.put("pageSize", 100);
-//        parMap.put("unitUuids", "e2a3606295f34bc5b336734f4894d708");
-//        String data = HKOpenApi.HKgetDoorDevicesByUnitUuids(parMap);
-
-//        Map<String,Object> parMap = Maps.newHashMap();
-//        parMap.put("longNums", "10010100000");
-//        String data = HKOpenApi.syncControl(parMap);
-
-//        Map<String, Object> map = new HashMap<>();
-//        map.put("pageNo", 1);
-//        map.put("pageSize", 100);
-//        HKOpenApi.getPersonInfosEx(map);
-
-        getDoors();
-
-    }
 
 
     /**
@@ -944,4 +925,41 @@ public class HKOpenApi {
         return data;
     }
 
+    /**
+     *  获取默认用户UUID
+     * @return
+     */
+    public static String getDefaultUserUuid(){
+        Map<String,Object> parMap = Maps.newHashMap();
+        String url = HKConstant.OPENAPI_IP_PORT_HTTP + HKConstant.ITF_ADDRESS_GET_DEFAULT_USER_UUID;
+        //设置APPKEY
+        parMap.put("appkey", HKConstant.APPKEY);
+        //设置时间参数
+        parMap.put("time", System.currentTimeMillis());
+        String params =  JSON.toJSONString(parMap);
+        log.info("获取 获取默认用户UUID 请求参数：{}", params);
+        String data = null;
+        try {
+            data = HttpClientSSLUtils.doPost(url + "?token=" + Digests.buildToken(url + "?" + params, params, HKConstant.SECRET), params);
+            log.info("获取 获取默认用户UUID 请求返回结果：{}",data);
+        } catch (Exception e) {
+            e.printStackTrace();
+            log.error("获取获取默认用户UUID失败!",e);
+            throw new RuntimeException("获取获取默认用户UUID失败!");
+        }
+
+        return data;
+    }
+
+    public static void main(String[] args) {
+        // getDefaultUserUuid();
+        String nickname = null;
+        try {
+            nickname = new String("æ\u009D¨é¡º".getBytes("ISO-8859-1"), "UTF-8");
+        } catch (UnsupportedEncodingException e) {
+            e.printStackTrace();
+        }
+        System.out.println(nickname);
+    }
+
 }

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

@@ -47,10 +47,9 @@ public class VistorController extends BaseController {
             return responseBean;
         }
 
-        UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
-        Integer userId = userElement.getId();
+        UserElement userElement = getUserElement(session);
         TaVisitor taVisitor = JSONObject.parseObject(parameter,TaVisitor.class);
-        responseBean = vistorServiceI.insertTaVistor(taVisitor, communityId, userId);
+        responseBean = vistorServiceI.insertTaVistor(taVisitor, userElement);
         return  responseBean;
     }
 

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

@@ -1,6 +1,7 @@
 package com.community.huiju.controller;
 
 import com.community.commom.mode.ResponseBean;
+import com.community.commom.session.UserElement;
 import com.community.huiju.service.WxLoginServiceI;
 import com.community.huiju.vo.TaUserVO;
 import io.swagger.annotations.Api;
@@ -80,4 +81,28 @@ public class WxLoginController extends BaseController {
 		}
 		return responseBean;
 	}
+
+	@RequestMapping(value = "/unbundlingWX", method = RequestMethod.PUT)
+	@ApiOperation(value = "解绑微信", notes = "解绑微信")
+	@ApiImplicitParams({
+			@ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token")
+	})
+	public ResponseBean unbundlingWX(HttpSession session) {
+		ResponseBean responseBean = new ResponseBean();
+		UserElement userElement = getUserElement(session);
+		responseBean = wxLoginService.unbundlingWX(userElement);
+		return responseBean;
+	}
+
+	@RequestMapping(value = "/bundlingWX/{wxcode}", method = RequestMethod.POST)
+	@ApiOperation(value = "绑定微信", notes = "绑定微信")
+	@ApiImplicitParams({
+			@ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token")
+	})
+	public ResponseBean bundlingWX(HttpSession session, @PathVariable("wxcode") String wxcode) {
+		ResponseBean responseBean = new ResponseBean();
+		UserElement userElement = getUserElement(session);
+		responseBean = wxLoginService.bundlingWX(userElement, wxcode);
+		return responseBean;
+	}
 }

CODE/smart-community/app-api/src/main/java/com/community/huiju/model/TpBillOrder.java

@@ -26,6 +26,11 @@ public class TpBillOrder {
      */
     private String orderStatus;
 
+    /**
+     * 缴费人手机号
+     */
+    private String payPhone;
+
     public Integer getId() {
         return id;
     }
@@ -105,4 +110,12 @@ public class TpBillOrder {
     public void setOrderStatus(String orderStatus) {
         this.orderStatus = orderStatus;
     }
+
+    public String getPayPhone() {
+        return payPhone;
+    }
+
+    public void setPayPhone(String payPhone) {
+        this.payPhone = payPhone;
+    }
 }

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

@@ -1,6 +1,7 @@
 package com.community.huiju.service;
 
 import com.community.commom.mode.ResponseBean;
+import com.community.commom.session.UserElement;
 import com.community.huiju.model.TaVisitor;
 
 import java.util.List;
@@ -15,11 +16,10 @@ public interface TaVistorServiceI {
     /**
      * 创建访客
      * @param taVisitor
-     * @param communityId
-     * @param userId
+     * @param userElement
      * @return
      */
-    ResponseBean insertTaVistor(TaVisitor taVisitor, Integer communityId, Integer userId);
+    ResponseBean insertTaVistor(TaVisitor taVisitor, UserElement userElement);
 
     /**
      * 访客邀请记录

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

@@ -1,6 +1,7 @@
 package com.community.huiju.service;
 
 import com.community.commom.mode.ResponseBean;
+import com.community.commom.session.UserElement;
 
 import javax.servlet.http.HttpServletRequest;
 
@@ -26,4 +27,19 @@ public interface WxLoginServiceI {
 	 * @return
 	 */
 	ResponseBean register(String parameter, HttpServletRequest request);
+
+	/**
+	 * 解绑微信
+	 * @param userElement
+	 * @return
+	 */
+	ResponseBean unbundlingWX(UserElement userElement);
+
+	/**
+	 * 登录成功的状态下，绑定微信
+	 * @param userElement
+	 * @param wxcode
+	 * @return
+	 */
+	ResponseBean bundlingWX(UserElement userElement, String wxcode);
 }

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

@@ -43,13 +43,14 @@ public class HKServiceImpl implements IHKService {
         TaUser user = taUserMapper.selectByPrimaryKey(Integer.parseInt(appUserId));
         // 这两个值一般都是同时存在的
         // 当这两个值不存在的时候，就添加海康人员
-        if (StringUtils.isBlank(user.getHkUserId() + "") && StringUtils.isBlank(user.getHkPersonNo() + "")) {
+        if (null == user.getHkUserId() && null == user.getHkPersonNo()) {
             // 设置 海康id
             user.setHkPersonNo(idGen.nextId());
             /**
              * 1.获取部门(比如 住户)
              * 2.根据部门编号推送 海康
              */
+            taUserMapper.updateByPrimaryKeySelective(user);
             addUserAndOpenCard(responseBean, user);
         }
 

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

@@ -397,7 +397,8 @@ public class SocialServiceImpl implements SocialServiceI {
 
         tpTransactions.stream().forEach(e -> {
             // 角色
-            TaSysRole taSysRole = taSysRoleMapper.findRoleByUserId(user.getId());
+            TaUserVerify userVerify = taUserVerifyMapper.selectByPrimaryKey(userElement.getUserVerifyId());
+            TaSysRole taSysRole = taSysRoleMapper.selectByPrimaryKey(userVerify.getRoleId());
             e.setRoleId(taSysRole.getId());
             e.setRoleName(taSysRole.getRoleName());
             e.setCreateUserName(user.getUserName());

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

@@ -3,6 +3,7 @@ package com.community.huiju.service.impl;
 import com.alibaba.fastjson.JSONObject;
 import com.community.commom.constant.Constant;
 import com.community.commom.mode.ResponseBean;
+import com.community.commom.session.UserElement;
 import com.community.huiju.common.hk.HKOpenApi;
 import com.community.huiju.dao.TaUserMapper;
 import com.community.huiju.dao.TaVisitorLicenseMapper;
@@ -42,15 +43,15 @@ public class TaVistorServiceImpl implements TaVistorServiceI {
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public ResponseBean insertTaVistor(TaVisitor taVisitor, Integer communityId, Integer userId) {
+    public ResponseBean insertTaVistor(TaVisitor taVisitor, UserElement userElement) {
         ResponseBean response = new ResponseBean();
 
-        taVisitor.setTaUserId(userId);
-        taVisitor.setUpdateUser(userId);
-        taVisitor.setCreateUser(userId);
+        taVisitor.setTaUserId(userElement.getId());
+        taVisitor.setUpdateUser(userElement.getId());
+        taVisitor.setCreateUser(userElement.getId());
         taVisitor.setCreateDate(new Date());
         taVisitor.setUpdateDate(new Date());
-        taVisitor.setCommunityId(communityId);
+        taVisitor.setCommunityId(userElement.getCommunityId());
 
         if (taVisitor.getVisitorStartTime().getTime() >= taVisitor.getVisitorEndTime().getTime()) {
             response.addError("开始时间不能大于等于离开时间!");
@@ -62,12 +63,12 @@ public class TaVistorServiceImpl implements TaVistorServiceI {
 
             for (String taCarLicense : taVisitor.getCarLicense()){
                 TaVisitorLicense taVisitorLicense = new TaVisitorLicense();
-                taVisitorLicense.setCommunityId(communityId);
+                taVisitorLicense.setCommunityId(userElement.getCommunityId());
                 taVisitorLicense.setVisitorId(taVisitor.getId());
                 taVisitorLicense.setLicense(taCarLicense);
-                taVisitorLicense.setCreateUser(userId);
+                taVisitorLicense.setCreateUser(userElement.getId());
                 taVisitorLicense.setCreateDate(new Date());
-                taVisitorLicense.setUpdateUser(userId);
+                taVisitorLicense.setUpdateUser(userElement.getId());
                 taVisitorLicense.setUpdateDate(new Date());
                 taVisitorLicenseMapper.insertSelective(taVisitorLicense);
             }
@@ -76,7 +77,7 @@ public class TaVistorServiceImpl implements TaVistorServiceI {
         }
 
         // 推送海康
-        temporaryRegister(userId,taVisitor,response);
+        temporaryRegister(userElement.getId(),taVisitor,response);
 
         return response;
     }

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

@@ -2,6 +2,7 @@ package com.community.huiju.service.impl;
 
 import com.alibaba.fastjson.JSONObject;
 import com.community.commom.mode.ResponseBean;
+import com.community.commom.session.UserElement;
 import com.community.commom.utils.BeanTools;
 import com.community.huiju.common.code.ICode;
 import com.community.huiju.common.perproties.LoginCodePerproties;
@@ -60,22 +61,15 @@ public class WxLoginServiceImpl implements WxLoginServiceI {
 	@Override
 	public ResponseBean getOpenidByWxcode(String wxcode) {
 		ResponseBean responseBean = new ResponseBean();
-		ApiConfig apiConfig = new ApiConfig("wx6070fd3e8ef854e4","cb07709de2f05b824f1ebda220684d3b", true);
-		logger.info("获取微信相关信息");
-		OauthAPI oauthAPI = new OauthAPI(apiConfig);
-		OauthGetTokenResponse codeResponse = oauthAPI.getToken(wxcode);
+
+		OauthGetTokenResponse codeResponse = getOauthGetTokenResponse(wxcode);
 		String openId = codeResponse.getOpenid();
 		logger.info("获取到wxcode:" + wxcode + " 获取到的openid: " + openId + "accesstoken: " + codeResponse.getAccessToken());
-		
+
 		//根据openId查询关联的手机号
 		TaUser taUser = taUserMapper.getByOpenId(openId);
 		if (null == taUser) {
-			//根据OPENID获取用户信息
-			RestTemplate restTemplate = new RestTemplate();
-			String wxUrl = "https://api.weixin.qq.com/sns/userinfo?access_token="+codeResponse.getAccessToken()+"&openid=" + openId;
-			String userInfo = restTemplate.getForEntity(wxUrl,String.class).getBody();
-			logger.info("获取到用户信息:" + userInfo);
-
+			String userInfo = getWXuserInfo(codeResponse.getAccessToken(), openId);
 			Map<String, Object> result = Maps.newHashMap();
 			result.put("userInfo", userInfo);
 			result.put("openid", openId);
@@ -91,6 +85,40 @@ public class WxLoginServiceImpl implements WxLoginServiceI {
 		return responseBean;
 	}
 
+	/**
+	 * 微信
+	 * 公共方法 OauthGetTokenResponse
+	 *
+	 * 	可以获取 openid， AccessToken 等
+	 *
+	 * @param wxcode
+	 * @return
+	 */
+	private OauthGetTokenResponse getOauthGetTokenResponse(String wxcode) {
+		ApiConfig apiConfig = new ApiConfig("wx6070fd3e8ef854e4","cb07709de2f05b824f1ebda220684d3b", true);
+		logger.info("获取微信相关信息");
+		OauthAPI oauthAPI = new OauthAPI(apiConfig);
+		OauthGetTokenResponse codeResponse = oauthAPI.getToken(wxcode);
+		return codeResponse;
+	}
+
+	/**
+	 * 微信
+	 * 公共方法，获取 微信用户信息
+	 * @param accessToken
+	 * @param openId
+	 * @return
+	 */
+	private String getWXuserInfo(String accessToken, String openId) {
+		//根据OPENID获取用户信息
+		RestTemplate restTemplate = new RestTemplate();
+		String wxUrl = "https://api.weixin.qq.com/sns/userinfo?access_token=" + accessToken + "&openid=" + openId;
+		String userInfo = restTemplate.getForEntity(wxUrl,String.class).getBody();
+		logger.info("获取到用户信息:" + userInfo);
+
+		return userInfo;
+	}
+
 	@Override
 	public ResponseBean associatedWX(String parameter) {
 		ResponseBean responseBean = new ResponseBean();
@@ -229,4 +257,40 @@ public class WxLoginServiceImpl implements WxLoginServiceI {
 		return response;
 	}
 
+
+	@Override
+	public ResponseBean unbundlingWX(UserElement userElement) {
+		ResponseBean responseBean = new ResponseBean();
+		TaUser taUser = taUserMapper.selectByPrimaryKey(userElement.getId());
+		taUser.setOpenid("");
+		taUserMapper.updateByPrimaryKeySelective(taUser);
+
+		responseBean.addSuccess("操作成功！");
+		return responseBean;
+	}
+
+	@Override
+	public ResponseBean bundlingWX(UserElement userElement, String wxcode) {
+		ResponseBean responseBean = new ResponseBean();
+
+		OauthGetTokenResponse codeResponse = getOauthGetTokenResponse(wxcode);
+		String openId = codeResponse.getOpenid();
+		logger.info("获取到wxcode:" + wxcode + " 获取到的openid: " + openId + "accesstoken: " + codeResponse.getAccessToken());
+
+		String userInfo = getWXuserInfo(codeResponse.getAccessToken(), openId);
+		JSONObject userInfoJSON = JSONObject.parseObject(userInfo);
+		String nickname = userInfoJSON.getString("nickname");
+		try {
+			nickname = new String(nickname.getBytes("ISO-8859-1"), "UTF-8");
+		} catch (UnsupportedEncodingException e) {
+			e.printStackTrace();
+		}
+		TaUser taUser = taUserMapper.selectByPrimaryKey(userElement.getId());
+		taUser.setOpenid(openId);
+		taUser.setNickname(nickname);
+		taUserMapper.updateByPrimaryKeySelective(taUser);
+
+		responseBean.addSuccess("操作成功!");
+		return responseBean;
+	}
 }

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

@@ -262,6 +262,7 @@ public class WxPayServiceImpl implements WxPayServiceI {
 			tpBillOrder.setUpdateDate(new Date());
 			tpBillOrder.setUpdateUser(userElement.getId());
 			tpBillOrder.setOrderBumber(orderNo);
+			tpBillOrder.setPayPhone(taUser.getLoginName());
 
 			tpBillOrderMapper.insertSelective(tpBillOrder);
 

CODE/smart-community/app-api/src/main/java/com/community/huiju/vo/TaUserVO.java

@@ -91,7 +91,7 @@ public class TaUserVO {
     /**  户号id **/
     private Integer roomNoId;
 
-    /** 是否绑定了微信 **/
+    /** 是否绑定了微信 0 未绑定  1 已绑定**/
     private Integer bindingWX;
 
     /**

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

@@ -11,14 +11,15 @@
     <result column="create_date" property="createDate" jdbcType="TIMESTAMP" />
     <result column="update_user" property="updateUser" jdbcType="INTEGER" />
     <result column="update_date" property="updateDate" jdbcType="TIMESTAMP" />
-    <result column="order_status" property="orderStatus" jdbcType="VARCHAR" />
+    <result column="order_status" property="orderStatus" jdbcType="CHAR" />
+    <result column="pay_phone" property="payPhone" jdbcType="VARCHAR" />
   </resultMap>
   <sql id="Base_Column_List" >
-    id, community_id, tp_bill_id, tp_bill_invoice_id, order_bumber, create_user, create_date, 
-    update_user, update_date, order_status
+    id, community_id, tp_bill_id, tp_bill_invoice_id, order_bumber, create_user, create_date,
+    update_user, update_date, order_status, pay_phone
   </sql>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
-    select 
+    select
     <include refid="Base_Column_List" />
     from tp_bill_order
     where id = #{id,jdbcType=INTEGER}
@@ -28,15 +29,14 @@
     where id = #{id,jdbcType=INTEGER}
   </delete>
   <insert id="insert" parameterType="com.community.huiju.model.TpBillOrder" >
-    insert into tp_bill_order (id, community_id, tp_bill_id, 
-      tp_bill_invoice_id, order_bumber, create_user, 
-      create_date, update_user, update_date, order_status
-      )
-    values (#{id,jdbcType=INTEGER}, #{communityId,jdbcType=INTEGER}, #{tpBillId,jdbcType=INTEGER}, 
-      #{tpBillInvoiceId,jdbcType=INTEGER}, #{orderBumber,jdbcType=VARCHAR}, #{createUser,jdbcType=INTEGER}, 
+    insert into tp_bill_order (id, community_id, tp_bill_id,
+      tp_bill_invoice_id, order_bumber, create_user,
+      create_date, update_user, update_date,
+      order_status, pay_phone)
+    values (#{id,jdbcType=INTEGER}, #{communityId,jdbcType=INTEGER}, #{tpBillId,jdbcType=INTEGER},
+      #{tpBillInvoiceId,jdbcType=INTEGER}, #{orderBumber,jdbcType=VARCHAR}, #{createUser,jdbcType=INTEGER},
       #{createDate,jdbcType=TIMESTAMP}, #{updateUser,jdbcType=INTEGER}, #{updateDate,jdbcType=TIMESTAMP},
-      #{orderStatus,jdbcType=VARCHAR}
-      )
+      #{orderStatus,jdbcType=CHAR}, #{payPhone,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.community.huiju.model.TpBillOrder" >
     insert into tp_bill_order
@@ -68,9 +68,12 @@
       <if test="updateDate != null" >
         update_date,
       </if>
-      <if test="orderStatus != null">
+      <if test="orderStatus != null" >
         order_status,
       </if>
+      <if test="payPhone != null" >
+        pay_phone,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides="," >
       <if test="id != null" >
@@ -100,8 +103,11 @@
       <if test="updateDate != null" >
         #{updateDate,jdbcType=TIMESTAMP},
       </if>
-      <if test="orderStatus != null">
-        #{orderStatus,jdbcType=VARCHAR},
+      <if test="orderStatus != null" >
+        #{orderStatus,jdbcType=CHAR},
+      </if>
+      <if test="payPhone != null" >
+        #{payPhone,jdbcType=VARCHAR},
       </if>
     </trim>
   </insert>
@@ -132,8 +138,11 @@
       <if test="updateDate != null" >
         update_date = #{updateDate,jdbcType=TIMESTAMP},
       </if>
-      <if test="orderStatus != null">
-        order_status = #{orderStatus,jdbcType=VARCHAR}
+      <if test="orderStatus != null" >
+        order_status = #{orderStatus,jdbcType=CHAR},
+      </if>
+      <if test="payPhone != null" >
+        pay_phone = #{payPhone,jdbcType=VARCHAR},
       </if>
     </set>
     where id = #{id,jdbcType=INTEGER}
@@ -148,46 +157,49 @@
       create_date = #{createDate,jdbcType=TIMESTAMP},
       update_user = #{updateUser,jdbcType=INTEGER},
       update_date = #{updateDate,jdbcType=TIMESTAMP},
-      order_status = #{orderStatus,jdbcType=VARCHAR}
+      order_status = #{orderStatus,jdbcType=CHAR},
+      pay_phone = #{payPhone,jdbcType=VARCHAR}
     where id = #{id,jdbcType=INTEGER}
   </update>
-
   <insert id="batchInsertSelective" parameterType="list" >
     insert into tp_bill_order
     values
-    <foreach collection="list" index="index" item="item" open="(" close=")" separator="," >
-      <trim suffixOverrides=",">
-        <if test="item.id != null" >
-          #{item.id,jdbcType=INTEGER},
-        </if>
-        <if test="item.communityId != null" >
-          #{item.communityId,jdbcType=INTEGER},
-        </if>
-        <if test="item.tpBillId != null" >
-          #{item.tpBillId,jdbcType=INTEGER},
-        </if>
-        <if test="item.tpBillInvoiceId != null" >
-          #{item.tpBillInvoiceId,jdbcType=INTEGER},
-        </if>
-        <if test="item.orderBumber != null" >
-          #{item.orderBumber,jdbcType=VARCHAR},
-        </if>
-        <if test="item.createUser != null" >
-          #{item.createUser,jdbcType=INTEGER},
-        </if>
-        <if test="item.createDate != null" >
-          #{item.createDate,jdbcType=TIMESTAMP},
-        </if>
-        <if test="item.updateUser != null" >
-          #{item.updateUser,jdbcType=INTEGER},
-        </if>
-        <if test="item.updateDate != null" >
-          #{item.updateDate,jdbcType=TIMESTAMP},
-        </if>
-        <if test="orderStatus != null">
-          order_status = #{orderStatus,jdbcType=VARCHAR},
-        </if>
-      </trim>
+    <foreach collection="list" index="index" item="item"  separator="," >
+        <trim suffixOverrides="," suffix="(" prefix=")">
+          <if test="item.id != null">
+            #{item.id,jdbcType=INTEGER},
+          </if>
+          <if test="item.communityId != null">
+            #{item.communityId,jdbcType=INTEGER},
+          </if>
+          <if test="item.tpBillId != null">
+            #{item.tpBillId,jdbcType=INTEGER},
+          </if>
+          <if test="item.tpBillInvoiceId != null">
+            #{item.tpBillInvoiceId,jdbcType=INTEGER},
+          </if>
+          <if test="item.orderBumber != null">
+            #{item.orderBumber,jdbcType=VARCHAR},
+          </if>
+          <if test="item.createUser != null">
+            #{item.createUser,jdbcType=INTEGER},
+          </if>
+          <if test="item.createDate != null">
+            #{item.createDate,jdbcType=TIMESTAMP},
+          </if>
+          <if test="item.updateUser != null">
+            #{item.updateUser,jdbcType=INTEGER},
+          </if>
+          <if test="item.updateDate != null">
+            #{item.updateDate,jdbcType=TIMESTAMP},
+          </if>
+          <if test="orderStatus != null">
+            #{orderStatus,jdbcType=VARCHAR},
+          </if>
+          <if test="payPhone != null">
+            #{payPhone,jdbcType=VARCHAR}
+          </if>
+        </trim>
     </foreach>
   </insert>
 </mapper>

CODE/smart-community/community-common/src/main/java/com/community/commom/constant/Constant.java

@@ -124,7 +124,7 @@ public class Constant {
 
 
     /** 添加用户所对应的部门 住户 **/
-    public static final String DEPT_RESIDENTS = "测试";
+    public static final String DEPT_RESIDENTS = "荟房会议室";
     
     /**
      * 报名状态 已报名

CODE/smart-community/community-common/target/maven-archiver/pom.properties

@@ -0,0 +1,4 @@
+#Created by Apache Maven 3.3.9
+version=0.0.1
+groupId=com.community
+artifactId=community-common

CODE/smart-community/community-common/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst

@@ -0,0 +1,32 @@
+com\community\commom\redis\RedisTemplate.class
+com\community\commom\redis\RedisConfiguration.class
+com\community\commom\utils\OssUtil.class
+com\community\commom\redis\SingleRedisTemplate.class
+com\community\commom\utils\EnumUtils.class
+com\community\commom\hk\HttpClientSSLUtils$2.class
+com\community\commom\redis\RedisJsonSerializer.class
+com\community\commom\uuid\IdGen.class
+com\community\commom\utils\BeanTools.class
+com\community\commom\hk\HttpClientSSLUtils.class
+com\community\commom\session\UserElement.class
+com\community\commom\utils\CommonUtils.class
+com\community\commom\redis\RedisSerializer.class
+com\community\commom\utils\StringConverter.class
+com\community\commom\mode\ResponseBean.class
+com\community\commom\utils\DESUtils.class
+com\community\commom\redis\FastJsonSerializer.class
+com\community\commom\utils\DateUtils.class
+com\community\commom\utils\HttpClientUtils.class
+com\community\commom\constant\Constant.class
+com\community\commom\utils\CookieUtil.class
+com\community\commom\mode\HkResponseBean.class
+com\community\commom\ailiyun\AESDecode.class
+com\community\commom\uuid\IdGen$IdGenHolder.class
+com\community\commom\utils\PayPriceUtils.class
+com\community\commom\hk\HttpClientSSLUtils$1.class
+com\community\commom\utils\MD5Utils.class
+com\community\commom\redis\RedisObjectSerializer.class
+com\community\commom\utils\QRCodeGeneratorUtils.class
+com\community\commom\redis\SerializationFailedException.class
+com\community\commom\hk\Digests.class
+com\community\commom\utils\AccountValidatorUtil.class

CODE/smart-community/community-common/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

@@ -0,0 +1,29 @@
+E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\redis\RedisJsonSerializer.java
+E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\ailiyun\AESDecode.java
+E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\hk\HttpClientSSLUtils.java
+E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\utils\PayPriceUtils.java
+E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\utils\DateUtils.java
+E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\utils\HttpClientUtils.java
+E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\utils\DESUtils.java
+E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\redis\RedisSerializer.java
+E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\utils\BeanTools.java
+E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\utils\OssUtil.java
+E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\redis\RedisObjectSerializer.java
+E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\utils\EnumUtils.java
+E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\redis\RedisTemplate.java
+E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\mode\HkResponseBean.java
+E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\redis\SerializationFailedException.java
+E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\utils\CommonUtils.java
+E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\utils\MD5Utils.java
+E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\session\UserElement.java
+E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\redis\SingleRedisTemplate.java
+E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\hk\Digests.java
+E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\utils\QRCodeGeneratorUtils.java
+E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\redis\RedisConfiguration.java
+E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\utils\AccountValidatorUtil.java
+E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\uuid\IdGen.java
+E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\mode\ResponseBean.java
+E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\utils\StringConverter.java
+E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\redis\FastJsonSerializer.java
+E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\constant\Constant.java
+E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\utils\CookieUtil.java

CODE/smart-community/property-api/src/main/java/com/community/huiju/controller/BillStatementController.java

@@ -29,13 +29,13 @@ import java.io.OutputStream;
 @RestController
 @RequestMapping("/")
 @RefreshScope
-@Api(value = "流水信息 API", description = "流水信息 API")
+@Api(value = "流水/订单 信息 API", description = "流水/订单 信息 API")
 public class BillStatementController extends BaseController {
 
     @Autowired
     private IBillStatementService iBillStatementService;
 
-    @ApiOperation(value = "获取流水信息", notes = "获取流水信息")
+    @ApiOperation(value = "获取订单信息", notes = "获取订单信息")
     @ApiImplicitParams({
             @ApiImplicitParam(dataTypeClass = String.class, paramType = "body", name = "parameter", value = "id流水编号," +
                     "billId缴费项编号,billName缴费项名称,billInvoiceId缴费单编号,payName缴费人"),

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

@@ -1,8 +1,14 @@
 package com.community.huiju.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.community.huiju.model.BillStatement;
 import com.community.huiju.model.TpBillOrder;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.Map;
 
 /**
  * <p>
@@ -15,4 +21,12 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface TpBillOrderMapper extends BaseMapper<TpBillOrder> {
 
+    /**
+     * 查询订单数据
+     * @param page
+     * @param map
+     * @return
+     */
+    IPage<TpBillOrder> getBillOrderAll(Page page, @Param("map") Map<String, Object> map);
+
 }

CODE/smart-community/property-api/src/main/java/com/community/huiju/model/TpBillOrder.java

@@ -1,6 +1,7 @@
 package com.community.huiju.model;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
@@ -9,6 +10,7 @@ import lombok.experimental.Accessors;
 
 import java.io.Serializable;
 import java.time.LocalDateTime;
+import java.util.List;
 
 /**
  * <p>
@@ -74,5 +76,33 @@ public class TpBillOrder implements Serializable {
      */
     private String orderStatus;
 
+    /**
+     * 缴费人手机号
+     */
+    private String payPhone;
+
+    /**
+     * 缴费组id列表
+     */
+    @TableField(exist = false)
+    private List<Integer> billIdList;
+
+
+    /**
+     * 缴费单id列表
+     */
+    @TableField(exist = false)
+    private List<Integer> billInvoiceIdList;
 
+    /**
+     * 缴费金额
+     */
+    @TableField(exist = false)
+    private Long sumPrice;
+
+    /**
+     * 缴费方式
+     */
+    @TableField(exist = false)
+    private String payType;
 }

CODE/smart-community/property-api/src/main/java/com/community/huiju/service/IBillStatementService.java

@@ -16,7 +16,7 @@ import com.community.huiju.model.BillStatement;
 public interface IBillStatementService extends IService<BillStatement> {
 
     /**
-     * 查询流水账单
+     * 查询 流水/订单 账单
      * @param userElement
      * @param parameter
      * @return

CODE/smart-community/property-api/src/main/java/com/community/huiju/service/impl/BillStatementServiceImpl.java

@@ -1,14 +1,18 @@
 package com.community.huiju.service.impl;
 
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.community.commom.mode.ResponseBean;
 import com.community.commom.session.UserElement;
+import com.community.huiju.dao.BillInvoiceMapper;
+import com.community.huiju.dao.TpBillOrderMapper;
 import com.community.huiju.model.BillInvoice;
 import com.community.huiju.model.BillStatement;
 import com.community.huiju.dao.BillStatementMapper;
+import com.community.huiju.model.TpBillOrder;
 import com.community.huiju.service.IBillStatementService;
 import com.google.common.collect.Maps;
 import org.apache.poi.hssf.usermodel.*;
@@ -18,6 +22,7 @@ import org.springframework.stereotype.Service;
 import java.text.SimpleDateFormat;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -33,6 +38,12 @@ public class BillStatementServiceImpl extends ServiceImpl<BillStatementMapper, B
     @Autowired
     private BillStatementMapper billStatementMapper;
 
+    @Autowired
+    private TpBillOrderMapper tpBillOrderMapper;
+
+    @Autowired
+    private BillInvoiceMapper billInvoiceMapper;
+
     @Override
     public ResponseBean getBillStatement(UserElement userElement, String parameter) {
         ResponseBean responseBean = new ResponseBean();
@@ -48,8 +59,8 @@ public class BillStatementServiceImpl extends ServiceImpl<BillStatementMapper, B
         String billName = jsonObject.getString("billName");
         // 缴费单 编号
         Integer billInvoiceId = jsonObject.getInteger("billInvoiceId");
-        // 缴费人
-        String payName = jsonObject.getString("payName");
+        // 缴费人手机号
+        String payPhone = jsonObject.getString("payPhone");
 
         // 参数
         Map<String, Object> map = Maps.newHashMap();
@@ -57,19 +68,49 @@ public class BillStatementServiceImpl extends ServiceImpl<BillStatementMapper, B
         map.put("billId", billId);
         map.put("billName", billName);
         map.put("billInvoiceId", billInvoiceId);
-        map.put("payName", payName);
+        map.put("payPhone", payPhone);
         map.put("communityId", userElement.getCommunityId());
 
-        Page<BillStatement> page = new Page<>();
+        Page<TpBillOrder> page = new Page<>();
         page.setCurrent(pageNum);
         page.setSize(pageSize);
-        IPage<BillStatement> billStatementIPage = billStatementMapper.getBillStatementAll(page, map);
+        IPage<TpBillOrder> billOrderIPage = tpBillOrderMapper.getBillOrderAll(page, map);
+        // 这里拿到的订单数据，都是进过去重之后的
+        List<TpBillOrder> orderRecords = billOrderIPage.getRecords();
+
+        /**
+         * 根据去重之后的订单，再去查询每个订单的缴费信息
+         */
+
+        // 1.查询缴费组id集合
+        // 2.查询缴费单id集合
+        // 3.缴费单总金额
+
+        orderRecords.forEach(e-> {
+            QueryWrapper<TpBillOrder> billOrderQueryWrapper = new QueryWrapper<>();
+            billOrderQueryWrapper.eq("order_bumber", e.getOrderBumber());
+            List<TpBillOrder> childBillOrderList = tpBillOrderMapper.selectList(billOrderQueryWrapper);
+
+            // 缴费组id集合
+            List<Integer> billIdCollect = childBillOrderList.stream().map(billOrder -> billOrder.getTpBillId()).collect(Collectors.toList());
+            // 缴费单id集合
+            List<Integer> billInvoiceIdCollect = childBillOrderList.stream().map(billOrder -> billOrder.getTpBillInvoiceId()).collect(Collectors.toList());
+            // 总金额
+            Long sumPrice = childBillOrderList.stream().map(billOrder -> {
+                BillInvoice billInvoice = billInvoiceMapper.selectById(billOrder.getTpBillInvoiceId());
+                return billInvoice.getPayPrice();
+            }).count();
+
+            e.setBillIdList(billIdCollect);
+            e.setBillInvoiceIdList(billInvoiceIdCollect);
+            e.setSumPrice(sumPrice);
+        });
 
         Map<String, Object> respMap = Maps.newHashMap();
-        respMap.put("list", billStatementIPage.getRecords());
-        respMap.put("pageNum", billStatementIPage.getCurrent());
-        respMap.put("pageSize", billStatementIPage.getSize());
-        respMap.put("total", billStatementIPage.getTotal());
+        respMap.put("list", orderRecords);
+        respMap.put("pageNum", billOrderIPage.getCurrent());
+        respMap.put("pageSize", billOrderIPage.getSize());
+        respMap.put("total", billOrderIPage.getTotal());
 
         responseBean.addSuccess(respMap);
         return responseBean;

CODE/smart-community/property-api/src/main/resources/mapper/BillOrderMapper.xml

@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.community.huiju.dao.TpBillOrderMapper">
+
+    <select id="getBillOrderAll" resultType="com.community.huiju.model.TpBillOrder">
+        SELECT
+        tbo.*,
+        tbs.pay_remark as payRemark,
+        tbs.pay_type as payType
+        FROM
+        tp_bill_order tbo LEFT JOIN tp_bill_statement tbs on tbo.tp_bill_invoice_id = tbs.bill_invoice_id
+        LEFT JOIN tp_bill tb on tbo.tp_bill_id = tb.id
+        <where>
+            <trim prefixOverrides="and | or">
+                <if test="map.id != null">
+                    and tbo.id like CONCAT('%',#{map.id},'%')
+                </if>
+                <if test="map.billId != null">
+                    and tbo.tp_bill_id like CONCAT('%',#{map.billId},'%')
+                </if>
+                <if test="map.billName != null and map.billName != ''">
+                    and tb.bill_name like CONCAT('%',#{map.billName},'%')
+                </if>
+                <if test="map.billInvoiceId != null">
+                    and tbo.tp_bill_invoice_id like CONCAT('%',#{map.billInvoiceId},'%')
+                </if>
+                <if test="map.payPhone != null and map.payPhone != ''">
+                    and tbo.pay_phone like CONCAT('%', #{map.payPhone},'%')
+                </if>
+                <if test="map.communityId != null">
+                    and tbo.community_id = #{map.communityId}
+                </if>
+            </trim>
+        </where>
+        group by tbo.order_bumber
+        order by tbo.create_date DESC
+    </select>
+
+</mapper>

VUECODE/smart-property-manage/src/api/billStatement.js

@@ -10,7 +10,7 @@ export function getBillStatementAll(data) {
       billId: data.billId, // 缴费项 id
       billName: data.billName, //  缴费项 名称
       billInvoiceId: data.billInvoiceId, // 缴费单 编号
-      payName: data.payName, //  缴费人
+      payPhone: data.payName, //  缴费人手机号
       pageNum: data.pageNum,
       pageSize: data.pageSize
     }

VUECODE/smart-property-manage/src/views/bill/statement/index.vue

@@ -13,8 +13,8 @@
       <el-form-item label="收费单号">
         <el-input v-model="formInline.billInvoiceId" placeholder="收费单号"/>
       </el-form-item>
-      <el-form-item label="缴费人">
-        <el-input v-model="formInline.payName" placeholder="缴费人"/>
+      <el-form-item label="缴费人手机号">
+        <el-input v-model="formInline.payPhone" placeholder="缴费人手机号"/>
       </el-form-item>
       <el-form-item>
         <el-button type="info" @click="clear">清空</el-button>
@@ -24,6 +24,7 @@
     <el-button type="primary" style="margin-left: 20px; margin-bottom: 20px;" @click="exportExcel">导出数据</el-button>
     <el-table
       ref="multipleTable"
+      v-loading="loading"
       :data="list"
       border
       tooltip-effect="dark"
@@ -44,33 +45,36 @@
         align="center"
         label="收费组编号">
         <template slot-scope="scope">
-          <span style="color: #409EFF;cursor: pointer" @click="getInfo(scope.row.billId)">{{ scope.row.billId }}</span>
+          <span v-for="item in scope.row.billIdList">
+            <a style="color: #409EFF;cursor: pointer" @click="getInfo(item)">{{ item }}</a>,
+          </span>
         </template>
       </el-table-column>
       <el-table-column
-        prop="billName"
-        label="收费组名称"
+        prop="billInvoiceId"
+        label="收费单号"
         align="center"
-        show-overflow-tooltip>
+        width="120">
         <template slot-scope="scope">
-          <span style="color: #409EFF;cursor: pointer" @click="getInfo(scope.row.billId)">{{ scope.row.billName }}</span>
+          <span v-for="item in scope.row.billInvoiceIdList">
+            <a style="color: #409EFF;cursor: pointer">{{ item }}</a>,
+          </span>
         </template>
       </el-table-column>
-      <el-table-column
-        prop="billInvoiceId"
-        label="收费单号"
-        align="center"
-        width="120"/>
       <el-table-column
         prop="payPrice"
         align="center"
-        label="费用金额">
-        <template slot-scope="scope">{{ showPayPrice(scope.row.payPrice) }}</template>
+        label="总费用金额">
+        <template slot-scope="scope">{{ showPayPrice(scope.row.sumPrice) }}</template>
       </el-table-column>
       <el-table-column
-        prop="payName"
+        prop="orderStatus"
+        align="center"
+        label="订单状态"/>
+      <el-table-column
+        prop="payPhone"
         align="center"
-        label="缴费人"/>
+        label="缴费人手机号"/>
       <el-table-column
         prop="payRemark"
         align="center"
@@ -85,7 +89,13 @@
         prop="createTime"
         align="center"
         label="订单生成时间">
-        <template slot-scope="scope">{{ formatDate(scope.row.createTime) }}</template>
+        <template slot-scope="scope">{{ formatDate(scope.row.createDate) }}</template>
+      </el-table-column>
+      <el-table-column
+        prop="createTime"
+        align="center"
+        label="缴费完成时间">
+        <template slot-scope="scope">{{ formatDate(scope.row.updateDate) }}</template>
       </el-table-column>
     </el-table>
     <div class="foot-page">
@@ -111,10 +121,11 @@ export default {
         billId: '', // 缴费项 id
         billName: '', //  缴费项 名称
         billInvoiceId: '', // 缴费单 编号
-        payName: '', //  缴费人
+        payPhone: '', //  缴费人手机号
         pageNum: 1,
         pageSize: 10
       },
+      loading: false,
       list: [], // 数据
       total: 0 // 总数
     }
@@ -137,13 +148,16 @@ export default {
       this.getBillStatement()
     },
     getBillStatement() { //  获取流水信息
+      this.loading = true
       this.$store.dispatch('GetBillStatementAll', this.formInline).then(res => {
+        this.loading = false
         const resData = res.data
         this.list = resData.list
         this.formInline.pageNum = resData.pageNum
         this.formInline.pageSize = resData.pageSize
         this.total = resData.total
       }).catch(() => {
+        this.loading = false
         console.log('error GetBillStatementAll')
       })
     },
@@ -211,6 +225,15 @@ export default {
       }).catch(() => {
         console.log('error ExportBillStatementExcel')
       })
+    },
+    showBillArray(billIdList) { // 收费组id 集合
+      let aStr = ''
+      billIdList = ['1001', '1002']
+      billIdList.map((item, index) => {
+        aStr += `<a style="color: #409EFF;cursor: pointer" @click="getInfo(` + item + `)">` + item + `</a>,`
+      })
+
+      return aStr
     }
   }
 }