Browse Source

修复 Bug

weiximei 6 years ago
parent
commit
d9ca9e5bf9

+ 2
- 2
CODE/smart-community/app-api/src/main/java/com/community/huiju/controller/CodeController.java View File

48
         }
48
         }
49
 
49
 
50
         int code = (int) ((Math.random()*9+1)*1000);
50
         int code = (int) ((Math.random()*9+1)*1000);
51
-        //boolean result = iCode.sendCode(phone,String.valueOf(code));
52
-        boolean result = true;
51
+        boolean result = iCode.sendCode(phone,String.valueOf(code));
52
+        // boolean result = true;
53
         if (result) {
53
         if (result) {
54
             log.info("{} 验证码: {}",phone,code);
54
             log.info("{} 验证码: {}",phone,code);
55
             // 设置缓存
55
             // 设置缓存

+ 2
- 0
CODE/smart-community/app-api/src/main/java/com/community/huiju/service/impl/TaVistorServiceImpl.java View File

113
             map.put("visitorCode",resultJSON.getJSONObject("data").getString("QRCode"));
113
             map.put("visitorCode",resultJSON.getJSONObject("data").getString("QRCode"));
114
             map.put("visitorStartTime",visitor.getVisitorStartTime());
114
             map.put("visitorStartTime",visitor.getVisitorStartTime());
115
             map.put("visitorEndTime",visitor.getVisitorEndTime());
115
             map.put("visitorEndTime",visitor.getVisitorEndTime());
116
+            map.put("drivingStatus",visitor.getDrivingStatus());
117
+            map.put("payEntity",visitor.getPayEntity());
116
 
118
 
117
             // 把访问码存入
119
             // 把访问码存入
118
             visitor.setVisitorCode(visitorCode);
120
             visitor.setVisitorCode(visitorCode);

+ 1
- 1
CODE/smart-community/app-api/src/main/java/com/community/huiju/service/impl/TicketServiceImpl.java View File

259
         tpTicketRecord.setTicketId(tpTicketReco.getId());
259
         tpTicketRecord.setTicketId(tpTicketReco.getId());
260
         // 1:投诉   2:报修 3:联系物业
260
         // 1:投诉   2:报修 3:联系物业
261
         String typeName = "2".equals(tpTicket.getType())?"报修":"1".equals(tpTicket.getType())?"投诉":"3".equals(tpTicket.getType())?"联系工单":"未知类型";
261
         String typeName = "2".equals(tpTicket.getType())?"报修":"1".equals(tpTicket.getType())?"投诉":"3".equals(tpTicket.getType())?"联系工单":"未知类型";
262
-        tpTicketRecord.setContent("您的"+ typeName +"正在分配物业处理人员, 若长时间无人处理, 请联系物业! |联系物业号码簿 >");
262
+        tpTicketRecord.setContent("您的"+ typeName +"正在分配物业处理人员, 若长时间无人处理, 请联系物业! 联系物业号码簿 >");
263
         tpTicketRecord.setStatus(tpTicketReco.getStatus());
263
         tpTicketRecord.setStatus(tpTicketReco.getStatus());
264
         tpTicketRecord.setCreateUser(userId);
264
         tpTicketRecord.setCreateUser(userId);
265
         tpTicketRecord.setCreateDate(new Date());
265
         tpTicketRecord.setCreateDate(new Date());

+ 1
- 0
CODE/smart-community/app-api/src/main/resources/mapper/TpTicketRecordMapper.xml View File

123
         t.ticket_id AS ticketId,
123
         t.ticket_id AS ticketId,
124
         t.community_id AS communityId,
124
         t.community_id AS communityId,
125
         t.content AS content,
125
         t.content AS content,
126
+        t.create_date AS createDate,
126
         d.NAME AS ticketStatusName
127
         d.NAME AS ticketStatusName
127
     FROM
128
     FROM
128
         tp_ticket_record t
129
         tp_ticket_record t