autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-06-20 07:16:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' into feature-business-minigram

Browse Source
This commit is contained in:
Lemon
2026-05-07 16:08:03 +08:00
parent 0a5fdf0502 478c70a352
commit 1cdf2c6626
18 changed files with 414 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/TempController.java
View File

@@ -41,11 +41,8 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.math.BigDecimal;
import java.text.ParseException;
import java.time.LocalDateTime;
import java.time.LocalTime;
import java.time.format.DateTimeFormatter;
import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
@@ -1104,6 +1101,7 @@ public class TempController extends BaseController {
@PostMapping("/batchUpdateOrderReviewByDatePoor")
public RestApiResponse<?> batchUpdateOrderReviewByDatePoor(@RequestBody UpdateOrderReviewDTO dto) {
logger.info("批量更新订单评价, param:{}", JSON.toJSONString(dto));
RestApiResponse<?> response = null;
try {
// 根据传来的开始日期、结束日期按天划分为批次，对每个批次进行批量更新
@@ -1114,7 +1112,8 @@ public class TempController extends BaseController {
// 将startTime、endTime转换成localDateTime
LocalDateTime localStartTime = LocalDateTime.parse(date + "T00:00:00", DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss"));;
LocalDateTime localEndTime = LocalDateTime.parse(date + "T23:59:59", DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss"));;
int i = orderBasicInfoService.updateOrderReviewFlagTemp(localStartTime, localEndTime, null);
int i = orderBasicInfoService.updateOrderReviewFlagTemp(localStartTime, localEndTime, dto.getStationId(), dto.getRatio());
logger.info("批量更新订单评价, 批次:{}, 影响行数:{}", date, i);
}
response = new RestApiResponse<>();
} catch (Exception e) {

12
jsowell-admin/src/main/resources/application-dev.yml
View File

@@ -9,7 +9,7 @@ spring:
# redis 配置
redis:
# 地址
host: 106.14.94.149
host: 192.168.0.8
# 端口，默认为6379
port: 6379
# 数据库索引
@@ -38,9 +38,9 @@ spring:
master:
# url: jdbc:mysql://106.14.94.149:3306/jsowell_pre?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
# username: jsowell_pre
url: jdbc:mysql://192.168.0.32:3306/jsowell_dev?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
username: jsowell_dev
password: 123456
url: jdbc:mysql://192.168.0.8:3306/jsowell_prd?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
username: jsowell_prd
password: dev@js160829
# 从库数据源
slave:
# 从数据源开关/默认关闭
@@ -273,9 +273,9 @@ dubbo:
registry:
address: nacos://106.14.94.149:8848
parameters:
namespace: 200784c9-7e8f-4b2b-a44f-1eb52e675491
namespace: e328faaf-8516-42d0-817a-7406232b3581
username: nacos
password: 3rtJPEb0KaUs5NAm
password: 79HMu!6nlOiLm^Q[
protocol:
name: dubbo
port: -1

2
jsowell-admin/src/main/resources/application-sit.yml
View File

@@ -48,7 +48,7 @@ spring:
# 数据库索引
database: 0
# 密码
password: 123456
password: js160829
# 连接超时时间
timeout: 10s
lettuce: