1.推送添加外部景区id

src/main/java/com/cjy/back/ybsjAppointment/dao/YbsjyAppointmentSettingMapper.xml

@@ -147,9 +147,11 @@
                t1.start_time    as startTime,
                t1.end_time      as endTime,
                t1.reserve_count AS reservableQuantity,
-               t2.can_reserve_day_number as  canReserveDayNumber
+               t2.can_reserve_day_number as  canReserveDayNumber,
+               t3.external_id as externalId
         FROM ybsj_appointment_time_info t1
                  LEFT JOIN ybsj_appointment_setting t2 on t1.appointment_settings_id = t2.id and t2.state = 0
+                 LEFT join ybsj_scenic_info t3 on t1.appointment_settings_id =t3.guid
         WHERE t2.scenic_id = #{scenicId}
           and t1.use_date LIKE CONCAT('%', #{whichDay}, '%')
           and t1.unavailable_date NOT LIKE CONCAT('%', #{date}, '%')

src/main/java/com/cjy/back/ybsjAppointment/entity/vo/AppletsAppointmentListVO.java

@@ -20,7 +20,7 @@ public class AppletsAppointmentListVO {
 	//可预约数量（设置的预约总数）
 	private int reservableQuantity;
 	private int canReserveDayNumber;
-
+	private String externalId;
 	public Long getAppointmentTimeInfoId() {
 		return appointmentTimeInfoId;
 	}
@@ -68,4 +68,12 @@ public class AppletsAppointmentListVO {
 	public void setCanReserveDayNumber(int canReserveDayNumber) {
 		this.canReserveDayNumber = canReserveDayNumber;
 	}
+
+	public String getExternalId() {
+		return externalId;
+	}
+
+	public void setExternalId(String externalId) {
+		this.externalId = externalId;
+	}
 }

src/main/java/com/cjy/back/ybsjAppointment/entity/vo/ReservationNowVO.java

@@ -22,6 +22,15 @@ public class ReservationNowVO {
 	private String  unionId;
 	//景区id
 	private String scenicId;
+	private String externalId;
+
+	public String getExternalId() {
+		return externalId;
+	}
+
+	public void setExternalId(String externalId) {
+		this.externalId = externalId;
+	}
 
 	public String getScenicId() {
 		return scenicId;

src/main/java/com/cjy/back/ybsjAppointment/entity/vo/SynchronousDataVO.java

@@ -89,6 +89,7 @@ public class SynchronousDataVO {
 
 	private Long organCode;
 	private Long appointmentPeopleId;
+	private  String externalId;
 
 	public Long getAppointmentPeopleId() {
 		return appointmentPeopleId;
@@ -217,4 +218,12 @@ public class SynchronousDataVO {
 	public void setOrganCode(Long organCode) {
 		this.organCode = organCode;
 	}
+
+	public String getExternalId() {
+		return externalId;
+	}
+
+	public void setExternalId(String externalId) {
+		this.externalId = externalId;
+	}
 }

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

@@ -310,6 +310,8 @@ public class YbsjyAppointmentSettingServiceImpl implements YbsjyAppointmentSetti
 				synchronousDataVO.setDataSources("2");
 				synchronousDataVO.setDelFlag("0");
 				synchronousDataVO.setOrganCode(organCode);
+				synchronousDataVO.setOrganCode(organCode);
+				synchronousDataVO.setExternalId(reservationNowVO.getExternalId());
 				synchronousDataVOList.add(synchronousDataVO);
 //
 //				Map<String,String> map= new HashMap<>();

src/main/java/com/cjy/back/ybsjScenicInfo/dao/YbsjScenicInfoMapper.xml

@@ -256,6 +256,10 @@
 			<if test="isSubscribe != null" >
 				is_subscribe,
 			</if>
+
+		    <if test="externalId != null and externalId!=''" >
+				external_id,
+			</if>
 		</trim>
 		<trim prefix="values (" suffix=")" suffixOverrides=",">
 			<if test="guid != null">
@@ -368,7 +372,10 @@
 				#{threshold},
 			</if>
 			<if test="isSubscribe != null" >
-				#{isSubscribe}
+				#{isSubscribe},
+			</if>
+			<if test="externalId != null and externalId!=''" >
+				#{externalId}
 			</if>
 		</trim>
 	</insert>

src/main/java/com/cjy/back/ybsjScenicInfo/entity/YbsjScenicInfo.java

@@ -187,7 +187,15 @@ public class YbsjScenicInfo {
 	 * 在开通管理员时生成的管理员uuid
 	 */
 	private String userkey;
-	
+	private String externalId;
+
+	public String getExternalId() {
+		return externalId;
+	}
+
+	public void setExternalId(String externalId) {
+		this.externalId = externalId;
+	}
 
 	public String getDistance() {
 		return distance;