From 1e0ad5868ad12d6a6d06bdc505c4e6b1825efff5 Mon Sep 17 00:00:00 2001 From: cabbage <281119120@qq.com> Date: Fri, 31 Oct 2025 17:53:23 +0800 Subject: [PATCH] =?UTF-8?q?##=20188=E8=B4=AD=E4=B9=B01980=E6=94=AF?= =?UTF-8?q?=E4=BB=98=E5=9B=9E=E8=B0=83=E5=BC=82=E5=B8=B8=E5=A4=84=E7=90=86?= =?UTF-8?q?=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hzs/sale/order/service/impl/SaOrderServiceImpl.java | 4 ++-- .../src/main/resources/mapper/sale/order/SaOrderMapper.xml | 7 ++++++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderServiceImpl.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderServiceImpl.java index 2f5663a4..16aa4d2d 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderServiceImpl.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderServiceImpl.java @@ -1006,13 +1006,13 @@ public class SaOrderServiceImpl extends ServiceImpl impl checkUpgrade = true; if (EGrade.VIP.getValue() == oldGradeDTO.getGradeValue()) { SaOrderExt gradeOrder = baseMapper.getLastOrderGrade(cuMember.getPkId()); - if (EGrade.MAKER.getValue() == gradeOrder.getGradeValue()) { + if (null == gradeOrder || EGrade.MAKER.getValue() == gradeOrder.getGradeValue()) { // 如果是1980赠送升级的9900，可以再买一个9900，但是等级不变 checkUpgrade = false; } } else if (EGrade.MAKER.getValue() == oldGradeDTO.getGradeValue()) { SaOrderExt gradeOrder = baseMapper.getLastOrderGrade(cuMember.getPkId()); - if (EGrade.YOU_KE.getValue() == gradeOrder.getGradeValue()) { + if (null == gradeOrder || EGrade.YOU_KE.getValue() == gradeOrder.getGradeValue()) { // 如果是660赠送升级的1980，可以再买一个1980，但是等级不变 checkUpgrade = false; } diff --git a/bd-business/bd-business-sale/src/main/resources/mapper/sale/order/SaOrderMapper.xml b/bd-business/bd-business-sale/src/main/resources/mapper/sale/order/SaOrderMapper.xml index fc9c08cc..06d8b9d4 100644 --- a/bd-business/bd-business-sale/src/main/resources/mapper/sale/order/SaOrderMapper.xml +++ b/bd-business/bd-business-sale/src/main/resources/mapper/sale/order/SaOrderMapper.xml @@ -1540,7 +1540,12 @@ from sa_order so where so.del_flag = 0 and so.order_status = 1 - and so.order_type in (1, 2) + and ( + so.order_type in (1, 2) + or + (so.order_type = 3 and + so.order_type_extend = 1) + ) and so.pk_member = #{pkMember} order by so.pay_time desc) so where rownum = 1) so