autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-04-21 03:25:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev-zza' into dev

Browse Source
This commit is contained in:
Lemon
2025-04-11 13:57:55 +08:00
parent 9be4a65e03 7a0ec7e4e3
commit 3f26010b7d
11 changed files with 148 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
jsowell-admin/src/main/java/com/jsowell/web/controller/pile/OrderBasicInfoController.java
View File

@@ -15,6 +15,7 @@ import com.jsowell.pile.domain.OrderBasicInfo;
import com.jsowell.pile.domain.PileMerchantInfo;
import com.jsowell.pile.dto.*;
import com.jsowell.pile.service.OrderBasicInfoService;
import com.jsowell.pile.service.OrderSplitRecordService;
import com.jsowell.pile.service.PileMerchantInfoService;
import com.jsowell.pile.service.PileStationInfoService;
import com.jsowell.pile.util.UserUtils;
@@ -50,6 +51,9 @@ public class OrderBasicInfoController extends BaseController {
@Autowired
private PileStationInfoService pileStationInfoService;
@Autowired
private OrderSplitRecordService orderSplitRecordService;
/**
* 查询订单列表
* 订单列表页，带数据权限校验
@@ -224,4 +228,21 @@ public class OrderBasicInfoController extends BaseController {
}
return response;
}
/**
* 查询订单分账数据
* @param dto
* @return
*/
@PostMapping("/queryOrderSplitData")
public RestApiResponse<?> queryOrderSplitData(@RequestBody QueryOrderSplitDTO dto) {
RestApiResponse<?> response = null;
try {
orderSplitRecordService.queryOrderSplitData(dto);
} catch (Exception e) {
}
logger.info("查询订单分账数据 params:{}, result:{}", JSON.toJSONString(dto), response);
return response;
}
}

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

@@ -246,4 +246,9 @@ parking:
# 车场ID(分配)
parkId: 61578
# 机构ID(分配)
orgId: BTTEST01
orgId: BTTEST01
# 充电算法平台配置
chargeAlgorithm:
url: http://150.158.199.92:58910/gateway/api/user/battery/algorithm/json
clientId: e488bac5f70b496fa2d82065089e5f81

7
jsowell-admin/src/main/resources/application-prd.yml
View File

@@ -241,4 +241,9 @@ parking:
# 车场ID(分配)
parkId: 66291
# 机构ID(分配)
orgId: DCWYPROD20250210
orgId: DCWYPROD20250210
# 充电算法平台配置
chargeAlgorithm:
url: http://150.158.199.92:58910/gateway/api/user/battery/algorithm/json
clientId: e488bac5f70b496fa2d82065089e5f81

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

@@ -244,4 +244,9 @@ parking:
# 车场ID(分配)
parkId: 61578
# 机构ID(分配)
orgId: BTTEST01
orgId: BTTEST01
# 充电算法平台配置
chargeAlgorithm:
url: http://150.158.199.92:58910/gateway/api/user/battery/algorithm/json
clientId: e488bac5f70b496fa2d82065089e5f81

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

@@ -126,3 +126,8 @@ wulian:
getSimInfo: api.v2.card.info
WuLianSimRenew: api.v2.order.renew
# 充电算法平台配置
chargeAlgorithm:
url: http://150.158.199.92:58910/gateway/api/user/battery/algorithm/json
clientId: e488bac5f70b496fa2d82065089e5f81