From ef94f8b02f734c276b1675aa1d9d2d53bd870153 Mon Sep 17 00:00:00 2001 From: PQZ Date: Thu, 24 Apr 2025 17:43:00 +0800 Subject: [PATCH] 1 --- .../service/impl/MemberOrderServiceImpl.java | 22 ++++++++++--------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/member/service/impl/MemberOrderServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/member/service/impl/MemberOrderServiceImpl.java index d4d7cba..6ce475f 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/member/service/impl/MemberOrderServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/member/service/impl/MemberOrderServiceImpl.java @@ -68,17 +68,19 @@ public class MemberOrderServiceImpl extends ServiceImpl lambdaQueryWrapper = new LambdaQueryWrapper<>(); lambdaQueryWrapper.eq(DlBaseEntity::getDelFlag, 0).eq(MemberOrder::getOrderNo, orderNo); MemberOrder memberOrder = getOne(lambdaQueryWrapper); - /*2、处理不同类型订单*/ - if ("01".equals(memberOrder.getOrderType())) { - cardService.dealMemberCard(memberOrder.getUserId(), memberOrder.getUserType(), memberOrder.getGoodsId(), memberOrder.getGoodsCycle(), memberOrder.getId()); - } else { - couponService.dealMemberCoupon(memberOrder); + if(memberOrder.getIsPay() != 1) { + /*2、处理不同类型订单*/ + if ("01".equals(memberOrder.getOrderType())) { + cardService.dealMemberCard(memberOrder.getUserId(), memberOrder.getUserType(), memberOrder.getGoodsId(), memberOrder.getGoodsCycle(), memberOrder.getId()); + } else { + couponService.dealMemberCoupon(memberOrder); + } + /*3、处理订单表数据*/ + memberOrder.setPayTime(new Date()); + memberOrder.setIsPay(1); + memberOrder.setPayWay("02"); + updateById(memberOrder); } - /*3、处理订单表数据*/ - memberOrder.setPayTime(new Date()); - memberOrder.setIsPay(1); - memberOrder.setPayWay("02"); - updateById(memberOrder); } /**