diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/order/orderend/OrderEndService.java b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/order/orderend/OrderEndService.java
index 2217313..1961d5d 100644
--- a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/order/orderend/OrderEndService.java
+++ b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/order/orderend/OrderEndService.java
@@ -143,7 +143,7 @@ public class OrderEndService extends BaseService {
 
         // 如果当前时间类型已存在 就更新
         List<OrderEnd> lists = null;
-        if (StringUtils.isEmpty(tm) || StringUtils.isEmpty(customerId)){
+        if (!StringUtils.isEmpty(tm) || !StringUtils.isEmpty(customerId)){
 
             lists = getOrderEndByTm(tm,customerId);
         }
diff --git a/ssjygl-xsx-service/src/main/resources/dev/db.properties b/ssjygl-xsx-service/src/main/resources/dev/db.properties
index 78faee7..03e1430 100644
--- a/ssjygl-xsx-service/src/main/resources/dev/db.properties
+++ b/ssjygl-xsx-service/src/main/resources/dev/db.properties
@@ -1,12 +1,13 @@
 # mysql
-#jdbcUrl=jdbc:mysql://rm-wz9wa070076b2uge2ro.mysql.rds.aliyuncs.com:3306/ssjy_xsx_service_dev?characterEncoding=utf8&useSSL=false&zeroDateTimeBehavior=convertToNull&useInformationSchema=true&serverTimezone=GMT%2B8&autoReconnect=true
-#user=dev_ssjy_xsx
-#password=Ssjy_xs_890
+jdbcUrl=jdbc:mysql://rm-wz9wa070076b2uge2ro.mysql.rds.aliyuncs.com:3306/ssjy_xsx_service?characterEncoding=utf8&useSSL=false&zeroDateTimeBehavior=convertToNull&useInformationSchema=true&serverTimezone=GMT%2B8&autoReconnect=true
+user=ssjy_xsx
+password=Ssjy_xs_890_prod
+
 
 # mysql
-jdbcUrl=jdbc:mysql://127.0.0.1:3306/ssjy_xsx_service_dev?characterEncoding=utf8&useSSL=false&zeroDateTimeBehavior=convertToNull&useInformationSchema=true&serverTimezone=GMT%2B8&autoReconnect=true
-user=root
-password=19999999
+#jdbcUrl=jdbc:mysql://127.0.0.1:3306/ssjy_xsx_service_dev?characterEncoding=utf8&useSSL=false&zeroDateTimeBehavior=convertToNull&useInformationSchema=true&serverTimezone=GMT%2B8&autoReconnect=true
+#user=root
+#password=19999999
 
 # redis
 redis.basekey=ssjcgl_xsx_dev