cxc/wisdommining-serve
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

bug fix

Browse Source
This commit is contained in:
quantulr
2024-06-13 16:35:38 +08:00
parent 07294d5161
commit 48a67dc374
3 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/com/wisdo/mmining/controller/OrderController.java
View File

@ -732,9 +732,16 @@ public class OrderController {
queryWrapper.eq("order_number", orderNumber);
}
if (type == 1) {
queryWrapper.le("status", 6);
// 排除售后中
queryWrapper.and(wrapper -> wrapper.isNull("after_sales_status").or().eq("after_sales_status", 66).or().eq("after_sales_status", 67));
} else if (type == 2) {
queryWrapper.ge("status", 5);
queryWrapper
.eq("after_sales_status", 61).or()
.eq("after_sales_status", 62).or()
.eq("after_sales_status", 63).or()
.eq("after_sales_status", 64).or()
.eq("after_sales_status", 65).or()
.eq("after_sales_status", 66);
}
if (userName != null && !"".equals(userName)) {

2
src/main/resources/application-db.yml
View File

@ -1,7 +1,7 @@
#开发环境
spring:
datasource:
# url: jdbc:mysql://192.168.0.142:3306/wisdo?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8
# url: jdbc:mysql://192.168.0.137:3306/wisdo?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8
url: jdbc:mysql://146.56.198.32:3306/wisdo?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8
# username: yshop
username: root