Commit c0d25c69 authored by zhangfeng's avatar zhangfeng

Merge branch 'refs/heads/feature_member_score' into dev

parents 1d410cf4 57807f35
...@@ -109,7 +109,7 @@ public class RewardRedeemServiceImpl extends AbstractService<RewardRedeemMapper, ...@@ -109,7 +109,7 @@ public class RewardRedeemServiceImpl extends AbstractService<RewardRedeemMapper,
if (rewardRedeemDO.getStatus() != RewardRedeemStatusEnum.REDEEMING.getValue()) { if (rewardRedeemDO.getStatus() != RewardRedeemStatusEnum.REDEEMING.getValue()) {
throw exception(ErrorCodeConstants.REWARD_REDEEM_STATUS_ERROR); throw exception(ErrorCodeConstants.REWARD_REDEEM_STATUS_ERROR);
} }
if (rewardRedeemDO.getRedeemType() != RewardPickMethedEnum.PICKUP.getValue()) { if (rewardRedeemDO.getRedeemType() != RewardPickMethedEnum.SELF_PICKUP.getValue()) {
//除上门领取状态外,其他方式需要验证 courierCompany, expressNo, expressDate, expressSender, recipientAddress 不能为空 //除上门领取状态外,其他方式需要验证 courierCompany, expressNo, expressDate, expressSender, recipientAddress 不能为空
if (request.getCourierCompany() == null) { if (request.getCourierCompany() == null) {
throw exception(ErrorCodeConstants.REWARD_REDEEM_VERIFY_NO_PARAM); throw exception(ErrorCodeConstants.REWARD_REDEEM_VERIFY_NO_PARAM);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment