Merge remote-tracking branch 'origin/bd_dev' into bd_dev
This commit is contained in:
commit
9d0e9ad8ab
|
|
@ -997,6 +997,7 @@ public class SaOrderServiceImpl extends ServiceImpl<SaOrderMapper, SaOrder> impl
|
|||
GradeDTO oldGradeDTO = iGradeServiceApi.getGrade(cuMember.getPkSettleGrade()).getData();
|
||||
// 封装等级,重新计算会员等级
|
||||
if (setLastCuMemberGrade(cuMember, saOrderExt, saOrderExt.getOrderItemsList())) {
|
||||
log.info("重新计算会员等级: false");
|
||||
return false;
|
||||
}
|
||||
// 验证等级,原等级<新等级,才可以进行升级 或者 累计升级
|
||||
|
|
@ -1019,6 +1020,7 @@ public class SaOrderServiceImpl extends ServiceImpl<SaOrderMapper, SaOrder> impl
|
|||
}
|
||||
}
|
||||
if (checkUpgrade) {
|
||||
log.info("checkUpgrade: false");
|
||||
return false;
|
||||
}
|
||||
// 封装保存订单数据
|
||||
|
|
|
|||
Loading…
Reference in New Issue