diff --git a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/OrderController.java b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/OrderController.java index f11abc8fd..89575bd42 100644 --- a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/OrderController.java +++ b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/OrderController.java @@ -11,7 +11,6 @@ import com.jsowell.common.exception.BusinessException; import com.jsowell.common.response.RestApiResponse; import com.jsowell.common.util.StringUtils; import com.jsowell.pile.dto.*; -import com.jsowell.pile.service.MemberBasicInfoService; import com.jsowell.pile.vo.base.StationInfoVO; import com.jsowell.pile.vo.uniapp.OrderVO; import com.jsowell.pile.vo.uniapp.UniAppOrderDetailVO; @@ -44,9 +43,6 @@ public class OrderController extends BaseController { @Autowired private WxAppletRemoteService wxAppletRemoteService; - @Autowired - private MemberBasicInfoService memberBasicInfoService; - /** * 生成订单 * http://localhost:8080/uniapp/order/generateOrder diff --git a/jsowell-common/src/main/java/com/jsowell/common/enums/ykc/OrderPayStatusEnum.java b/jsowell-common/src/main/java/com/jsowell/common/enums/ykc/OrderPayStatusEnum.java index ca0e90787..cd1872cf6 100644 --- a/jsowell-common/src/main/java/com/jsowell/common/enums/ykc/OrderPayStatusEnum.java +++ b/jsowell-common/src/main/java/com/jsowell/common/enums/ykc/OrderPayStatusEnum.java @@ -6,7 +6,8 @@ package com.jsowell.common.enums.ykc; public enum OrderPayStatusEnum { unpaid("0", "待支付"), paid("1", "支付完成"), - + pay_nothing("2", "无需支付"), + repay("3", "待补缴"), ; private String value; diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/domain/OrderBasicInfo.java b/jsowell-pile/src/main/java/com/jsowell/pile/domain/OrderBasicInfo.java index d7b35cd23..e42664efa 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/domain/OrderBasicInfo.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/domain/OrderBasicInfo.java @@ -1,12 +1,9 @@ package com.jsowell.pile.domain; +import lombok.*; + import java.math.BigDecimal; 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; /** - * 支付状态(0-待支付;1-支付完成) + * 支付状态(0-待支付;1-支付完成; 2-无需支付; 3-待补缴) */ private String payStatus; diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/domain/OrderPileOccupy.java b/jsowell-pile/src/main/java/com/jsowell/pile/domain/OrderPileOccupy.java index 31f58c7b9..cd3280038 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/domain/OrderPileOccupy.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/domain/OrderPileOccupy.java @@ -65,7 +65,7 @@ public class OrderPileOccupy { private Date endTime; /** - * 支付状态(0-未支付;1-支付完成;2-无需支付) + * 支付状态(0-未支付;1-支付完成;2-无需支付; 3-待补缴) */ private String payStatus; diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/DelayMerchantProgramLogic.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/DelayMerchantProgramLogic.java index bbe2c12f8..0cb4c0692 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/DelayMerchantProgramLogic.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/DelayMerchantProgramLogic.java @@ -84,7 +84,7 @@ public class DelayMerchantProgramLogic extends AbstractProgramLogic { if (orderInfo == 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); } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/NotDelayMerchantProgramLogic.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/NotDelayMerchantProgramLogic.java index 41c294770..6ad420928 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/NotDelayMerchantProgramLogic.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/NotDelayMerchantProgramLogic.java @@ -197,7 +197,7 @@ public class NotDelayMerchantProgramLogic extends AbstractProgramLogic { if (orderInfo == 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); }