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

支付状态新增待补缴

Browse Source
This commit is contained in:
autumn.g@foxmail.com
2024-01-17 17:09:50 +08:00
parent ede56dbc83
commit c203650a3c
6 changed files with 8 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
jsowell-admin/src/main/java/com/jsowell/api/uniapp/OrderController.java
View File

@@ -11,7 +11,6 @@ import com.jsowell.common.exception.BusinessException;
import com.jsowell.common.response.RestApiResponse; import com.jsowell.common.response.RestApiResponse;
import com.jsowell.common.util.StringUtils; import com.jsowell.common.util.StringUtils;
import com.jsowell.pile.dto.*; import com.jsowell.pile.dto.*;
import com.jsowell.pile.service.MemberBasicInfoService;
import com.jsowell.pile.vo.base.StationInfoVO; import com.jsowell.pile.vo.base.StationInfoVO;
import com.jsowell.pile.vo.uniapp.OrderVO; import com.jsowell.pile.vo.uniapp.OrderVO;
import com.jsowell.pile.vo.uniapp.UniAppOrderDetailVO; import com.jsowell.pile.vo.uniapp.UniAppOrderDetailVO;
@@ -44,9 +43,6 @@ public class OrderController extends BaseController {
@Autowired @Autowired
private WxAppletRemoteService wxAppletRemoteService; private WxAppletRemoteService wxAppletRemoteService;
@Autowired
private MemberBasicInfoService memberBasicInfoService;
/** /**
* 生成订单 * 生成订单
* http://localhost:8080/uniapp/order/generateOrder * http://localhost:8080/uniapp/order/generateOrder

3
jsowell-common/src/main/java/com/jsowell/common/enums/ykc/OrderPayStatusEnum.java
View File

@@ -6,7 +6,8 @@ package com.jsowell.common.enums.ykc;
public enum OrderPayStatusEnum { public enum OrderPayStatusEnum {
unpaid("0", "待支付"), unpaid("0", "待支付"),
paid("1", "支付完成"), paid("1", "支付完成"),
pay_nothing("2", "无需支付"),
repay("3", "待补缴"),
; ;
private String value; private String value;

9
jsowell-pile/src/main/java/com/jsowell/pile/domain/OrderBasicInfo.java
View File

@@ -1,12 +1,9 @@
package com.jsowell.pile.domain; package com.jsowell.pile.domain;
import lombok.*;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.Date; import java.util.Date;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
/** /**
* 订单主表 * 订单主表
@@ -94,7 +91,7 @@ public class OrderBasicInfo {
private String payMode; private String payMode;
/** /**
* 支付状态(0-待支付；1-支付完成) * 支付状态(0-待支付；1-支付完成; 2-无需支付; 3-待补缴)
*/ */
private String payStatus; private String payStatus;

2
jsowell-pile/src/main/java/com/jsowell/pile/domain/OrderPileOccupy.java
View File

@@ -65,7 +65,7 @@ public class OrderPileOccupy {
private Date endTime; private Date endTime;
/** /**
* 支付状态（0-未支付；1-支付完成；2-无需支付） * 支付状态（0-未支付；1-支付完成；2-无需支付; 3-待补缴）
*/ */
private String payStatus; private String payStatus;

2
jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/DelayMerchantProgramLogic.java
View File

@@ -84,7 +84,7 @@ public class DelayMerchantProgramLogic extends AbstractProgramLogic {
if (orderInfo == null) { if (orderInfo == null) {
throw new BusinessException(ReturnCodeEnum.CODE_QUERY_ORDER_INFO_IS_NULL); throw new BusinessException(ReturnCodeEnum.CODE_QUERY_ORDER_INFO_IS_NULL);
} }
if (!StringUtils.equals(orderInfo.getPayStatus(), OrderPayStatusEnum.unpaid.getValue())) { if (StringUtils.equals(orderInfo.getPayStatus(), OrderPayStatusEnum.paid.getValue())) {
// 订单已支付 // 订单已支付
throw new BusinessException(ReturnCodeEnum.CODE_ORDER_IS_NOT_TO_BE_PAID_ERROR); throw new BusinessException(ReturnCodeEnum.CODE_ORDER_IS_NOT_TO_BE_PAID_ERROR);
} }

2
jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/NotDelayMerchantProgramLogic.java
View File

@@ -197,7 +197,7 @@ public class NotDelayMerchantProgramLogic extends AbstractProgramLogic {
if (orderInfo == null) { if (orderInfo == null) {
throw new BusinessException(ReturnCodeEnum.CODE_QUERY_ORDER_INFO_IS_NULL); throw new BusinessException(ReturnCodeEnum.CODE_QUERY_ORDER_INFO_IS_NULL);
} }
if (!StringUtils.equals(orderInfo.getPayStatus(), OrderPayStatusEnum.unpaid.getValue())) { if (StringUtils.equals(orderInfo.getPayStatus(), OrderPayStatusEnum.paid.getValue())) {
// 订单已支付 // 订单已支付
throw new BusinessException(ReturnCodeEnum.CODE_ORDER_IS_NOT_TO_BE_PAID_ERROR); throw new BusinessException(ReturnCodeEnum.CODE_ORDER_IS_NOT_TO_BE_PAID_ERROR);
} }