diff --git a/ebike-payment/src/main/java/com/cdzy/payment/service/impl/EbikeOrderServiceImpl.java b/ebike-payment/src/main/java/com/cdzy/payment/service/impl/EbikeOrderServiceImpl.java index 3324277..2c8c6a1 100644 --- a/ebike-payment/src/main/java/com/cdzy/payment/service/impl/EbikeOrderServiceImpl.java +++ b/ebike-payment/src/main/java/com/cdzy/payment/service/impl/EbikeOrderServiceImpl.java @@ -7,6 +7,7 @@ import com.cdzy.payment.model.entity.EbikeOrder; import com.cdzy.payment.service.EbikeOrderService; import com.mybatisflex.core.query.QueryWrapper; import com.mybatisflex.spring.service.impl.ServiceImpl; +import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import static com.cdzy.payment.model.entity.table.EbikeOrderTableDef.EBIKE_ORDER; @@ -17,6 +18,7 @@ import static com.cdzy.payment.model.entity.table.EbikeOrderTableDef.EBIKE_ORDER * @author yanglei * @since 2025-11-19 15:54 */ +@Slf4j @Service public class EbikeOrderServiceImpl extends ServiceImpl implements EbikeOrderService { @@ -36,6 +38,10 @@ public class EbikeOrderServiceImpl extends ServiceImpl= NOW()", + "%s + INTERVAL '%d seconds' <= NOW()", EBIKE_REFUND.CREATE_TIME.getName(), totalSeconds ); diff --git a/ebike-payment/src/main/java/com/cdzy/payment/service/impl/EbikeWxPayServiceImpl.java b/ebike-payment/src/main/java/com/cdzy/payment/service/impl/EbikeWxPayServiceImpl.java index bb09e82..137f4b7 100644 --- a/ebike-payment/src/main/java/com/cdzy/payment/service/impl/EbikeWxPayServiceImpl.java +++ b/ebike-payment/src/main/java/com/cdzy/payment/service/impl/EbikeWxPayServiceImpl.java @@ -442,10 +442,6 @@ public class EbikeWxPayServiceImpl implements EbikeWxPayService { ebikeRefund.setRefundTransactionId(result.getRefundId()); ebikeRefund.setReviewOperator(refundDto.getStaffId()); ebikeRefundService.updateById(ebikeRefund); - // 更新退款单状态 - ebikeRefundService.updateRefundStatus(result); - // 更新订单状态 为退款已完成 - ebikeOrderService.doneRefund(orderId); notifyVo.setSuccess(true); notifyVo.setMessage("退款成功"); return notifyVo; diff --git a/ebike-payment/src/main/resources/application-dev.yml b/ebike-payment/src/main/resources/application-dev.yml index e54781c..ef4689f 100644 --- a/ebike-payment/src/main/resources/application-dev.yml +++ b/ebike-payment/src/main/resources/application-dev.yml @@ -86,8 +86,8 @@ payment: merchant-serial-number: 7873E3E694ADD0368EA3E9FAC929F496EECB8DF9 api-v3-key: 1715147005V3Key20250425174554633 public-key-id: PUB_KEY_ID_0117151470052025042500331704000601 - pay-notify_url: http://192.168.2.156:10017/wxPayment/pay-notify - refund-notify_url: http://192.168.2.156:10017/wxPayment/refund-notify + pay-notify_url: http://192.168.101.18:10010/payment/wxPayment/pay-notify + refund-notify_url: http://192.168.101.18:10010/payment/wxPayment/refund-notify expire-minutes: 1440 pay-schedule: 0 0 0/12 * * ? refund-schedule: 0 0/30 * * * ? diff --git a/ebike-user/pom.xml b/ebike-user/pom.xml index 8898d6d..be56432 100644 --- a/ebike-user/pom.xml +++ b/ebike-user/pom.xml @@ -202,6 +202,17 @@ + + org.apache.maven.plugins + maven-compiler-plugin + 3.11.0 + + + true + 17 + 17 + + org.springframework.boot spring-boot-maven-plugin diff --git a/ebike-user/src/main/java/com/cdzy/user/controller/EbikeOrderController.java b/ebike-user/src/main/java/com/cdzy/user/controller/EbikeOrderController.java index d7bd4e3..311a9e1 100644 --- a/ebike-user/src/main/java/com/cdzy/user/controller/EbikeOrderController.java +++ b/ebike-user/src/main/java/com/cdzy/user/controller/EbikeOrderController.java @@ -115,8 +115,8 @@ public class EbikeOrderController { * @param userId 用户订单表主键 */ @GetMapping("getUserAllOrder") - public JsonResult getUserAllOrder(@RequestParam("userId") Long userId, PageParam page) { - Page userAllOrders = ebikeOrderService.getUserAllOrder(userId, page); + public JsonResult getUserAllOrder(Long userId, Integer orderStatus, PageParam page) { + Page userAllOrders = ebikeOrderService.getUserAllOrder(userId, orderStatus, page); return JsonResult.success(userAllOrders); } diff --git a/ebike-user/src/main/java/com/cdzy/user/model/vo/EbikeRefundOrderDetailVo.java b/ebike-user/src/main/java/com/cdzy/user/model/vo/EbikeRefundOrderDetailVo.java index 43ae4b1..660480b 100644 --- a/ebike-user/src/main/java/com/cdzy/user/model/vo/EbikeRefundOrderDetailVo.java +++ b/ebike-user/src/main/java/com/cdzy/user/model/vo/EbikeRefundOrderDetailVo.java @@ -54,6 +54,16 @@ public class EbikeRefundOrderDetailVo { */ private String mobile; + /** + * 审核状态 + */ + private Integer processStatus; + + /** + * 审核意见 + */ + private String remark; + /** * 起步费用 diff --git a/ebike-user/src/main/java/com/cdzy/user/model/vo/EbikeUserAllOrdersVo.java b/ebike-user/src/main/java/com/cdzy/user/model/vo/EbikeUserAllOrdersVo.java index 8d236b1..f99b5f8 100644 --- a/ebike-user/src/main/java/com/cdzy/user/model/vo/EbikeUserAllOrdersVo.java +++ b/ebike-user/src/main/java/com/cdzy/user/model/vo/EbikeUserAllOrdersVo.java @@ -21,12 +21,16 @@ import java.time.LocalDateTime; @Data public class EbikeUserAllOrdersVo { - /** * 订单id */ private Long orderId; + /** + * 退款id + */ + private Long refundId; + /** * 运营商ID */ diff --git a/ebike-user/src/main/java/com/cdzy/user/service/EbikeOrderService.java b/ebike-user/src/main/java/com/cdzy/user/service/EbikeOrderService.java index 437d570..6aa1fcd 100644 --- a/ebike-user/src/main/java/com/cdzy/user/service/EbikeOrderService.java +++ b/ebike-user/src/main/java/com/cdzy/user/service/EbikeOrderService.java @@ -118,5 +118,5 @@ public interface EbikeOrderService extends IService { * @param userId 用户id * @return 用户订单 */ - Page getUserAllOrder(Long userId, PageParam page); + Page getUserAllOrder(Long userId, Integer orderStatus, PageParam page); } diff --git a/ebike-user/src/main/java/com/cdzy/user/service/impl/EbikeOrderImpl.java b/ebike-user/src/main/java/com/cdzy/user/service/impl/EbikeOrderImpl.java index d290fd2..a5bdc93 100644 --- a/ebike-user/src/main/java/com/cdzy/user/service/impl/EbikeOrderImpl.java +++ b/ebike-user/src/main/java/com/cdzy/user/service/impl/EbikeOrderImpl.java @@ -40,6 +40,7 @@ import java.util.List; import java.util.Objects; import static com.cdzy.user.model.entity.table.EbikeOrderTableDef.EBIKE_ORDER; +import static com.cdzy.user.model.entity.table.EbikeRefundTableDef.EBIKE_REFUND; /** @@ -259,10 +260,11 @@ public class EbikeOrderImpl extends ServiceImpl im } @Override - public Page getUserAllOrder(Long userId, PageParam page) { + public Page getUserAllOrder(Long userId, Integer orderStatus, PageParam page) { QueryWrapper queryWrapper = QueryWrapper.create() .select( EBIKE_ORDER.ORDER_ID, + EBIKE_REFUND.REFUND_ID, EBIKE_ORDER.OPERATOR_ID, EBIKE_ORDER.BIKE_CODE, EBIKE_ORDER.ORDER_TYPE, @@ -287,7 +289,9 @@ public class EbikeOrderImpl extends ServiceImpl im EBIKE_ORDER.CREATE_TIME ) .where(EBIKE_ORDER.USER_ID.eq(userId)) - .orderBy(EBIKE_ORDER.CREATE_TIME.desc()); + .and(EBIKE_ORDER.ORDER_STATUS.eq(orderStatus,Objects.nonNull(orderStatus))) + .leftJoin(EBIKE_REFUND).on(EBIKE_REFUND.ORDER_ID.eq(EBIKE_ORDER.ORDER_ID)); + queryWrapper.orderBy(EBIKE_ORDER.CREATE_TIME.desc()); return this.mapper.paginateAs(page.getPage(), queryWrapper, EbikeUserAllOrdersVo.class); } diff --git a/ebike-user/src/main/java/com/cdzy/user/service/impl/EbikeRefundServiceImpl.java b/ebike-user/src/main/java/com/cdzy/user/service/impl/EbikeRefundServiceImpl.java index fd52a25..491d2a3 100644 --- a/ebike-user/src/main/java/com/cdzy/user/service/impl/EbikeRefundServiceImpl.java +++ b/ebike-user/src/main/java/com/cdzy/user/service/impl/EbikeRefundServiceImpl.java @@ -529,7 +529,9 @@ public class EbikeRefundServiceImpl extends ServiceImpl