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

转换订单状态描述

Browse Source
This commit is contained in:
autumn.g@foxmail.com
2023-03-16 17:09:35 +08:00
parent b95437486f
commit 1c66b70f43
6 changed files with 40 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
jsowell-admin/src/main/java/com/jsowell/service/OrderService.java
View File

@@ -14,7 +14,6 @@ import com.jsowell.common.enums.MemberWalletEnum;
import com.jsowell.common.enums.ykc.ActionTypeEnum;
import com.jsowell.common.enums.ykc.OrderPayModeEnum;
import com.jsowell.common.enums.ykc.OrderPayRecordEnum;
import com.jsowell.common.enums.ykc.OrderPayStatusEnum;
import com.jsowell.common.enums.ykc.OrderStatusEnum;
import com.jsowell.common.enums.ykc.PayModeEnum;
import com.jsowell.common.enums.ykc.PileConnectorDataBaseStatusEnum;
@@ -727,20 +726,7 @@ public class OrderService {
vo.setPayAmount(String.valueOf(orderBasicInfo.getPayAmount()));
// 订单状态描述
String orderStatusDescribe;
if (StringUtils.equals(orderStatus, OrderStatusEnum.NOT_START.getValue())) {
// 未启动还有两种情况 待支付 / 支付成功
String payStatus = orderBasicInfo.getPayStatus();
if (StringUtils.equals(payStatus, OrderPayStatusEnum.paid.getValue())) {
// 支付成功，未启动
orderStatusDescribe = OrderPayStatusEnum.paid.getLabel() + ", " + OrderStatusEnum.getOrderStatus(orderStatus);
} else {
// 待支付
orderStatusDescribe = OrderPayStatusEnum.unpaid.getLabel();
}
} else {
orderStatusDescribe = OrderStatusEnum.getOrderStatus(orderStatus);
}
String orderStatusDescribe = orderBasicInfoService.transformOrderStatusDescribe(orderStatus, orderBasicInfo.getPayStatus());
vo.setOrderStatusDescribe(orderStatusDescribe);
// 获取充电桩枪口信息

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

@@ -5,7 +5,6 @@ import com.jsowell.common.core.controller.BaseController;
import com.jsowell.common.core.domain.AjaxResult;
import com.jsowell.common.core.page.TableDataInfo;
import com.jsowell.common.enums.BusinessType;
import com.jsowell.common.response.RestApiResponse;
import com.jsowell.common.util.poi.ExcelUtil;
import com.jsowell.pile.domain.OrderBasicInfo;
import com.jsowell.pile.dto.QueryOrderDTO;
@@ -74,7 +73,7 @@ public class OrderBasicInfoController extends BaseController {
}
/**
* 获取订单详细信息
* 获取订单详细信息 后管订单详情页
* http://localhost:8080/order/orderDetail/88000000000001012211161342359448
*/
@PreAuthorize("@ss.hasPermi('order:order:query')")