手持机bug修改

src/main/java/com/cjy/back/ybsjAppointment/service/impl/YbsjyAppointmentSettingServiceImpl.java

@@ -13,9 +13,12 @@ import com.cjy.back.ybsjAppointment.utils.AppointmentNumberUtil;
 import com.cjy.back.ybsjAppointment.utils.DateUtil;
 import com.cjy.back.ybsjAppointment.utils.Encryption;
 import com.cjy.back.ybsjAppointment.utils.IdProduceUtil;
+import com.cjy.back.ybsjHandset.service.Impl.YbsjHandsetServiceImpl;
 import com.cjy.common.PageWrapper;
 import com.cjy.util.HttpUtil;
 import com.cjy.util.ServerResponse;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
@@ -36,6 +39,7 @@ public class YbsjyAppointmentSettingServiceImpl implements YbsjyAppointmentSetti
 	YbsjyAppointmentSettingMapper ybsjyAppointmentSettingMapper;
 	@Autowired
 	YbsjyAppointmentRecordMapper ybsjyAppointmentRecordMapper;
+	private final static Logger logger = LoggerFactory.getLogger(YbsjyAppointmentSettingServiceImpl.class);
 	@Value("${encryptionRule}")
 	private String rule;
 
@@ -444,9 +448,10 @@ public class YbsjyAppointmentSettingServiceImpl implements YbsjyAppointmentSetti
 			return ServerResponse.createByError("预约失败，预约人数已满");
 		}
 
-
+		logger.warn("推送到景区管控数据为:{}",JSONObject.toJSONString(synchronousDataVOList));
 		//在这里请求景区综合管控 插入预约记录接口
 		String responseString = HttpUtil.sendPostJson(synchronousDataUrl, JSONObject.toJSONString(synchronousDataVOList));
+		logger.warn("推送到景区管控返回状态:{}",JSONObject.toJSONString(responseString));
 		JSONObject responseJson = JSONObject.parseObject(responseString);
 		//记录访问日志
 		AppointmentRequestTurnstileLogEntity VisitorResponseJsonAppointmentRequestTurnstileLogEntity = new AppointmentRequestTurnstileLogEntity();

src/main/java/com/cjy/back/ybsjHandset/dao/YbsjHandsetMapper.xml

@@ -56,7 +56,8 @@
                cn.write_off_date,-- 检票时间
                CONCAT(cm.appointment_date, " ", CONCAT_WS('-', nmd.start_time, nmd.end_time)) visitingTime, -- 参观时间
                cn.update_by AS                                                                TicketChecker, -- 检票人
-               cm.id                                                                          appointment_documents_id
+               cm.id                                                                          appointment_documents_id,
+               cn.documents_type as documentsType
 
         FROM ybsj_appointment_people_info cn
                  LEFT JOIN ybsj_appointment_documents_info cm ON cn.appointment_documents_id = cm.id
@@ -109,7 +110,8 @@
                cn.reservation_code,-- 预约码
                cm.appointment_number,-- 预约单号
                CONCAT(cm.appointment_date, " ", CONCAT_WS('-', nmd.start_time, nmd.end_time)) visitingTime,-- 参观时间
-               cm.id                                                                          appointment_documents_id
+               cm.id                                                                          appointment_documents_id,
+               cn.documents_type as documentsType
         FROM ybsj_appointment_people_info cn
                  LEFT JOIN ybsj_appointment_documents_info cm ON cn.appointment_documents_id = cm.id
                  LEFT JOIN ybsj_appointment_time_info nmd ON cm.appointment_time_info_id = nmd.id

src/main/java/com/cjy/back/ybsjHandset/service/Impl/YbsjHandsetServiceImpl.java

@@ -259,9 +259,12 @@ public class YbsjHandsetServiceImpl implements YbsjHandsetService {
         }
         List<Map<String, Object>> getVisitorList = ybsjHandsetMapper.getVisitorList(getHaveTicketsDetails.get("id").toString());
         for (Map<String, Object> map : getVisitorList) {
-            map.put("documents_number", Encryption.decrypt(map.get("documents_number").toString(), rule));
+            if (Integer.parseInt(getHaveTicketsDetails.get("documentsType").toString()) == 5501) {
+                map.put("documents_number", Encryption.decrypt(map.get("documents_number").toString(), rule));
+            }
             map.put("phone", Encryption.decrypt(map.get("phone").toString(), rule));
         }
+
         param.put("essentialInformation", getHaveTicketsDetails);
         param.put("visitorList", getVisitorList);
         param.put("visitorListCount", 1);
@@ -278,7 +281,9 @@ public class YbsjHandsetServiceImpl implements YbsjHandsetService {
         }
         List<Map<String, Object>> getVisitorList = ybsjHandsetMapper.getVisitorList(getAppointmentRecordDetails.get("id").toString());
         for (Map<String, Object> map : getVisitorList) {
-            map.put("documents_number", Encryption.decrypt(map.get("documents_number").toString(), rule));
+            if (Integer.parseInt(getAppointmentRecordDetails.get("documentsType").toString()) == 5501) {
+                map.put("documents_number", Encryption.decrypt(map.get("documents_number").toString(), rule));
+            }
             map.put("phone", Encryption.decrypt(map.get("phone").toString(), rule));
         }
         param.put("essentialInformation", getAppointmentRecordDetails);