yuyang/XH-Power-Cloud
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更新订单报文接口增加查询条件

Browse Source
This commit is contained in:
panshuling321 2022-05-06 10:15:39 +08:00
parent 1bd5cd18d0
commit be8fe4d768
3 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/controller/OrderLogController.java
View File

@ -45,7 +45,6 @@ public class OrderLogController extends BaseController {
params.put("phone", phone);
params.put("startTime", startTime);
params.put("endTime", endTime);
params.put("operatorId", SecurityUtils.getUserId());
params.put("number", number);
params.put("tenantId", loginUser.getTenantId());
return getDataTable(orderLogService.getOrderPage(params));
@ -65,9 +64,7 @@ public class OrderLogController extends BaseController {
@RequestParam(required = false) String tenantId,
@RequestParam(required = false) Integer number,
@RequestParam(required = false) String serialNumber) throws Exception {
Map<String, Object> params = new HashMap<>();
params.put("operatorId", SecurityUtils.getUserId());
params.put("number", number);
params.put("serialNumber", serialNumber);
params.put("tenantId", tenantId);

4
xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/impl/OrderLogServiceImpl.java
View File

@ -2,8 +2,8 @@ package com.xhpc.activity.service.impl;
import cn.hutool.core.io.IoUtil;
import cn.hutool.poi.excel.BigExcelWriter;
import cn.hutool.poi.excel.ExcelUtil;
import cn.hutool.poi.excel.ExcelWriter;
import com.xhpc.activity.mapper.XhpcDeviceMessageMapper;
import com.xhpc.activity.mapper.XhpcHistoryOrderMapper;
import com.xhpc.activity.service.OrderLogService;
@ -42,7 +42,7 @@ public class OrderLogServiceImpl implements OrderLogService {
public void export(HttpServletResponse response, Map<String, Object> params) throws Exception{
List<Map<String, Object>> list = deviceMessageMapper.getOrderMessageByParams(params);
ExcelWriter writer = ExcelUtil.getWriter(true);
BigExcelWriter writer = ExcelUtil.getBigWriter("temp_" + System.currentTimeMillis() + ".xlsx");
writer.addHeaderAlias("serialNumber", "订单号");
writer.addHeaderAlias("sourceName", "订单来源");
writer.addHeaderAlias("chargingDegree", "充电电量");

2
xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/impl/XhpcClearingCheckoutServiceImpl.java
View File

@ -296,7 +296,7 @@ public class XhpcClearingCheckoutServiceImpl extends BaseService implements Xhpc
String tenantId = loginUser.getTenantId();
//桩的统计、该时段金额
List<Map<String, Object>> list = new ArrayList<>();
if (userId != UserTypeUtil.USER_ID) {
if (!userId.equals(UserTypeUtil.USER_ID)) {
Map<String, Object> landUser = historyOrderMapper.getLandUser(logUserId);
if (landUser != null) {
if (landUser.get("userType") != null) {