## 处理加购注册、升级;
This commit is contained in:
parent
0b70700e53
commit
609d5bb2fe
|
@ -267,8 +267,12 @@ public class ApiOthSaOrderController extends ParentOrderController {
|
||||||
// }
|
// }
|
||||||
// }
|
// }
|
||||||
// }
|
// }
|
||||||
// 当前等级可以购买多少加购商品
|
if (gradeDTO.getBoxNumber() == 0) {
|
||||||
if (addPurchase > gradeDTO.getBoxNumber()) {
|
vo.setFlag(EYesNo.NO.getIntValue());
|
||||||
|
vo.setMsg("当前等级不能购买加购商品。");
|
||||||
|
return AjaxResult.success(vo);
|
||||||
|
} else if (addPurchase > gradeDTO.getBoxNumber()) {
|
||||||
|
// 当前等级可以购买多少加购商品
|
||||||
vo.setFlag(EYesNo.NO.getIntValue());
|
vo.setFlag(EYesNo.NO.getIntValue());
|
||||||
vo.setMsg("当前等级只能购买 " + gradeDTO.getBoxNumber() + " 件加购商品。");
|
vo.setMsg("当前等级只能购买 " + gradeDTO.getBoxNumber() + " 件加购商品。");
|
||||||
return AjaxResult.success(vo);
|
return AjaxResult.success(vo);
|
||||||
|
|
|
@ -1041,6 +1041,10 @@ public class SaOrderServiceImpl extends ServiceImpl<SaOrderMapper, SaOrder> impl
|
||||||
// 计算下单后等级
|
// 计算下单后等级
|
||||||
GradeDTO gradeDTO = calculateGradeDTO(orderParam.getSpecialArea(), orderParam.getPkSettleCountry(),
|
GradeDTO gradeDTO = calculateGradeDTO(orderParam.getSpecialArea(), orderParam.getPkSettleCountry(),
|
||||||
orderParam.getCenterCodeId(), saOrder, orderReturn);
|
orderParam.getCenterCodeId(), saOrder, orderReturn);
|
||||||
|
if (null == gradeDTO) {
|
||||||
|
orderReturn.setIsEnough(Boolean.FALSE);
|
||||||
|
return orderReturn;
|
||||||
|
}
|
||||||
|
|
||||||
if (orderParam.getSpecialArea().equals(EOrderType.REGISTER_ORDER.getValue())
|
if (orderParam.getSpecialArea().equals(EOrderType.REGISTER_ORDER.getValue())
|
||||||
|| orderParam.getSpecialArea().equals(EOrderType.SPECIAL_REGISTER_ORDER.getValue())) {
|
|| orderParam.getSpecialArea().equals(EOrderType.SPECIAL_REGISTER_ORDER.getValue())) {
|
||||||
|
@ -1081,10 +1085,7 @@ public class SaOrderServiceImpl extends ServiceImpl<SaOrderMapper, SaOrder> impl
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (gradeDTO == null) {
|
|
||||||
gradeDTO = GradeDTO.builder().gradeName(null).build();
|
|
||||||
orderReturn.setIsEnough(Boolean.FALSE);
|
|
||||||
}
|
|
||||||
orderReturn.setPkGradeVal(gradeDTO.getGradeName());
|
orderReturn.setPkGradeVal(gradeDTO.getGradeName());
|
||||||
return orderReturn;
|
return orderReturn;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue