bug

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

@@ -152,7 +152,7 @@ public class ExtendContentController extends BaseController {
      * @return
      */
     @GetMapping("/wx/extendContent")
-    public ResponseBean extendContentListOfWX(@RequestParam(value = "cityId") Integer cityId, HttpServletRequest request) {
+    public ResponseBean extendContentListOfWX(@RequestParam(value = "cityId", required = false) Integer cityId, HttpServletRequest request) {
         return iExtendContentService.selectExtendContentListShowType(null, null, null,null, null, null, cityId,getOrgId(request));
     }
 

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

@@ -126,7 +126,6 @@ public class TpTicketServiceImpl extends ServiceImpl<TpTicketMapper, TpTicket> i
         Integer ticketId = object.getInteger("id");
         TpTicketVO ticketVO= tpTicketMapper.ticketDetails(ticketId);
         // 从taUserVerify里面获取userID
-        TaUserVerify taUserVerify= taUserVerifyMapper.selectById(ticketVO.getCreateUser());
         TaPerson taPerson = taPersonMapper.selectById(ticketVO.getPersonId());
         /*发起人*/
         ticketVO.setCreateUserNmae(taPerson.getName());
@@ -189,6 +188,14 @@ public class TpTicketServiceImpl extends ServiceImpl<TpTicketMapper, TpTicket> i
             String statusName= tpTicketRecordMapper.statusName(tpTicketRecord.getStatus());
             tpTicketRecord.setStatusName(statusName);
         }
+
+        // 是否缴费
+        ticketVO.setIsPay(false);
+        BillInvoice billInvoice = billInvoiceMapper.selectById(ticketVO.getBillInvoiceId());
+        if (null!= billInvoice && "1".equals(billInvoice.getBillStatus())){
+            ticketVO.setIsPay(true);
+        }
+
         response.addSuccess(ticketVO);
         return response;
     }
@@ -299,18 +306,18 @@ public class TpTicketServiceImpl extends ServiceImpl<TpTicketMapper, TpTicket> i
         message.setCreateUser(user.toString());
         message.setCreateDate(LocalDateTime.now());
         message.setTicketId(ticketId);
-        messageMapper.insert(message);
+//        messageMapper.insert(message);
         //如果分配给本人维护消息模板
         if (null!=userID&userID.equals(user)){
             message.setModelType("1");
-            messageMapper.insert(message);
+//            messageMapper.insert(message);
         }
         //分配成功后推送app
         message.setUuidType("1");
         message.setUuid(ticket.getCreateUser());
         message.setMessageContent("工单“" + ticket.getTicketTitle() + "”已被分配给:"+taUser.getUserName());
         message.setAdviceType("1");
-        messageMapper.insert(message);
+//        messageMapper.insert(message);
         response.addSuccess("成功");
         return response;
     }

src/main/java/com/huiju/estateagents/property/vo/TpTicketVO.java

@@ -91,4 +91,6 @@ public class TpTicketVO extends TpTicket {
      * 工单创建人房产
      */
     private  String houseProperty;
+
+    private Boolean isPay;
 }