From 027c7513aadc90369eb97c2987b4be421cd8e828 Mon Sep 17 00:00:00 2001 From: "autumn.g@foxmail.com" Date: Fri, 18 Aug 2023 11:19:58 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E4=BB=98=E5=8D=A0=E6=A1=A9=E8=AE=A2?= =?UTF-8?q?=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/enums/uniapp/OrderPileOccupyPayStatusEnum.java | 2 +- .../pile/service/impl/OrderPileOccupyServiceImpl.java | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/jsowell-common/src/main/java/com/jsowell/common/enums/uniapp/OrderPileOccupyPayStatusEnum.java b/jsowell-common/src/main/java/com/jsowell/common/enums/uniapp/OrderPileOccupyPayStatusEnum.java index 38cd53f47..d184bcc2b 100644 --- a/jsowell-common/src/main/java/com/jsowell/common/enums/uniapp/OrderPileOccupyPayStatusEnum.java +++ b/jsowell-common/src/main/java/com/jsowell/common/enums/uniapp/OrderPileOccupyPayStatusEnum.java @@ -8,7 +8,7 @@ package com.jsowell.common.enums.uniapp; */ public enum OrderPileOccupyPayStatusEnum { UN_PAY("0", "未支付"), - PAYMENT_COMPLETION("1", "未支付"), + PAYMENT_COMPLETION("1", "支付完成"), NO_PAYMENT_REQUIRED("2", "无需支付"), ; diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderPileOccupyServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderPileOccupyServiceImpl.java index 5cf5eed72..1230b8040 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderPileOccupyServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderPileOccupyServiceImpl.java @@ -357,14 +357,16 @@ public class OrderPileOccupyServiceImpl implements OrderPileOccupyService { // 更新占桩订单状态 OrderPileOccupy orderPileOccupy = queryByOccupyCode(dto.getOrderCode()); - // orderPileOccupy.setStatus(order); + orderPileOccupy.setStatus(OrderPileOccupyStatusEnum.ORDER_COMPLETE.getValue()); + orderPileOccupy.setPayStatus(OrderPileOccupyPayStatusEnum.PAYMENT_COMPLETION.getValue()); updateByPrimaryKeySelective(orderPileOccupy); } private void whiteListPayOccupyPileOrder(PayOrderDTO dto) { // 更新占桩订单状态 OrderPileOccupy orderPileOccupy = queryByOccupyCode(dto.getOrderCode()); - // orderPileOccupy.setStatus(order); + orderPileOccupy.setStatus(OrderPileOccupyStatusEnum.ORDER_COMPLETE.getValue()); + orderPileOccupy.setPayStatus(OrderPileOccupyPayStatusEnum.NO_PAYMENT_REQUIRED.getValue()); updateByPrimaryKeySelective(orderPileOccupy); } }