完成 缴费单推送到 APP用户

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

@@ -346,6 +346,7 @@
         AND t.uuid = #{userId,jdbcType=INTEGER}
         AND t.STATUS = 1
         AND t.advice_type = 1
+        AND t.uuid_type = 1
         AND t.model_type = #{modelType,jdbcType=INTEGER}
     ORDER BY
     t.create_date DESC

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

@@ -12,6 +12,7 @@ import com.community.huiju.dao.*;
 import com.community.huiju.exception.WisdomException;
 import com.community.huiju.model.*;
 import com.community.huiju.service.IBillInvoiceService;
+import com.community.huiju.service.IMessageService;
 import com.google.common.collect.Maps;
 import org.apache.poi.hssf.usermodel.*;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -19,6 +20,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.text.SimpleDateFormat;
+import java.time.LocalDateTime;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
@@ -55,6 +57,9 @@ public class BillInvoiceServiceImpl extends ServiceImpl<BillInvoiceMapper, BillI
     @Autowired
     private TaUserMapper taUserMapper;
 
+    @Autowired
+    private IMessageService iMessageService;
+
     @Override
     public ResponseBean getBillList(String parameter, UserElement userElement) {
         ResponseBean responseBean = new ResponseBean();
@@ -297,6 +302,31 @@ public class BillInvoiceServiceImpl extends ServiceImpl<BillInvoiceMapper, BillI
         if (b == false) {
             throw new WisdomException("操作失败");
         }
+
+        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd hh:mm");
+        List<Message> messageList = billInvoices.stream().map(e -> {
+
+            // 往APP端用户上面的每一个用户推送
+            Message messageModelAPP = new Message();
+            messageModelAPP.setCommunityId(userElement.getCommunityId());
+            messageModelAPP.setMessageType("7");
+            messageModelAPP.setAdviceType("1");
+            messageModelAPP.setModelType("2");
+            messageModelAPP.setUuid(e.getTaUserId());
+            messageModelAPP.setUuidType("1");
+            // 消息是物业端 发过来的, 就是 2
+            messageModelAPP.setSource("2");
+            messageModelAPP.setMessageContent("您有待缴费的账单，点击查看并缴费 " + dateFormat.format(new Date()) + bill.getBillName());
+            messageModelAPP.setStatus("1");
+            messageModelAPP.setCreateDate(LocalDateTime.now());
+            messageModelAPP.setCreateUser(userElement.getId());
+            messageModelAPP.setBillId(e.getId());
+
+            return messageModelAPP;
+        }).collect(Collectors.toList());
+
+        iMessageService.saveBatch(messageList);
+
         responseBean.addSuccess("操作成功");
         return responseBean;
     }

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

@@ -16,6 +16,7 @@ import com.community.huiju.model.*;
 import com.community.huiju.service.IBillInvoiceService;
 import com.community.huiju.service.IBillService;
 import com.community.huiju.service.IBuildingOwnerInfoService;
+import com.community.huiju.service.IMessageService;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.google.zxing.common.detector.MathUtils;
@@ -87,6 +88,9 @@ public class BillServiceImpl extends ServiceImpl<BillMapper, Bill> implements IB
     @Autowired
     private MessageMapper messageMapper;
 
+    @Autowired
+    private IMessageService iMessageService;
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public ResponseBean updateBillNameAndBillExplainAndEndDate(UserElement userElement, String parameter) {
@@ -231,7 +235,7 @@ public class BillServiceImpl extends ServiceImpl<BillMapper, Bill> implements IB
 
         bill.setPayedNum(0);
         bill.setBillStatus(billStatus);
-        //为草稿时不创建时间
+        //为草稿时不创建时间, 2表示草稿
         if(!"2".equals(billStatus)) {
             bill.setCreateDate(new Date());
             bill.setCreateUser(userElement.getId());
@@ -272,6 +276,7 @@ public class BillServiceImpl extends ServiceImpl<BillMapper, Bill> implements IB
                 message.setModelType("2");
                 message.setUuid(userElement.getId());
                 message.setUuidType("2");
+                // 消息是物业端发过来的, 就是 2
                 message.setSource("2");
                 message.setMessageContent("收费组“" + bill.getBillName() +  "”还未发布，点击发布");
                 message.setStatus("1");
@@ -290,6 +295,7 @@ public class BillServiceImpl extends ServiceImpl<BillMapper, Bill> implements IB
                 queryWrapper.eq("model_type", "2");
                 queryWrapper.eq("source", "2");
                 queryWrapper.eq("status", "1");
+                queryWrapper.eq("advice_type","4");
                 Message message = messageMapper.selectOne(queryWrapper);
                 if (null != message) {
                     message.setStatus("0");
@@ -307,6 +313,7 @@ public class BillServiceImpl extends ServiceImpl<BillMapper, Bill> implements IB
                 messageModel.setModelType("1");
                 messageModel.setUuid(userElement.getId());
                 messageModel.setUuidType("2");
+                // 消息是物业端发过来的, 就是 2
                 messageModel.setSource("2");
 
                 messageModel.setMessageContent("收费组“" + bill.getBillName() + "”还有" + DateUtils.getDaysBetween(new Date(), bill.getEndDate()) + "天就到截止日期了，但还有未缴用户，点击去查看");
@@ -317,6 +324,7 @@ public class BillServiceImpl extends ServiceImpl<BillMapper, Bill> implements IB
 
                 messageMapper.insert(messageModel);
 
+
             }
             List<BillInvoice> billInvoices = tempBills.stream().map(e -> {
                 BillInvoice billInvoice = new BillInvoice();
@@ -360,10 +368,40 @@ public class BillServiceImpl extends ServiceImpl<BillMapper, Bill> implements IB
                 Random random = new Random();
                 billInvoice.setOutTradeNo(String.valueOf(System.currentTimeMillis()) + random.nextInt());
 
+
                 return billInvoice;
             }).collect(Collectors.toList());
 
-            iBillInvoiceService.saveBatch(billInvoices);
+            boolean batchBool = iBillInvoiceService.saveBatch(billInvoices);
+            if (batchBool) {
+                SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd hh:mm");
+                // 发布时, 往 APP端推送
+                if ("0".equals(bill.getBillStatus())) {
+                    List<Message> messageList = billInvoices.stream().map(e -> {
+
+                        // 往APP端用户上面的每一个用户推送
+                        Message messageModelAPP = new Message();
+                        messageModelAPP.setCommunityId(userElement.getCommunityId());
+                        messageModelAPP.setMessageType("7");
+                        messageModelAPP.setAdviceType("1");
+                        messageModelAPP.setModelType("2");
+                        messageModelAPP.setUuid(e.getTaUserId());
+                        messageModelAPP.setUuidType("1");
+                        // 消息是物业端 发过来的, 就是 2
+                        messageModelAPP.setSource("2");
+                        messageModelAPP.setMessageContent("您有待缴费的账单，点击查看并缴费 " + dateFormat.format(new Date()) + bill.getBillName());
+                        messageModelAPP.setStatus("1");
+                        messageModelAPP.setCreateDate(LocalDateTime.now());
+                        messageModelAPP.setCreateUser(userElement.getId());
+                        messageModelAPP.setBillId(e.getId());
+
+                        return messageModelAPP;
+
+                    }).collect(Collectors.toList());
+                    iMessageService.saveBatch(messageList);
+                }
+
+            }
         }
         responseBean.addSuccess("操作成功!");
         return responseBean;