feats

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

@@ -102,7 +102,7 @@ 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 = new WxMpTemplateMessage.MiniProgram(miniAppId, miniPage, true);
+        WxMpTemplateMessage.MiniProgram miniProgram = null == miniAppId ? null : new WxMpTemplateMessage.MiniProgram(miniAppId, miniPage, true);
 
         WxMpTemplateMessage templateMessage = WxMpTemplateMessage.builder()
                 .toUser(toUser)

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

@@ -576,13 +576,20 @@ public class TaPersonController extends BaseController {
     }
 
     @PutMapping("/wx/editPerson")
-    public ResponseBean editWxConsultant(@RequestParam(required = false)String name,@RequestParam(required = false)String avatar,@RequestParam(required = false)String phone,@RequestParam(required = false)String birthday,HttpServletRequest request) {
+    public ResponseBean editWxConsultant(@RequestBody Map<String, Object> params,HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         String openid = getOpenId(request);
         List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
         if (null == taPersons || taPersons.size() != 1) {
             return ResponseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
         }
+
+        String name = (String) params.get("name");
+        String avatar = (String) params.get("avatar");
+        String birthday = (String) params.get("birthday");
+        String phone = (String) params.get("phone");
+        Integer sex = (Integer) params.get("sex");
+
         TaPerson person = taPersons.get(0);
         if (!StringUtils.isEmpty(name)){
             person.setName(name);
@@ -593,15 +600,18 @@ public class TaPersonController extends BaseController {
         if (!StringUtils.isEmpty(birthday)){
             person.setBirthday(birthday);
         }
+        if (null != sex){
+            person.setSex(sex);
+        }
         if (!StringUtils.isEmpty(phone)){
             person.setTel(phone);
 //            person.setPhone(phone);
-            if(person.getPersonType().equals(CommConstant.PERSON_REALTY_CONSULTANT)){
-                TaUser user = taUserService.getById(person.getUserId());
-                user.setPhone(phone);
-                user.setLoginName(phone);
-                taUserService.updateById(user);
-            }
+//            if(person.getPersonType().equals(CommConstant.PERSON_REALTY_CONSULTANT)){
+//                TaUser user = taUserService.getById(person.getUserId());
+//                user.setPhone(phone);
+//                user.setLoginName(phone);
+//                taUserService.updateById(user);
+//            }
         }
         try{
             if(taPersonService.updateById(person)){
@@ -848,11 +858,11 @@ public class TaPersonController extends BaseController {
 //            String senRepl = "$1****$2";
             for (TaPerson person: personList) {
                 TaPersonExport row = new TaPersonExport();
-                row.setNickname(person.getNickname());
+                row.setNickname(StringUtils.ifNull(person.getName(), person.getNickname()));
 //                row.setPhone(StringUtils.simpleSensitive(person.getPhone(), senRegx, senRepl));
-                row.setPhone(person.getPhone());
+                row.setPhone(StringUtils.ifNull(person.getTel(), person.getPhone()));
                 row.setSharePersonName(person.getSharePersonName());
-                row.setPoints(person.getPoints());
+                row.setSex(getPersonSexName(person));
                 row.setCreateDate(DateUtils.format(person.getCreateDate(), "yyyy-MM-dd HH:mm"));
                 data.add(row);
             }
@@ -868,4 +878,16 @@ public class TaPersonController extends BaseController {
         return null;
     }
 
+    private String getPersonSexName(TaPerson taPerson) {
+        if (null != taPerson.getSex()) {
+            return 2 == taPerson.getSex() ? "女" : "男";
+        }
+
+        if (!StringUtils.isEmpty(taPerson.getGender())) {
+            return "2".equals(taPerson.getGender()) ? "女" : "男";
+        }
+
+        return null;
+    }
+
 }

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

@@ -21,7 +21,7 @@ public class TaPersonExport {
 
     @ColumnWidth(10)
     @ExcelProperty(value = "总积分", index = 3)
-    private Integer points;
+    private String sex;
 
     @ColumnWidth(25)
     @ExcelProperty(value = "创建时间", index = 4)

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

@@ -40,6 +40,7 @@ import me.chanjar.weixin.mp.bean.kefu.WxMpKefuMessage;
 import me.chanjar.weixin.mp.bean.template.WxMpTemplateData;
 import org.apache.poi.hssf.usermodel.*;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -114,6 +115,9 @@ public class BillInvoiceServiceImpl extends ServiceImpl<BillInvoiceMapper, BillI
     @Autowired
     private TaPersonMapper taPersonMapper;
 
+    @Value("${wx.miniapp.propertyPay}")
+    String propertyPayPage;
+
     @Override
     public ResponseBean getBillList(String parameter, TaUser userElement) {
         ResponseBean responseBean = new ResponseBean();
@@ -727,32 +731,21 @@ public class BillInvoiceServiceImpl extends ServiceImpl<BillInvoiceMapper, BillI
     public ResponseBean collectionBillList(BillInvoice billInvoice, TaUser userElement) {
         LambdaQueryWrapper<BillInvoice> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(BillInvoice::getBillId,billInvoice.getBillId());
+        queryWrapper.eq(BillInvoice::getBillStatus,CommConstant.BILL_STATUS_UNPAID);
         queryWrapper.eq(BillInvoice::getStatus,"1");
         List<BillInvoice> billInvoices = billInvoiceMapper.selectList(queryWrapper);
         // 发送催缴消息
         billInvoices.forEach(e -> {
-            if (CommConstant.BILL_STATUS_UNPAID.equals(e.getBillStatus())){
-                // 根据房间号获取person信息
-                LambdaQueryWrapper<TaUserVerify> taUserVerifyLambdaQueryWrapper = new LambdaQueryWrapper<>();
-                taUserVerifyLambdaQueryWrapper.eq(TaUserVerify::getRoomNoId,e.getRoomNoId());
-                taUserVerifyLambdaQueryWrapper.eq(TaUserVerify::getRoleId,"1");
-                TaUserVerify taUserVerify = taUserVerifyMapper.selectOne(taUserVerifyLambdaQueryWrapper);
-
-                // 获取person
-                TaPerson taPerson = taPersonMapper.selectById(taUserVerify.getPersonId());
-                if (null != taPerson){
-                    LambdaQueryWrapper<TaMpMiniapp> taMpMiniappLambdaQueryWrapper = new LambdaQueryWrapper<>();
-                    taMpMiniappLambdaQueryWrapper.eq(TaMpMiniapp::getMiniappPersonId,taPerson.getPersonId());
-                    TaMpMiniapp taMpMiniapp = taMpMiniappMapper.selectOne(taMpMiniappLambdaQueryWrapper);
-                    if (null != taMpMiniapp){
-                        TaMpPerson taMpPerson = taMpPersonMapper.selectById(taMpMiniapp.getMpPersonId());
-                        sendMpBillMessage(e,taMpPerson);
-                        try {
-                            // 一秒发一次
-                            Thread.sleep(1000);
-                        } catch (InterruptedException ex) {
-                            ex.printStackTrace();
-                        }
+            // 根据房间号获取person信息
+            List<TaMpMiniapp> taMpMiniappList = taMpMiniappMapper.getByRoom(billInvoice.getOrgId(), billInvoice.getRoomNoId());
+            if (null != taMpMiniappList) {
+                for (TaMpMiniapp taMpMiniapp : taMpMiniappList) {
+                    sendMpBillMessage(e, taMpMiniapp);
+                    try {
+                        // 一秒发一次
+                        Thread.sleep(1000);
+                    } catch (InterruptedException ex) {
+                        ex.printStackTrace();
                     }
 
                 }
@@ -767,7 +760,7 @@ public class BillInvoiceServiceImpl extends ServiceImpl<BillInvoiceMapper, BillI
      * @param billInvoice
      * @param person
      */
-    private void sendMpBillMessage(BillInvoice billInvoice, TaMpPerson person) {
+    private void sendMpBillMessage(BillInvoice billInvoice, TaMpMiniapp person) {
         WxMpService mpService = wxUtils.getMpService(billInvoice.getOrgId());
 
         // 对应表数据
@@ -775,50 +768,31 @@ public class BillInvoiceServiceImpl extends ServiceImpl<BillInvoiceMapper, BillI
 
         TaMiniapp taMiniapp = iMiniAppService.getAppByOrg(mpInfo.getOrgId());
 
-        WxMpKefuMessage kefuMessage = WxMpKefuMessage.MINIPROGRAMPAGE().appId(taMiniapp.getMiniappId())
-                .toUser(person.getMpOpenid())
-                .title("您有一个新的工单待处理")
-//                .pagePath(miniAppTicket + ticket.getId()) 无跳转页面
-                .thumbMediaId(mpInfo.getMiniappMedia())
-                .build();
+        TaMpTemplate mpTemplate = iTaMpTemplateService.getByCode(billInvoice.getOrgId(), CommConstant.TP_MESSAGE_PROPERTY_FEE);
+        if (null == mpTemplate) {
+            return;
+        }
 
         try {
-            mpService.getKefuService().sendKefuMessage(kefuMessage);
-        } catch (WxErrorException e) {
-            e.printStackTrace();
-
-            // 如果客服消息发送失败, 则发送普通模板消息
-//            List<TaMpTemplate> mpTemplateList = iTaMpTemplateService.getAvailableList(ticket.getOrgId(), CommConstant.TP_MESSAGE_TICKET);
-//            if (null == mpTemplateList || mpTemplateList.size() < 1) {
-//                return;
-//            }
-            TaMpTemplate mpTemplate = iTaMpTemplateService.getByCode(billInvoice.getOrgId(), CommConstant.TP_MESSAGE_PROPERTY_FEE);
-            if (null == mpTemplate) {
-                return;
-            }
-
-            try {
-//                TaPerson propOwner = iTaPersonService.getById(ticket.getPersonId());
-//                String message = String.format("业主电话: %s ; 报修内容: %s", propOwner.getPhone(), ticket.getTicketTitle());
-                String message = "";
-                String remark = String.format("请及时进入【%s】小程序进行处理", taMiniapp.getName());
-
-                WxUtils.sendTemplateMessage(mpService,
-                        person.getMpOpenid(),
-                        mpTemplate.getTemplateCode(),
-                        null,
-                        new ArrayList<WxMpTemplateData>(){{
-                            add(new WxMpTemplateData("first", "工单提醒"));
-                            add(new WxMpTemplateData("keyword1", "您有一个新的工单"));
-                            add(new WxMpTemplateData("keyword2", DateUtils.today()));
-                            add(new WxMpTemplateData("keyword3", message));
-                            add(new WxMpTemplateData("remark", remark));
-                        }}
-                );
-            } catch (Exception e2) {
-                e2.printStackTrace();
-            }
-
+            String message = String.format("待缴费用: %s", StringUtils.isEmpty(billInvoice.getBillInvoiceExplain()) ? "未知" : billInvoice.getBillInvoiceExplain());
+            String remark = String.format("请及时进入【%s】小程序完成缴费", taMiniapp.getName());
+
+            WxUtils.sendTemplateMessage(mpService,
+                    person.getMpPersonId(),
+                    mpTemplate.getTemplateCode(),
+                    taMiniapp.getMiniappId(),
+                    propertyPayPage,
+                    null,
+                    new ArrayList<WxMpTemplateData>(){{
+                        add(new WxMpTemplateData("first", "缴费提醒"));
+                        add(new WxMpTemplateData("keyword1", "您有一个代缴费用"));
+                        add(new WxMpTemplateData("keyword2", DateUtils.today()));
+                        add(new WxMpTemplateData("keyword3", message));
+                        add(new WxMpTemplateData("remark", remark));
+                    }}
+            );
+        } catch (Exception e2) {
+            e2.printStackTrace();
         }
     }
 }

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

@@ -5,6 +5,8 @@ import org.apache.ibatis.annotations.Mapper;
 import com.huiju.estateagents.redpack.entity.TaMpMiniapp;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
+import java.util.List;
+
 /**
  * <p>
  * 公众号小程序账户映射  Mapper 接口
@@ -16,4 +18,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 @Mapper
 public interface TaMpMiniappMapper extends BaseMapper<TaMpMiniapp> {
 
+    List<TaMpMiniapp> getByRoom(Integer orgId, Integer roomNoId);
 }

src/main/java/com/huiju/estateagents/task/MpMessageEvent.java

@@ -108,6 +108,8 @@ public class MpMessageEvent {
                         WxUtils.sendTemplateMessage(mpService,
                                 user.get("mpOpenid"),
                                 mpTemplate.getTemplateCode(),
+                                null,
+                                null,
                                 url,
                                 new ArrayList<WxMpTemplateData>(){{
                                     add(new WxMpTemplateData("first", firstTxt));
@@ -217,6 +219,8 @@ public class MpMessageEvent {
                             WxUtils.sendTemplateMessage(mpService,
                                     user.get("mpOpenid"),
                                     mpTemplate.getTemplateCode(),
+                                    null,
+                                    null,
                                     url,
                                     new ArrayList<WxMpTemplateData>(){{
                                         add(new WxMpTemplateData("first", firstTxt));

src/main/resources/application.yml

@@ -15,6 +15,7 @@ wx:
   miniapp:
     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/TaPersonMapper.xml

@@ -650,10 +650,10 @@ FROM
         WHERE
             t.org_id = #{orgId}
         <if test="name != null and '' != name">
-            AND t.nickname LIKE CONCAT( '%', #{name}, '%' )
+            AND (t.name LIKE CONCAT( '%', #{name}, '%' ) OR t.nickname LIKE CONCAT( '%', #{name}, '%' ))
         </if>
         <if test="phone != null and '' != phone">
-            AND t.phone = 123
+            AND (t.tel LIKE CONCAT( '%', #{phone}, '%' ) OR t.phone LIKE CONCAT( '%', #{phone}, '%' ))
         </if>
         <if test="recommended != null and '' != recommended">
             AND s.nickname LIKE CONCAT( '%', #{recommended}, '%' )

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

@@ -2,4 +2,15 @@
 <!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>