冲突解决

Author: simonsundev

src/main/java/com/changyu/foryou/mapping/OrderMapper.xml

@@ -882,8 +882,7 @@
 		set total_price=#{totalPrice}
 		where order_id=#{orderId}
 	</update>
-
-
+
 	<!-- 根据togetherId获取该笔大订单总价 -->
 	<select id="selectTotalPriceByTogetherId" resultType="FLOAT">
 		select
@@ -1015,7 +1014,5 @@
 		</if>
 		
 		
-	</select> -->
-
-
+	</select> -->
 </mapper>

src/main/java/com/changyu/foryou/model/Campus.java

@@ -1,7 +1,6 @@
 package com.changyu.foryou.model;
 
 import java.sql.Time;
-import java.sql.Timestamp;
 
 
 public class Campus {
@@ -13,9 +12,9 @@ public class Campus {
 
 	private String cityName;
 
-	private Timestamp openTime;
+	private Time openTime;
 
-	private Timestamp closeTime;
+	private Time closeTime;
 
 	private Short status;
 
@@ -46,7 +45,7 @@ public Integer getCityId() {
 		return cityId;
 	}
 
-	public Timestamp getOpenTime() {
+	public Time getOpenTime() {
 		return openTime;
 	}
 
@@ -58,15 +57,15 @@ public void setCustomService(String customService) {
 		this.customService = customService;
 	}
 
-	public void setOpenTime(Timestamp openTime) {
+	public void setOpenTime(Time openTime) {
 		this.openTime = openTime;
 	}
 
-	public Timestamp getCloseTime() {
+	public Time getCloseTime() {
 		return closeTime;
 	}
 
-	public void setCloseTime(Timestamp closeTime) {
+	public void setCloseTime(Time closeTime) {
 		this.closeTime = closeTime;
 	}
 

src/main/java/com/changyu/foryou/tools/JpushInterface.java

@@ -18,6 +18,7 @@ public static PushPayload buildPushObject_all_all_alert(String message) {
                 .setPlatform(Platform.android_ios())
                 .setAudience(Audience.all())
                 .setNotification(Notification.alert(message))
+                .setOptions(Options.newBuilder().setApnsProduction(false).build())
                 .setMessage(Message.newBuilder()
                         .setMsgContent(message)
                         .addExtra("from", "foryou")
@@ -32,7 +33,8 @@ public static PushPayload buildPushObject_android_and_ios_alias_alert(String ale
                 .setPlatform(Platform.android_ios())
                 .setAudience(Audience.alias(phone))
                 .setNotification(Notification.alert(alertString))
-                .setOptions(Options.newBuilder().setApnsProduction(true).build())
+                .setOptions(Options.newBuilder().setApnsProduction(false
+                		).build())
                 .setMessage(Message.newBuilder()
                         .setMsgContent(alertString)
                         .addExtra("from", "foryou")