Compare commits

..

No commits in common. "ecbf6d85cb67c9427853ced901ec1a7ea892abb1" and "b1a9d9de0f930d7db869cb2fb8f97a492725b79a" have entirely different histories.

1 changed files with 0 additions and 7 deletions

View File

@ -2657,13 +2657,6 @@ public class SaOrderServiceImpl extends ServiceImpl<SaOrderMapper, SaOrder> impl
// 计算等级
bdGrade = this.getGradeByBox(boxNum + baseBoxNum, gradeList, memberGrade, true);
if (bdGrade.getGradeValue().equals(memberGrade.getGradeValue())
&& (EGrade.HAI_FAN.getValue() == bdGrade.getGradeValue() || EGrade.YOU_KE.getValue() == bdGrade.getGradeValue())
) {
// 旧等级与新等级相同 并且 旧等级为V1或V2
return null;
}
// 特殊等级处理
BdGrade tmpGrade = this.handleGradeEnd(gradeList, bdGrade);
if (null != isPay && EYesNo.YES.getIntValue() == isPay) {