bug

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

     public static final String TP_MESSAGE_BIRTHDAY = "birthday";    // 生日
     public static final String TP_MESSAGE_FESTIVAL= "festival";     // 节日
     public static final String TP_MESSAGE_TICKET= "ticket";         // 工单
+    public static final String TP_MESSAGE_PROPERTY_FEE= "property-fee";         // 工单
 
     public static  final String VERIFY_STATUS_PASS = "1";
+
+    public static  final String BILL_STATUS_UNPAID = "0";
+
+
 }

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

         return responseBean;
     }
 
+    @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;
+    }
+
     // @ApiOperation(value = "修改缴费项 收费项名称,缴费项说明,截止时间", notes = "修改缴费项 收费项名称,缴费项说明,截止时间")
     @ApiImplicitParams({
             @ApiImplicitParam(dataTypeClass = String.class, paramType = "body", name = "parameter", value = "billName收费项名称,billExplain缴费项说明,endDate截止时间"),

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

      * @return
      */
 	List<Map<String, Object>> getPriceCount();
+
+    /**
+     * 催缴账单
+     * @param billInvoice
+     * @param userElement
+     * @return
+     */
+    ResponseBean collectionBillList(BillInvoice billInvoice, TaUser userElement);
 }

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

 package com.huiju.estateagents.property.service.impl;
 
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 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.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.center.taUser.entity.TaUser;
 import com.huiju.estateagents.center.taUser.mapper.TaUserMapper;
+import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.common.DateUtils;
 import com.huiju.estateagents.common.StringUtils;
+import com.huiju.estateagents.common.WxUtils;
+import com.huiju.estateagents.entity.TaMiniapp;
+import com.huiju.estateagents.entity.TaMpTemplate;
+import com.huiju.estateagents.entity.TaPerson;
+import com.huiju.estateagents.mapper.TaPersonMapper;
 import com.huiju.estateagents.property.common.UserElement;
 import com.huiju.estateagents.property.dao.*;
 import com.huiju.estateagents.property.exception.WisdomException;
 import com.huiju.estateagents.property.service.IBillInvoiceService;
 import com.huiju.estateagents.property.service.IMessageService;
 import com.google.common.collect.Maps;
+import com.huiju.estateagents.redpack.entity.TaMpMiniapp;
+import com.huiju.estateagents.redpack.entity.TaMpPerson;
+import com.huiju.estateagents.redpack.mapper.TaMpMiniappMapper;
+import com.huiju.estateagents.redpack.mapper.TaMpPersonMapper;
+import com.huiju.estateagents.redpack.service.ITaMpPersonService;
+import com.huiju.estateagents.service.IMiniAppService;
+import com.huiju.estateagents.service.ITaMpTemplateService;
+import com.huiju.estateagents.service.ITaPersonService;
+import com.huiju.estateagents.third.entity.TaMpInfo;
+import com.huiju.estateagents.third.service.ITaMpInfoService;
+import me.chanjar.weixin.common.error.WxErrorException;
+import me.chanjar.weixin.mp.api.WxMpService;
+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.stereotype.Service;
 
 import java.text.SimpleDateFormat;
 import java.time.LocalDateTime;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-import java.util.Random;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
     @Autowired
     private TpBillOrderMapper tpBillOrderMapper;
 
+    @Autowired
+    WxUtils wxUtils;
+
+    @Autowired
+    ITaMpInfoService iTaMpInfoService;
+
+    @Autowired
+    ITaMpPersonService iTaMpPersonService;
+
+    @Autowired
+    ITaPersonService iTaPersonService;
+    @Autowired
+    private IMiniAppService iMiniAppService;
+
+    @Autowired
+    private ITaMpTemplateService iTaMpTemplateService;
+
+    @Autowired
+    private TaMpMiniappMapper taMpMiniappMapper;
+
+    @Autowired
+    private TaMpPersonMapper taMpPersonMapper;
+    @Autowired
+    private TaPersonMapper taPersonMapper;
+
     @Override
     public ResponseBean getBillList(String parameter, TaUser userElement) {
         ResponseBean responseBean = new ResponseBean();
     public List<Map<String, Object>> getPriceCount() {
         return billInvoiceMapper.getPriceCount();
     }
+
+    /**
+     * 催缴账单
+     *
+     * @param billInvoice
+     * @param userElement
+     * @return
+     */
+    @Override
+    public ResponseBean collectionBillList(BillInvoice billInvoice, TaUser userElement) {
+        LambdaQueryWrapper<BillInvoice> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(BillInvoice::getBillId,billInvoice.getBillId());
+        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();
+                        }
+                    }
+
+                }
+            }
+        });
+
+        return ResponseBean.success("ok");
+    }
+
+    /**
+     * 发送催款消息
+     * @param billInvoice
+     * @param person
+     */
+    private void sendMpBillMessage(BillInvoice billInvoice, TaMpPerson person) {
+        WxMpService mpService = wxUtils.getMpService(billInvoice.getOrgId());
+
+        // 对应表数据
+        TaMpInfo mpInfo = iTaMpInfoService.getByOrgId(billInvoice.getOrgId());
+
+        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();
+
+        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();
+            }
+
+        }
+    }
 }