angelo
/
java-base-app
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

## 188购买1980支付回调异常处理；

This commit is contained in:
cabbage 2025-10-31 17:53:23 +08:00
parent 3168b96a30
commit 1e0ad5868a
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderServiceImpl.java
View File

@ -1006,13 +1006,13 @@ public class SaOrderServiceImpl extends ServiceImpl<SaOrderMapper, SaOrder> impl
checkUpgrade = true; checkUpgrade = true;
if (EGrade.VIP.getValue() == oldGradeDTO.getGradeValue()) { if (EGrade.VIP.getValue() == oldGradeDTO.getGradeValue()) {
SaOrderExt gradeOrder = baseMapper.getLastOrderGrade(cuMember.getPkId()); SaOrderExt gradeOrder = baseMapper.getLastOrderGrade(cuMember.getPkId());
if (EGrade.MAKER.getValue() == gradeOrder.getGradeValue()) { if (null == gradeOrder || EGrade.MAKER.getValue() == gradeOrder.getGradeValue()) {
// 如果是1980赠送升级的9900，可以再买一个9900，但是等级不变 // 如果是1980赠送升级的9900，可以再买一个9900，但是等级不变
checkUpgrade = false; checkUpgrade = false;
} }
} else if (EGrade.MAKER.getValue() == oldGradeDTO.getGradeValue()) { } else if (EGrade.MAKER.getValue() == oldGradeDTO.getGradeValue()) {
SaOrderExt gradeOrder = baseMapper.getLastOrderGrade(cuMember.getPkId()); 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，但是等级不变 // 如果是660赠送升级的1980，可以再买一个1980，但是等级不变
checkUpgrade = false; checkUpgrade = false;
} }

7
bd-business/bd-business-sale/src/main/resources/mapper/sale/order/SaOrderMapper.xml
View File

@ -1540,7 +1540,12 @@
from sa_order so from sa_order so
where so.del_flag = 0 where so.del_flag = 0
and so.order_status = 1 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} and so.pk_member = #{pkMember}
order by so.pay_time desc) so order by so.pay_time desc) so
where rownum = 1) so where rownum = 1) so