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

Merge branch 'dev' of http://192.168.2.2:8099/jsowell/jsowell-charger-web into dev

Browse Source
This commit is contained in:
Lemon
2024-01-14 16:36:37 +08:00
parent ed31db97ad d990412cda
commit c35b86c728
11 changed files with 263 additions and 302 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
jsowell-admin/src/main/java/com/jsowell/service/MemberService.java
View File

@@ -689,7 +689,7 @@ public class MemberService {
// 将支付金额修改数据库
OrderBasicInfo basicInfo = new OrderBasicInfo();
basicInfo.setId(Long.parseLong(orderVO.getId()));
basicInfo.setId(Integer.parseInt(orderVO.getId()));
basicInfo.setPayAmount(payAmount);
orderBasicInfoService.updateOrderBasicInfo(basicInfo);

2
jsowell-admin/src/main/java/com/jsowell/service/TempService.java
View File

@@ -203,7 +203,7 @@ public class TempService {
}
OrderBasicInfo build = OrderBasicInfo.builder()
.id(Long.parseLong(orderListVO.getId()))
.id(Integer.parseInt(orderListVO.getId()))
.orderCode(orderListVO.getOrderCode())
.orderAmount(orderAmount)
.virtualAmount(virtualAmount)

2
jsowell-admin/src/test/java/SpringBootTestController.java
View File

@@ -2846,7 +2846,7 @@ public class SpringBootTestController {
if (StringUtils.equals(orderListVO.getOrderStatus(), OrderStatusEnum.IN_THE_CHARGING.getValue())) {
// 修改数据库订单状态
OrderBasicInfo info = OrderBasicInfo.builder()
.id(Long.parseLong(orderListVO.getId()))
.id(Integer.parseInt(orderListVO.getId()))
.orderStatus(OrderStatusEnum.ABNORMAL.getValue())
.build();
orderBasicInfoService.updateOrderBasicInfo(info);