xjm
/
ssjygl-xsct-service
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

审核订单取消申请接口修改

dev
徐杰盟 2024-04-15 09:48:15 +08:00
parent 62e3fe125b
commit 5a84ed48ec
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/order/orderend/OrderEndService.java
View File

@ -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);
}

13
ssjygl-xsx-service/src/main/resources/dev/db.properties
View File

@ -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