feats

pom.xml

 	</parent>
 	<groupId>com.huiju</groupId>
 	<artifactId>xiangsong</artifactId>
-	<version>1.1.5</version>
+	<version>1.1.7</version>
 	<name>xiangsong</name>
 	<description>香颂</description>
 

src/main/java/com/huiju/estateagents/center/taUser/service/impl/TaUserServiceImpl.java

 
         iTaUserCommunityService.addUserCommunity(taUser.getOrgId(), taUser.getUserId(), taUser.getCommunityList());
 
+        //更新person
+        if (!StringUtils.isEmpty(taUser.getPhone())) {
+            TaPerson taPerson = new TaPerson();
+            taPerson.setAvatarurl(taUser.getAvatar());
+            taPerson.setCompany(taUser.getOrgName());
+            taPerson.setTel(taUser.getPhone());
+            taPerson.setName(taUser.getUserName());
+            taPerson.setAddress(taUser.getAddress());
+            taPerson.setIdNo(taUser.getIdNo());
+            taPerson.setDepartment(taUser.getDepartment());
+            taPerson.setPost(taUser.getPosition());
+            taPerson.setPhoto(taUser.getPhoto());
+            taPerson.setPersonType(CommConstant.PERSON_LIFE_CONSULTANT);
+            taPerson.setUserId(taUser.getUserId());
+            QueryWrapper<TaPerson> taPersonQueryWrapper = new QueryWrapper<>();
+            taPersonQueryWrapper.eq("org_id", taUser.getOrgId());
+            taPersonQueryWrapper.eq("phone", taUser.getPhone());
+
+            taPersonMapper.update(taPerson, taPersonQueryWrapper);
+        }
+
         return taUser;
     }
 
         iTaUserCommunityService.addUserCommunity(taUser.getOrgId(), taUser.getUserId(), taUser.getCommunityList());
 
         //更新person
-        TaPerson taPerson = new TaPerson();
-        taPerson.setAvatarurl(taUser.getAvatar());
-        taPerson.setCompany(taUser.getOrgName());
-        taPerson.setTel(taUser.getPhone());
-        taPerson.setName(taUser.getUserName());
-        taPerson.setAddress(taUser.getAddress());
-        taPerson.setIdNo(taUser.getIdNo());
-        taPerson.setDepartment(taUser.getDepartment());
-        taPerson.setPost(taUser.getPosition());
-        taPerson.setPhoto(taUser.getPhoto());
-        QueryWrapper<TaPerson> taPersonQueryWrapper = new QueryWrapper<>();
-        taPersonQueryWrapper.eq("user_id", taUser.getUserId());
-        taPersonMapper.update(taPerson, taPersonQueryWrapper);
+        if (!StringUtils.isEmpty(taUser.getPhone())) {
+            TaPerson taPerson = new TaPerson();
+            taPerson.setAvatarurl(taUser.getAvatar());
+            taPerson.setCompany(taUser.getOrgName());
+            taPerson.setTel(taUser.getPhone());
+            taPerson.setName(taUser.getUserName());
+            taPerson.setAddress(taUser.getAddress());
+            taPerson.setIdNo(taUser.getIdNo());
+            taPerson.setDepartment(taUser.getDepartment());
+            taPerson.setPost(taUser.getPosition());
+            taPerson.setPhoto(taUser.getPhoto());
+            taPerson.setPersonType(CommConstant.PERSON_LIFE_CONSULTANT);
+            taPerson.setUserId(taUser.getUserId());
+            QueryWrapper<TaPerson> taPersonQueryWrapper = new QueryWrapper<>();
+            taPersonQueryWrapper.eq("org_id", taUser.getOrgId());
+            taPersonQueryWrapper.eq("phone", taUser.getPhone());
+            taPersonMapper.update(taPerson, taPersonQueryWrapper);
+        }
 
         return taUser;
     }

src/main/java/com/huiju/estateagents/common/CommConstant.java

      */
     public final static String PERSON_ESTATE_DRIFT = "drift";
 
+    /**
+     * 人员类型: 生活管家
+     */
+    public final static String PERSON_LIFE_CONSULTANT = "life-consultant";
+
     /**
      * 状态: 正常
      */

src/main/java/com/huiju/estateagents/common/WxUtils.java

 import com.huiju.estateagents.service.IMiniAppService;
 import com.huiju.estateagents.third.entity.TaMpInfo;
 import com.huiju.estateagents.third.service.ITaMpInfoService;
+import lombok.extern.slf4j.Slf4j;
 import me.chanjar.weixin.common.error.WxErrorException;
 import me.chanjar.weixin.mp.api.WxMpService;
 import me.chanjar.weixin.mp.api.impl.WxMpServiceImpl;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
+@Slf4j
 @Component
 public class WxUtils {
     // 小程序
     }
 
     public static String sendTemplateMessage(WxMpService mpService, String toUser, String templateId, String miniAppId, String miniPage, String url, List<WxMpTemplateData> datas) throws WxErrorException {
-        WxMpTemplateMessage.MiniProgram miniProgram = null == miniAppId ? null : new WxMpTemplateMessage.MiniProgram(miniAppId, miniPage, true);
+        WxMpTemplateMessage.MiniProgram miniProgram = null == miniAppId ? null : new WxMpTemplateMessage.MiniProgram(miniAppId, miniPage, false);
+
+        log.info("模板信息-小程序内容: {}", miniProgram);
 
         WxMpTemplateMessage templateMessage = WxMpTemplateMessage.builder()
                 .toUser(toUser)

src/main/java/com/huiju/estateagents/controller/MiniAppController.java

             if (userList.size() > 0){
                 TaUser taUser = userList.get(0);
                 taPerson.setPersonType(taUser.getType());
+                taPerson.setUserId(taUser.getUserId());
             }
             taPersonService.updateById(taPerson);
 

src/main/java/com/huiju/estateagents/controller/TaPersonController.java

                 row.setPhone(StringUtils.ifNull(person.getTel(), person.getPhone()));
                 row.setSharePersonName(person.getSharePersonName());
                 row.setSex(getPersonSexName(person));
+                row.setBirthday(person.getBirthday());
                 row.setCreateDate(DateUtils.format(person.getCreateDate(), "yyyy-MM-dd HH:mm"));
                 data.add(row);
             }

src/main/java/com/huiju/estateagents/controller/TaPointsExchangeController.java

                     TaPointsExchangeExport row = new TaPointsExchangeExport();
                     row.setPersonName(item.getPersonName());
                     row.setPhone(item.getPhone());
-                    row.setPersonType("prop".equals(item.getPersonType()) ? "物业相关" : ("life-consultant".equals(item.getPersonType()) ? "生活管家" : null));
+                    row.setPersonType("prop".equals(item.getPersonType()) ? "物业相关" : (CommConstant.PERSON_LIFE_CONSULTANT.equals(item.getPersonType()) ? "生活管家" : null));
                     row.setTargetName(item.getTargetName());
                     row.setStatus(1 == item.getStatus() ? "已领取" : "未领取");
                     row.setCreateDate(DateUtils.format(item.getCreateDate(), "yyyy-MM-dd HH:mm"));

src/main/java/com/huiju/estateagents/excel/PropUserPointsExport.java

+package com.huiju.estateagents.excel;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.baomidou.mybatisplus.annotation.TableField;
+import lombok.Data;
+
+@Data
+public class PropUserPointsExport {
+
+    /**
+     * 用户姓名
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "姓名", index = 0)
+    private String ownerName;
+
+    /**
+     * 手机号
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "手机号", index = 1)
+    private String phone;
+
+    /**
+     * 身份证
+     */
+    @ColumnWidth(25)
+    @ExcelProperty(value = "身份证", index = 2)
+    private String idCard;
+
+    /**
+     * 性别 1：男   2：女
+     */
+    @ColumnWidth(8)
+    @ExcelProperty(value = "性别", index = 3)
+    @TableField(exist = false)
+    private String gender;
+
+    /**
+     * 户号
+     */
+    @ColumnWidth(30)
+    @ExcelProperty(value = "户号", index = 4)
+    private String roomNoName;
+
+    /**
+     * 总积分
+     */
+    @ColumnWidth(10)
+    @ExcelProperty(value = "总积分", index = 5)
+    @TableField(exist = false)
+    private Integer totalPoints;
+}

src/main/java/com/huiju/estateagents/excel/TaPersonExport.java

     @ExcelProperty(value = "性别", index = 3)
     private String sex;
 
+    @ColumnWidth(20)
+    @ExcelProperty(value = "生日", index = 4)
+    private String birthday;
+
     @ColumnWidth(25)
-    @ExcelProperty(value = "创建时间", index = 4)
+    @ExcelProperty(value = "创建时间", index = 5)
     private String createDate;
 }

src/main/java/com/huiju/estateagents/property/controller/BillInvoiceController.java

 
     @RequestMapping(value = "/admin/bill/invoice/collection", method = RequestMethod.POST)
     public ResponseBean collectionBillList(HttpServletRequest request, @RequestBody BillInvoice billInvoice) {
-        ResponseBean responseBean = new ResponseBean();
         TaUser userElement = getTaUser(request);
-        responseBean = iBillInvoiceService.collectionBillList(billInvoice, userElement);
-        return responseBean;
+        try {
+            iBillInvoiceService.collectionBillList(billInvoice, userElement);
+            return ResponseBean.success("ok");
+        } catch (Exception e) {
+            e.printStackTrace();
+            return ResponseBean.error("任务启动失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
+        }
     }
 
     // @ApiOperation(value = "修改缴费项 收费项名称,缴费项说明,截止时间", notes = "修改缴费项 收费项名称,缴费项说明,截止时间")

src/main/java/com/huiju/estateagents/property/controller/UserVerifyController.java

 import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.center.taUser.entity.TaUser;
+import com.huiju.estateagents.common.ExcelUtils;
+import com.huiju.estateagents.common.StringUtils;
+import com.huiju.estateagents.excel.PropUserPointsExport;
 import com.huiju.estateagents.property.model.TaUserVerify;
 import com.huiju.estateagents.property.service.IBuildingOwnerInfoService;
 import com.huiju.estateagents.property.service.ITaUserVerifyService;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 @RestController
         return ResponseBean.success(result);
     }
 
+    @GetMapping("/admin/prop-user/points/export")
+    public ResponseBean getListWithPointsExport(@RequestParam(value = "communityId") Integer communityId,
+                                                @RequestParam(value = "phaseId", required = false) Integer phaseId,
+                                                @RequestParam(value = "buildingId", required = false)Integer buildingId,
+                                                @RequestParam(value = "unitId", required = false)Integer unitId,
+                                                @RequestParam(value = "levelId", required = false)Integer levelId,
+                                                @RequestParam(value = "roomNoId", required = false)Integer roomNoId,
+                                                @RequestParam(value = "phone", required = false) String phone,
+                                                @RequestParam(value = "ownerName", required = false) String ownerName,
+                                                @RequestParam(value = "idCard", required = false) String idCard,
+                                                @RequestParam(value = "minPoints", required = false) Integer minPoints,
+                                                @RequestParam(value = "maxPoints", required = false) Integer maxPoints,
+                                                HttpServletRequest request,
+                                                HttpServletResponse response) {
+        Map<String, Object> params = new HashMap<>();
+        params.put("orgId", getOrgId(request));
+        params.put("communityId", communityId);
+        params.put("phaseId", phaseId);
+        params.put("buildingId", buildingId);
+        params.put("unitId", unitId);
+        params.put("levelId", levelId);
+        params.put("roomNoId", roomNoId);
+        params.put("phone", phone);
+        params.put("ownerName", ownerName);
+        params.put("idCard", idCard);
+        params.put("minPoints", minPoints);
+        params.put("maxPoints", maxPoints);
+        //
+        IPage<TaUserVerify> page = new Page<TaUserVerify>(1, 9999);
+        IPage<TaUserVerify> result = iTaUserVerifyService.getListWithPoints(page, params);
+
+        List<PropUserPointsExport> exportData = new ArrayList<>();
+        if (null != result.getRecords()) {
+            for (TaUserVerify item: result.getRecords()) {
+                PropUserPointsExport pointsExport = new PropUserPointsExport();
+                pointsExport.setOwnerName(item.getOwnerName());
+                pointsExport.setPhone(item.getPhone());
+                String gender = StringUtils.getGenderFromIdCard(item.getIdCard());
+                if (!StringUtils.isEmpty(gender)) {
+                    gender = "2".equals(gender) ? "女" : "男";
+                }
+                pointsExport.setGender(gender);
+                pointsExport.setIdCard(item.getIdCard());
+                pointsExport.setRoomNoName(item.getRoomNoName());
+                pointsExport.setTotalPoints(item.getTotalPoints());
+                exportData.add(pointsExport);
+            }
+        }
+
+        try {
+            ExcelUtils.flush(response, PropUserPointsExport.class, exportData, "业主积分");
+            return null;
+        } catch (IOException e) {
+            e.printStackTrace();
+            return ResponseBean.error("导出失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
+        }
+    }
+
+
     /**
      * 校验该 房产是否有房主
      * @param phaseId

src/main/java/com/huiju/estateagents/property/dao/TpRoomNoMapper.java

 //            "and unit_name = #{unitName} " +
 //            "and level_name = #{levelName} " +
 //            "and name = #{roomNoName}")
-    TpRoomNo selectCommunityIdAndAddressName(@Param("orgId") Integer orgId, @Param("phaseName") String phaseName, @Param("buildingName") String buildingName, @Param("unitName") String unitName, @Param("levelName") String levelName, @Param("roomNoName") String roomNoName);
+    TpRoomNo selectCommunityIdAndAddressName(@Param("orgId") Integer orgId,@Param("communityId") Integer communityId, @Param("phaseName") String phaseName, @Param("buildingName") String buildingName, @Param("unitName") String unitName, @Param("levelName") String levelName, @Param("roomNoName") String roomNoName);
 
     /**
      * 查询数据，分页

src/main/java/com/huiju/estateagents/property/model/TaUserVerify.java

 package com.huiju.estateagents.property.model;
 
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;

src/main/java/com/huiju/estateagents/property/service/IBillInvoiceService.java

      * @param userElement
      * @return
      */
-    ResponseBean collectionBillList(BillInvoice billInvoice, TaUser userElement);
+    void collectionBillList(BillInvoice billInvoice, TaUser userElement) throws Exception;
 }

src/main/java/com/huiju/estateagents/property/service/impl/BillInvoiceServiceImpl.java

 import org.apache.poi.hssf.usermodel.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
      * @param userElement
      * @return
      */
+    @Async
     @Override
-    public ResponseBean collectionBillList(BillInvoice billInvoice, TaUser userElement) {
+    public void collectionBillList(BillInvoice billInvoice, TaUser userElement) throws Exception {
         LambdaQueryWrapper<BillInvoice> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(BillInvoice::getBillId,billInvoice.getBillId());
         queryWrapper.eq(BillInvoice::getBillStatus,CommConstant.BILL_STATUS_UNPAID);
         // 发送催缴消息
         billInvoices.forEach(e -> {
             // 根据房间号获取person信息
-            List<TaMpMiniapp> taMpMiniappList = taMpMiniappMapper.getByRoom(billInvoice.getOrgId(), billInvoice.getRoomNoId());
-            if (null != taMpMiniappList) {
-                for (TaMpMiniapp taMpMiniapp : taMpMiniappList) {
-                    sendMpBillMessage(e, taMpMiniapp);
+            List<TaMpPerson> taMpPersonList = taMpPersonMapper.getByRoom(e.getOrgId(), e.getRoomNoId());
+            if (null != taMpPersonList) {
+                for (TaMpPerson taMpPerson : taMpPersonList) {
+                    sendMpBillMessage(e, taMpPerson);
                     try {
                         // 一秒发一次
                         Thread.sleep(1000);
                 }
             }
         });
-
-        return ResponseBean.success("ok");
     }
 
     /**
      * @param billInvoice
      * @param person
      */
-    private void sendMpBillMessage(BillInvoice billInvoice, TaMpMiniapp person) {
+    private void sendMpBillMessage(BillInvoice billInvoice, TaMpPerson person) {
         WxMpService mpService = wxUtils.getMpService(billInvoice.getOrgId());
 
         // 对应表数据
 
         try {
             String message = String.format("待缴费用: %s", StringUtils.isEmpty(billInvoice.getBillInvoiceExplain()) ? "未知" : billInvoice.getBillInvoiceExplain());
-            String remark = String.format("请及时进入【%s】小程序完成缴费", taMiniapp.getName());
+            String remark = "请进入小程序完成缴费";
 
             WxUtils.sendTemplateMessage(mpService,
-                    person.getMpPersonId(),
+                    person.getMpOpenid(),
                     mpTemplate.getTemplateCode(),
                     taMiniapp.getMiniappId(),
                     propertyPayPage,

src/main/java/com/huiju/estateagents/property/service/impl/BillServiceImpl.java

                 /**
                  * 查询房号
                  */
-                TpRoomNo tpRoomNo = tpRoomNoMapper.selectCommunityIdAndAddressName(userElement.getOrgId(), e.getPhase(), e.getBuilding(), e.getUnit(), e.getLevel(), e.getRoomNo());
+                TpRoomNo tpRoomNo = tpRoomNoMapper.selectCommunityIdAndAddressName(userElement.getOrgId(), communityId, e.getPhase(), e.getBuilding(), e.getUnit(), e.getLevel(), e.getRoomNo());
                 if (null == tpRoomNo) {
                     throw new WisdomException("房产：" + e.getPhase() + e.getBuilding() + e.getUnit() + e.getLevel() + e.getRoomNo() + " 不存在！请核对！");
                 }

src/main/java/com/huiju/estateagents/property/service/impl/TpTicketServiceImpl.java

         try {
             TaPerson propOwner = iTaPersonService.getById(ticket.getPersonId());
             String message = String.format("业主电话: %s ; 报修内容: %s", propOwner.getPhone(), ticket.getTicketTitle());
-            String remark = String.format("请及时进入【%s】小程序进行处理", taMiniapp.getName());
+            String remark = "请及时联系业主进行处理";
 
             WxUtils.sendTemplateMessage(mpService,
                     person.getMpOpenid(),

src/main/java/com/huiju/estateagents/redpack/mapper/TaMpMiniappMapper.java

  */
 @Mapper
 public interface TaMpMiniappMapper extends BaseMapper<TaMpMiniapp> {
-
-    List<TaMpMiniapp> getByRoom(Integer orgId, Integer roomNoId);
 }

src/main/java/com/huiju/estateagents/redpack/mapper/TaMpPersonMapper.java

 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * <p>
  * 公众号用户表  Mapper 接口
 public interface TaMpPersonMapper extends BaseMapper<TaMpPerson> {
 
     TaMpPerson getByMiniAppPerson(@Param("orgId") Integer orgId, @Param("miniAppPersonId") String miniAppPersonId);
+
+    List<TaMpPerson> getByRoom(Integer orgId, Integer roomNoId);
 }

src/main/resources/application.yml

 
 wx:
   miniapp:
-    index: /pages/ShouYe/index
-    ticket: /pages/WoDe/YeZhuBaoXiu/index?id=
-    propertyPay: /pages/WuYe/index?type=4
+    index: pages/ShouYe/index
+    ticket: pages/WoDe/YeZhuBaoXiu/index?id=
+    propertyPay: pages/WuYe/index?type=4
   mp:
     festivalH5: https://xs.njyunzhi.com/jierih5.html
     birthdayH5: https://xs.njyunzhi.com/shengrih5.html

src/main/resources/mapper/property/TpRoomNoMapper.xml

             INNER JOIN tp_phase q ON q.id = t.phase_id
         WHERE
             t.org_id = #{orgId}
+            AND t.community_id = #{communityId}
             AND s.`name` = #{levelName}
             AND m.`name` = #{unitName}
             AND n.`name` = #{buildingName}

src/main/resources/mapper/redpack/TaMpMiniappMapper.xml

 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.huiju.estateagents.redpack.mapper.TaMpMiniappMapper">
 
-    <select id="getByRoom" resultType="com.huiju.estateagents.redpack.entity.TaMpMiniapp">
-        SELECT DISTINCT
-            s.*
-        FROM
-            ta_user_verify t
-            INNER JOIN ta_mp_miniapp s ON t.person_id = s.miniapp_person_id
-        WHERE
-            t.org_id = #{orgId}
-            AND t.room_no_id = #{roomNoId}
-            AND t.verify_status = 1
-    </select>
 </mapper>

src/main/resources/mapper/redpack/TaMpPersonMapper.xml

             t.org_id = #{orgId}
             AND s.miniapp_person_id = #{miniAppPersonId}
     </select>
+    <select id="getByRoom" resultType="com.huiju.estateagents.redpack.entity.TaMpPerson">
+        SELECT DISTINCT
+            m.*
+        FROM
+            ta_user_verify t
+            INNER JOIN ta_mp_miniapp s ON t.person_id = s.miniapp_person_id
+            INNER JOIN ta_mp_person m on s.mp_person_id = m.mp_person_id
+        WHERE
+            t.org_id = #{orgId}
+            AND t.room_no_id = #{roomNoId}
+            AND t.verify_status = 1
+    </select>
 </mapper>